diff --git a/.bowerrc b/.bowerrc
deleted file mode 100644
index d31fab554b4e0..0000000000000
--- a/.bowerrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "directory": "./src/kibana/bower_components"
-}
diff --git a/.gitignore b/.gitignore
index f9eba398ab940..2c48912fd97e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,8 @@
 .DS_Store
 .node_binaries
 node_modules
-bower_components
-**/*.css
 trash
-build
+bundles
 target
 .jruby
 .idea
@@ -13,4 +11,4 @@ target
 *.log
 esvm
 .htpasswd
-src/server/bin/plugins
\ No newline at end of file
+installed_plugins
diff --git a/.jscsrc b/.jscsrc
index 285ada95c3ede..da6d1c8ad24d2 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -1,9 +1,11 @@
 {
+  "esnext": true,
   "maximumLineLength": {
     "value": 140,
     "allowComments": true
   },
-	"requireCurlyBraces": [
+  "requireSemicolons": true,
+  "requireCurlyBraces": [
     "for",
     "do",
     "try",
diff --git a/.jshintrc b/.jshintrc
index 8e5b2febb1b7d..240245abeca92 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,6 +1,21 @@
 {
   // for files at project root
   "node": true,
+  "browser": true,
+  "mocha": true,
+
+  "predef": {
+    "inject": true,
+    "module": true,
+    "define": true,
+    "console": false,
+    "-event": true,
+    "-name": true,
+    "-Promise": true,
+    "-Worker": true,
+    "-status": true,
+    "-fetch": true
+  },
 
   // shared with .jshintrc files for browser and node
   "unused": false,
@@ -23,5 +38,6 @@
   "sub": true,
   "-W084": true,
   "scripturl": true,
-  "evil": true
+  "evil": true,
+  "esnext": true
 }
diff --git a/.jshintrc.browser b/.jshintrc.browser
deleted file mode 100644
index 09cdd36321a20..0000000000000
--- a/.jshintrc.browser
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "./.jshintrc",
-  "node": false,
-  "browser": true,
-
-  "predef": {
-    // require.js
-    "define": true,
-    "require": true,
-    "console": false,
-    "-event": true,
-    "-name": true
-  }
-}
diff --git a/.jshintrc.node b/.jshintrc.node
deleted file mode 100644
index a77f81af35ec7..0000000000000
--- a/.jshintrc.node
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "extends": "./.jshintrc",
-  "node": true,
-
-  "globals": {
-    "Promise": true,
-    "status": true
-  }
-}
diff --git a/.node-version b/.node-version
index 62ed67b9cef40..eb98ec28972b5 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-0.10.x
\ No newline at end of file
+iojs-v2.4
diff --git a/.travis.yml b/.travis.yml
index b0af355f2743c..1989216632bd9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,17 @@
 language: node_js
-node_js: '0.12'
+node_js: 'iojs-v2.4'
 install: npm install
-script: npm test
+script: ./node_modules/.bin/grunt travis
 sudo: false
 cache:
   directories:
   - esvm
   - node_modules
-  - src/kibana/bower_components
 before_cache:
-  - rm -rf esvm/*/logs esvm/data_dir
+- rm -rf esvm/*/logs esvm/data_dir
+before_script:
+- export DISPLAY=:99.0
+- sh -e /etc/init.d/xvfb start
 notifications:
   email:
   - rashid.khan@elastic.co
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8fc69656a2f1b..578d1204bdeb4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,36 +10,35 @@ Please make sure you have signed the [Contributor License Agreement](http://www.
 
 ### Development Environment Setup
 
-- Install node.js (we recommend using [nvm](https://github.com/creationix/nvm))
+- Clone the kibana repo and move into it
 
   ```sh
-  ## follow directions at https://github.com/creationix/nvm, then
-  nvm install 0.10
+  git clone https://github.com/elastic/kibana.git kibana
+  cd kibana
   ```
 
-- Install grunt and bower globally (as root if not using nvm)
+- Install the version of node.js listed in the `.node-version` file (this is made easy with tools like [nvm](https://github.com/creationix/nvm) and [avn](https://github.com/wbyoung/avn))
 
   ```sh
-  npm install -g grunt-cli bower
+  nvm install "$(cat .node-version)"
   ```
 
-- Clone the kibana repo and move into it
+- Install dependencies
 
   ```sh
-  git clone https://github.com/elastic/kibana.git kibana
-  cd kibana
+  npm install
   ```
 
-- Install node and bower dependencies
+- Start elasticsearch, you can use [esvm](https://github.com/simianhacker/esvm) to make that easier.
 
   ```sh
-  npm install && bower install
+  grunt esvm:dev:keepalive
   ```
 
 - Start the development server.
 
   ```sh
-  grunt dev # use the "--with-es" flag to install & start elasticsearch too
+  ./bin/kibana --dev
   ```
 
 #### Linting
@@ -65,7 +64,7 @@ Before running the tests you will need to install the projects dependencies as d
 Once that is complete just run:
 
 ```sh
-grunt test build
+./node_modules/.bin/grunt test build
 ```
 
 Distributable, built packages can be found in `target/` after the build completes.
diff --git a/Gruntfile.js b/Gruntfile.js
index 6625d6d936e1a..51ef8db0ff751 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,28 +1,34 @@
 module.exports = function (grunt) {
   // set the config once before calling load-grunt-config
-  // and once durring so that we have access to it via
+  // and once during so that we have access to it via
   // grunt.config.get() within the config files
   var config = {
     pkg: grunt.file.readJSON('package.json'),
     root: __dirname,
-    src: __dirname + '/src', // unbuild version of build
-    build: __dirname + '/build', // copy of source, but optimized
-    app: __dirname + '/src/kibana', // source directory for the app
-    plugins: __dirname + '/src/kibana/plugins', // source directory for the app
-    server: __dirname + '/src/server', // source directory for the server
-    target: __dirname + '/target',  // location of the compressed build targets
-    buildApp: __dirname + '/build/kibana', // build directory for the app
-    configFile: __dirname + '/src/server/config/kibana.yml',
+    src: __dirname + '/src',
+    build: __dirname + '/build', // temporary build directory
+    plugins: __dirname + '/src/plugins',
+    server: __dirname + '/src/server',
+    target: __dirname + '/target', // location of the compressed build targets
+    testUtilsDir: __dirname + '/src/testUtils',
+    configFile: __dirname + '/src/config/kibana.yml',
+
+    karmaBrowser: (function () {
+      switch (require('os').platform()) {
+        case 'win32':
+          return 'IE';
+        case 'darwin':
+          return 'Chrome';
+        default:
+          return 'Firefox';
+      }
+    }()),
 
     nodeVersion: '0.10.35',
     platforms: ['darwin-x64', 'linux-x64', 'linux-x86', 'windows'],
     services: [ [ 'launchd', '10.9'], [ 'upstart', '1.5'], [ 'systemd', 'default'], [ 'sysv', 'lsb-3.1' ] ],
 
-    unitTestDir: __dirname + '/test/unit',
-    testUtilsDir: __dirname + '/test/utils',
-    bowerComponentsDir: __dirname + '/src/kibana/bower_components',
-
-    devPlugins: 'vis_debug_spy',
+    devPlugins: 'devMode',
 
     meta: {
       banner: '/*! <%= package.name %> - v<%= package.version %> - ' +
@@ -34,44 +40,13 @@ module.exports = function (grunt) {
     lintThese: [
       'Gruntfile.js',
       '<%= root %>/tasks/**/*.js',
-      '<%= src %>/kibana/*.js',
-      '<%= src %>/server/bin/*.js',
-      '<%= src %>/server/{config,lib,plugins}/**/*.js',
-      '<%= src %>/server/bin/{plugin,startup}/**/*.js',
-      '<%= src %>/kibana/{components,directives,factories,filters,plugins,registry,services,utils}/**/*.js',
-      '<%= unitTestDir %>/**/*.js',
-      '!<%= unitTestDir %>/specs/vislib/fixture/**/*'
-    ],
-    lessFiles: [
-      '<%= src %>/kibana/components/*/*.less',
-      '<%= src %>/kibana/styles/main.less',
-      '<%= src %>/kibana/components/vislib/styles/main.less',
-      '<%= src %>/server/plugins/status/public/styles/main.less',
-      '<%= plugins %>/dashboard/styles/main.less',
-      '<%= plugins %>/discover/styles/main.less',
-      '<%= plugins %>/settings/styles/main.less',
-      '<%= plugins %>/visualize/styles/main.less',
-      '<%= plugins %>/visualize/styles/visualization.less',
-      '<%= plugins %>/visualize/styles/main.less',
-      '<%= plugins %>/table_vis/table_vis.less',
-      '<%= plugins %>/metric_vis/metric_vis.less',
-      '<%= plugins %>/markdown_vis/markdown_vis.less'
+      '<%= src %>/**/*.js',
+      '!<%= src %>/fixtures/**/*.js'
     ]
   };
 
   grunt.config.merge(config);
 
-  var dirname = require('path').dirname;
-  var indexFiles = grunt.file.expand({ cwd: 'src/kibana/plugins' }, [
-    '*/index.js',
-    '!' + config.devPlugins + '/index.js'
-  ]);
-  var moduleIds = indexFiles.map(function (fileName) {
-    return 'plugins/' + dirname(fileName) + '/index';
-  });
-
-  config.bundled_plugin_module_ids = grunt.bundled_plugin_module_ids = moduleIds;
-
   // load plugins
   require('load-grunt-config')(grunt, {
     configPath: __dirname + '/tasks/config',
diff --git a/STYLEGUIDE.md b/STYLEGUIDE.md
index c628c98d953be..a0e991bdf254e 100644
--- a/STYLEGUIDE.md
+++ b/STYLEGUIDE.md
@@ -812,7 +812,7 @@ Kibana is written in Angular, and uses several utility methods to make using Ang
 Angular modules are defined using a custom require module named `module`. It is used as follows:
 
 ```js
-var app = require('modules').get('app/namespace');
+var app = require('ui/modules').get('app/namespace');
 ```
 
 `app` above is a reference to an Angular module, and can be used to define controllers, providers and anything else used in Angular.
@@ -849,7 +849,7 @@ app.service('CustomService', function(Promise, otherDeps) {
 Angular routes are defined using a custom require modules named `routes` that remove much of the required boilerplate.
 
 ```js
-require('routes')
+require('ui/routes')
 .when('/my/object/route/:id?', {
   // angular route code goes here
 });
diff --git a/bin/kibana b/bin/kibana
new file mode 100755
index 0000000000000..ce366929c3808
--- /dev/null
+++ b/bin/kibana
@@ -0,0 +1,25 @@
+#!/bin/sh
+SCRIPT=$0
+
+# SCRIPT may be an arbitrarily deep series of symlinks. Loop until we have the concrete path.
+while [ -h "$SCRIPT" ] ; do
+  ls=$(ls -ld "$SCRIPT")
+  # Drop everything prior to ->
+  link=$(expr "$ls" : '.*-> \(.*\)$')
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=$(dirname "$SCRIPT")/"$link"
+  fi
+done
+
+DIR="$(dirname "${SCRIPT}")/.."
+NODE="${DIR}/node/bin/node"
+test -x "$NODE" || NODE=$(which node)
+if [ ! -x "$NODE" ]; then
+  echo "unable to find usable node.js executable."
+  exit 1
+fi
+
+exec "${NODE}" "${DIR}/src/cli/cli" ${@}
+
diff --git a/bin/kibana.bat b/bin/kibana.bat
new file mode 100644
index 0000000000000..c038248b11bae
--- /dev/null
+++ b/bin/kibana.bat
@@ -0,0 +1,25 @@
+@echo off
+
+SETLOCAL
+
+set SCRIPT_DIR=%~dp0
+for %%I in ("%SCRIPT_DIR%..") do set DIR=%%~dpfI
+
+set NODE=%DIR%\node\node.exe
+for /f "delims=" %%i in ('WHERE node') do set SYS_NODE=%%i
+
+If Not Exist "%NODE%" (
+  IF Exist "%SYS_NODE%" (
+    set NODE=%SYS_NODE%
+  ) else (
+    Echo unable to find usable node.js executable.
+    Exit /B 1
+  )
+)
+
+TITLE Kibana Server
+"%NODE%" "%DIR%\src\cli\cli" %*
+
+:finally
+
+ENDLOCAL
\ No newline at end of file
diff --git a/bower.json b/bower.json
deleted file mode 100644
index 7355190249dae..0000000000000
--- a/bower.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "name": "kibana",
-  "authors": [
-    "Spencer Alger <spencer@spenceralger.com>"
-  ],
-  "description": "Browser based analytics and search interface to Logstash and other timestamped data sets stored in ElasticSearch",
-  "main": "src/index.html",
-  "keywords": [
-    "kibana",
-    "elasticsearch"
-  ],
-  "license": "Apache 2.0",
-  "homepage": "http://www.elastic.co/products/kibana",
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ],
-  "dependencies": {
-    "angular": "1.2.28",
-    "angular-bindonce": "0.3.3",
-    "angular-bootstrap": "0.10.0",
-    "angular-elastic": "2.4.2",
-    "angular-mocks": "1.2.28",
-    "angular-nvd3": "https://github.com/krispo/angular-nvd3.git#1.0.0-beta",
-    "angular-route": "1.2.28",
-    "angular-ui-ace": "0.2.3",
-    "bluebird": "~2.9.27",
-    "bootstrap": "3.3.4",
-    "d3": "3.5.5",
-    "elasticsearch": "~5.0.0",
-    "Faker": "1.1.0",
-    "FileSaver": "babc6d9d8f",
-    "font-awesome": "4.3.0",
-    "gridster": "0.5.6",
-    "jquery": "2.1.4",
-    "leaflet": "0.7.3",
-    "Leaflet.heat": "Leaflet/Leaflet.heat#627ede7c11bbe43",
-    "lesshat": "3.0.2",
-    "lodash": "3.9.3",
-    "moment": "2.10.3",
-    "moment-timezone": "0.4.0",
-    "ng-clip": "0.2.6",
-    "require-css": "0.1.8",
-    "requirejs": "2.1.18",
-    "requirejs-text": "2.0.14",
-    "marked": "0.3.3",
-    "numeral": "1.5.3",
-    "nvd3": "1.7.1",
-    "leaflet-draw": "0.2.4"
-  },
-  "devDependencies": {},
-  "resolutions": {
-    "angular": "1.2.28",
-    "d3": "3.5.5"
-  }
-}
diff --git a/config/kibana.yml b/config/kibana.yml
new file mode 100644
index 0000000000000..0b39cefc79e19
--- /dev/null
+++ b/config/kibana.yml
@@ -0,0 +1,63 @@
+# Kibana is served by a back end server. This controls which port to use.
+# server.port: 5601
+
+# The host to bind the server to.
+# server.host: "0.0.0.0"
+
+# The Elasticsearch instance to use for all your queries.
+# elasticsearch.url: "http://localhost:9200"
+
+# preserve_elasticsearch_host true will send the hostname specified in `elasticsearch`. If you set it to false,
+# then the host you use to connect to *this* Kibana instance will be sent.
+# elasticsearch.preserveHost: true
+
+# Kibana uses an index in Elasticsearch to store saved searches, visualizations
+# and dashboards. It will create a new index if it doesn't already exist.
+# kibana.index: ".kibana"
+
+# The default application to load.
+# kibana.defaultAppId: "discover"
+
+# If your Elasticsearch is protected with basic auth, this is the user credentials
+# used by the Kibana server to perform maintence on the kibana_index at statup. Your Kibana
+# users will still need to authenticate with Elasticsearch (which is proxied thorugh
+# the Kibana server)
+# elasticsearch.username: user
+# elasticsearch.password: pass
+
+# If your Elasticsearch requires client certificate and key
+# elasticsearch.ssl.cert: /path/to/your/client.crt
+# elasticsearch.ssl.key: /path/to/your/client.key
+
+# If you need to provide a CA certificate for your Elasticsearch instance, put
+# the path of the pem file here.
+# elasticsearch.ssl.ca: /path/to/your/CA.pem
+
+# Set to false to have a complete disregard for the validity of the SSL
+# certificate.
+# elasticsearch.ssl.verify: true
+
+# Time in milliseconds to wait for elasticsearch to respond to pings, defaults to
+# request_timeout setting
+# elasticsearch.pingTimeout: 1500
+
+# Time in milliseconds to wait for responses from the back end or elasticsearch.
+# This must be > 0
+# elasticsearch.requestTimeout: 300000
+
+# Time in milliseconds for Elasticsearch to wait for responses from shards.
+# Set to 0 to disable.
+# elasticsearch.shardTimeout: 0
+
+# Time in milliseconds to wait for Elasticsearch at Kibana startup before retrying
+# elasticsearch.startupTimeout: 5000
+
+# SSL for outgoing requests from the Kibana Server (PEM formatted)
+# server.ssl.cert: /path/to/your/server.key
+# server.ssl.key: /path/to/your/server.crt
+
+# Set the path to where you would like the process id file to be created.
+# pid.file: /var/run/kibana.pid
+
+# If you would like to send the log output to a file you can set the path below.
+# logging.dest: stdout
diff --git a/karma.conf.js b/karma.conf.js
new file mode 100644
index 0000000000000..8047db42cd637
--- /dev/null
+++ b/karma.conf.js
@@ -0,0 +1,62 @@
+// Karma configuration
+// Generated on Mon Jul 27 2015 04:03:51 GMT-0700 (MST)
+
+module.exports = function (config) {
+  config.set({
+
+    // base path that will be used to resolve all patterns (eg. files, exclude)
+    basePath: '',
+
+    captureTimeout: 30000,
+    browserNoActivityTimeout: 120000,
+
+    // frameworks to use
+    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+    frameworks: ['mocha'],
+
+    // list of files / patterns to load in the browser
+    files: [
+      'http://localhost:5601/bundles/tests.bundle.js',
+      'http://localhost:5601/bundles/tests.bundle.style.css'
+    ],
+
+    proxies: {
+      '/tests/': 'http://localhost:5601/tests/',
+      '/bundles/': 'http://localhost:5601/bundles/'
+    },
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+    reporters: ['progress', 'growl'],
+
+
+    // web server port
+    port: 9876,
+
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_INFO,
+
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: false,
+
+
+    // start these browsers
+    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+    browsers: [
+      require('os').platform() === 'win32' ? 'IE' : 'Chrome'
+    ],
+
+
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
+    singleRun: false
+  });
+};
diff --git a/package.json b/package.json
index efe4bbc5139a6..439ddd5e2acf7 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,10 @@
   ],
   "private": false,
   "version": "4.2.0-snapshot",
-  "main": "src/server/index.js",
+  "build": {
+    "num": 8095
+  },
+  "main": "src/server/KbnServer.js",
   "homepage": "https://www.elastic.co/products/kibana",
   "bugs": {
     "url": "http://github.com/elastic/kibana/issues"
@@ -30,7 +33,7 @@
   ],
   "scripts": {
     "test": "grunt test",
-    "start": "node ./src/server/bin/kibana.js",
+    "start": "node ./src/server/cli/index.js --dev",
     "precommit": "grunt lintStagedFiles"
   },
   "repository": {
@@ -38,84 +41,117 @@
     "url": "https://github.com/elastic/kibana.git"
   },
   "dependencies": {
+    "@spalger/angular-bootstrap": "^0.10.0",
+    "@spalger/filesaver": "^1.1.2",
+    "@spalger/leaflet-draw": "^0.2.3",
+    "@spalger/leaflet-heat": "^0.1.3",
+    "@spalger/ui-ace": "^0.2.3",
+    "Nonsense": "^0.1.2",
+    "angular": "1.2.28",
+    "angular-bindonce": "0.3.1",
+    "angular-elastic": "2.5.0",
+    "angular-mocks": "1.2.28",
+    "angular-nvd3": "panda01/angular-nvd3#kibana",
+    "angular-route": "1.2.28",
     "ansicolors": "^0.3.2",
+    "auto-preload-rjscommon-deps-loader": "^1.0.3",
+    "autoprefixer": "^5.2.0",
+    "autoprefixer-loader": "^2.0.0",
     "bluebird": "^2.9.27",
-    "body-parser": "^1.10.1",
+    "boom": "^2.8.0",
+    "bootstrap": "^3.3.5",
+    "brace": "^0.5.1",
     "bunyan": "^1.2.3",
-    "commander": "^2.6.0",
-    "compression": "^1.3.0",
-    "cookie-parser": "^1.3.3",
-    "debug": "^2.1.1",
+    "chokidar": "^1.0.4",
+    "commander": "^2.8.1",
+    "css-loader": "^0.15.1",
+    "d3": "^3.5.6",
     "elasticsearch": "^5.0.0",
+    "elasticsearch-browser": "^5.0.0",
     "expiry-js": "^0.1.7",
-    "express": "^4.10.6",
+    "exports-loader": "^0.6.2",
+    "expose-loader": "^0.7.0",
+    "extract-text-webpack-plugin": "^0.8.2",
+    "file-loader": "^0.8.4",
+    "font-awesome": "^4.3.0",
     "glob": "^4.3.2",
-    "good": "^5.1.2",
-    "good-console": "^4.1.0",
-    "good-file": "^4.0.2",
-    "good-reporter": "^3.1.0",
+    "good": "^6.2.0",
+    "good-squeeze": "^2.1.0",
+    "gridster": "^0.5.6",
     "hapi": "^8.6.1",
+    "imports-loader": "^0.6.4",
+    "is-array": "^1.0.1",
+    "jade": "^1.7.2",
+    "jade-loader": "^0.7.1",
     "joi": "^6.4.3",
+    "jquery": "^2.1.4",
     "js-yaml": "^3.2.5",
     "json-stringify-safe": "^5.0.1",
-    "lodash": "^3.9.3",
+    "leaflet": "^0.7.3",
+    "less": "^2.5.1",
+    "less-loader": "^2.2.0",
+    "lodash": "^3.10.0",
+    "marked": "^0.3.3",
+    "memory-fs": "^0.2.0",
+    "minimatch": "^2.0.8",
+    "mkdirp": "^0.5.1",
     "moment": "^2.10.3",
+    "moment-timezone": "^0.4.0",
+    "ng-clip": "^0.2.6",
     "numeral": "^1.5.3",
+    "nvd3": "panda01/nvd3#kibana",
+    "raw-loader": "^0.5.1",
     "request": "^2.40.0",
     "requirefrom": "^0.2.0",
-    "rimraf": "^2.4.0",
+    "rimraf": "^2.4.1",
+    "script-loader": "^0.6.1",
     "semver": "^4.3.6",
-    "serve-favicon": "^2.2.0",
-    "through": "^2.3.6"
+    "style-loader": "^0.12.3",
+    "tar": "^2.1.1",
+    "url-loader": "^0.5.6",
+    "webpack": "^1.10.0",
+    "webpack-directory-name-as-main": "^1.0.0",
+    "zeroclipboard": "^2.2.0"
   },
   "devDependencies": {
-    "bower": "^1.4.1",
-    "bower-license": "^0.2.6",
-    "event-stream": "^3.1.5",
+    "auto-release-sinon": "^1.0.3",
     "expect.js": "^0.3.1",
+    "faker": "^1.1.0",
     "grunt": "^0.4.5",
     "grunt-cli": "0.1.13",
     "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-compress": "^0.13.0",
     "grunt-contrib-copy": "^0.8.0",
-    "grunt-contrib-jade": "^0.14.0",
     "grunt-contrib-jshint": "^0.11",
-    "grunt-contrib-less": "^1.0.1",
-    "grunt-contrib-requirejs": "^0.4.4",
-    "grunt-contrib-watch": "^0.6.1",
     "grunt-esvm": "^1.0.1",
     "grunt-jscs": "^1.8.0",
-    "grunt-mocha": "^0.4.10",
+    "grunt-karma": "^0.12.0",
     "grunt-replace": "^0.7.9",
-    "grunt-run": "^0.3.0",
+    "grunt-run": "spalger/grunt-run#master",
     "grunt-s3": "^0.2.0-alpha.3",
     "grunt-simple-mocha": "^0.4.0",
     "html-entities": "^1.1.1",
-    "http-proxy": "^1.8.1",
     "husky": "^0.8.1",
-    "istanbul": "^0.3.15",
-    "jade": "^1.8.2",
+    "karma": "^0.13.3",
+    "karma-chrome-launcher": "^0.2.0",
+    "karma-firefox-launcher": "^0.1.6",
+    "karma-growl-reporter": "^0.1.1",
+    "karma-ie-launcher": "^0.2.0",
+    "karma-mocha": "^0.2.0",
     "libesvm": "^1.0.1",
     "license-checker": "^3.1.0",
     "load-grunt-config": "^0.7.0",
-    "marked": "^0.3.3",
     "marked-text-renderer": "^0.1.0",
-    "mkdirp": "^0.5.0",
     "mocha": "^2.2.5",
-    "nock": "^2.7.0",
+    "nock": "^2.9.0",
     "npm": "^2.11.0",
-    "opn": "^1.0.0",
-    "path-browserify": "0.0.0",
     "portscanner": "^1.0.0",
-    "progress": "^1.1.8",
-    "requirejs": "^2.1.14",
-    "rjs-build-analysis": "0.0.3",
     "simple-git": "^1.3.0",
-    "sinon": "^1.12.2",
-    "tar": "^2.1.1"
+    "sinon": "^1.15.4",
+    "source-map": "^0.4.4",
+    "whatwg-fetch": "^0.9.0"
   },
   "engines": {
-    "node": "~0.10 || ~0.12",
-    "iojs": ">=1.5"
+    "node": ">=2"
   }
 }
diff --git a/src/cli/Command.js b/src/cli/Command.js
new file mode 100644
index 0000000000000..427725946dab9
--- /dev/null
+++ b/src/cli/Command.js
@@ -0,0 +1,85 @@
+'use strict';
+
+let _ = require('lodash');
+let Command = require('commander').Command;
+
+let red = require('./color').red;
+let yellow = require('./color').yellow;
+let help = require('./help');
+
+Command.prototype.error = function (err) {
+  if (err && err.message) err = err.message;
+
+  console.log(
+`
+${red(' ERROR ')} ${err}
+
+${help(this, '  ')}
+`
+  );
+
+  process.exit(64);
+};
+
+Command.prototype.defaultHelp = function () {
+  console.log(
+`
+${help(this, '  ')}
+
+`
+  );
+
+  process.exit(64);
+};
+
+Command.prototype.unknownArgv = function (argv) {
+  if (argv) this.__unkownArgv = argv;
+  return this.__unkownArgv ? this.__unkownArgv.slice(0) : [];
+};
+
+/**
+ * setup the command to accept arbitrary configuration via the cli
+ * @return {[type]} [description]
+ */
+Command.prototype.collectUnknownOptions = function () {
+  let title = `Extra ${this._name} options`;
+
+  this.allowUnknownOption();
+  this.getUnknownOptions = function () {
+    let opts = {};
+    let unknowns = this.unknownArgv();
+
+    while (unknowns.length) {
+      let opt = unknowns.shift().split('=');
+      if (opt[0].slice(0, 2) !== '--') {
+        this.error(`${title} "${opt[0]}" must start with "--"`);
+      }
+
+      if (opt.length === 1) {
+        if (!unknowns.length || unknowns[0][0] === '-') {
+          this.error(`${title} "${opt[0]}" must have a value`);
+        }
+
+        opt.push(unknowns.shift());
+      }
+
+      let val = opt[1];
+      try { val = JSON.parse(opt[1]); }
+      catch (e) { val = opt[1]; }
+
+      _.set(opts, opt[0].slice(2), val);
+    }
+
+    return opts;
+  };
+
+  return this;
+};
+
+Command.prototype.parseOptions = _.wrap(Command.prototype.parseOptions, function (parse, argv) {
+  let opts = parse.call(this, argv);
+  this.unknownArgv(opts.unknown);
+  return opts;
+});
+
+module.exports = Command;
diff --git a/src/cli/Log.js b/src/cli/Log.js
new file mode 100644
index 0000000000000..1800093c4062c
--- /dev/null
+++ b/src/cli/Log.js
@@ -0,0 +1,18 @@
+'use strict';
+
+let _ = require('lodash');
+let ansicolors = require('ansicolors');
+
+let log = _.restParam(function (color, label, rest1) {
+  console.log.apply(console, [color(` ${_.trim(label)} `)].concat(rest1));
+});
+
+let color = require('./color');
+
+module.exports = class Log {
+  constructor(quiet, silent) {
+    this.good = quiet || silent ? _.noop : _.partial(log, color.green);
+    this.warn = quiet || silent ? _.noop : _.partial(log, color.yellow);
+    this.bad = silent ? _.noop : _.partial(log, color.red);
+  }
+};
diff --git a/src/cli/cli.js b/src/cli/cli.js
new file mode 100644
index 0000000000000..97b2b4f795c22
--- /dev/null
+++ b/src/cli/cli.js
@@ -0,0 +1,49 @@
+'use strict';
+
+let _ = require('lodash');
+
+let utils = require('requirefrom')('src/utils');
+let pkg = utils('packageJson');
+let Command = require('./Command');
+
+let argv = process.env.kbnWorkerArgv ? JSON.parse(process.env.kbnWorkerArgv) : process.argv.slice();
+let program = new Command('bin/kibana');
+
+program
+.version(pkg.version)
+.description(
+  'Kibana is an open source (Apache Licensed), browser ' +
+  'based analytics and search dashboard for Elasticsearch.'
+);
+
+// attach commands
+require('./serve/serve')(program);
+require('./plugin/plugin')(program);
+
+program
+.command('help <command>')
+.description('Get the help for a specific command')
+.action(function (cmdName) {
+  var cmd = _.find(program.commands, { _name: cmdName });
+  if (!cmd) return this.error(`unknown command ${cmd}`);
+  cmd.help();
+});
+
+program
+.command('*', null, { noHelp: true })
+.action(function (cmd, options) {
+  program.error(`unknown command ${cmd}`);
+});
+
+// check for no command name
+var subCommand = argv[2] && !String(argv[2][0]).match(/^-|^\.|\//);
+
+if (!subCommand) {
+  if (_.intersection(argv.slice(2), ['-h', '--help']).length) {
+    program.defaultHelp();
+  } else {
+    argv.splice(2, 0, ['serve']);
+  }
+}
+
+program.parse(argv);
diff --git a/src/cli/color.js b/src/cli/color.js
new file mode 100644
index 0000000000000..ae53be757154e
--- /dev/null
+++ b/src/cli/color.js
@@ -0,0 +1,7 @@
+
+var _ = require('lodash');
+var ansicolors = require('ansicolors');
+
+exports.green = _.flow(ansicolors.black, ansicolors.bgGreen);
+exports.red = _.flow(ansicolors.white, ansicolors.bgRed);
+exports.yellow = _.flow(ansicolors.black, ansicolors.bgYellow);
diff --git a/src/cli/help.js b/src/cli/help.js
new file mode 100644
index 0000000000000..39e775a0d0f2a
--- /dev/null
+++ b/src/cli/help.js
@@ -0,0 +1,76 @@
+'use strict';
+
+var _ = require('lodash');
+
+module.exports = function (command, spaces) {
+  if (!_.size(command.commands)) {
+    return command.outputHelp();
+  }
+
+  let defCmd = _.find(command.commands, function (cmd) {
+    return cmd._name === 'serve';
+  });
+
+  let desc = !command.description() ? '' : command.description();
+  let cmdDef = !defCmd ? '' : `=${defCmd._name}`;
+
+  return (
+`
+Usage: ${command._name} [command${cmdDef}] [options]
+
+${desc}
+
+Commands:
+${indent(commandsSummary(command), 2)}
+
+${cmdHelp(defCmd)}
+`
+  ).trim().replace(/^/gm, spaces || '');
+};
+
+function indent(str, n) {
+  return String(str || '').trim().replace(/^/gm, _.repeat(' ', n));
+}
+
+function commandsSummary(program) {
+  let cmds = _.compact(program.commands.map(function (cmd) {
+    let name = cmd._name;
+    if (name === '*') return;
+    let opts = cmd.options.length ? ' [options]' : '';
+    let args = cmd._args.map(function (arg) {
+      return humanReadableArgName(arg);
+    }).join(' ');
+
+    return [
+      `${name} ${opts} ${args}`,
+      cmd.description()
+    ];
+  }));
+
+  let cmdLColWidth = cmds.reduce(function (width, cmd) {
+    return Math.max(width, cmd[0].length);
+  }, 0);
+
+  return cmds.reduce(function (help, cmd) {
+    return `${help || ''}${_.padRight(cmd[0], cmdLColWidth)} ${cmd[1] || ''}\n`;
+  }, '');
+}
+
+function cmdHelp(cmd) {
+  if (!cmd) return '';
+  return (
+
+`
+"${cmd._name}" Options:
+
+${indent(cmd.optionHelp(), 2)}
+`
+
+  ).trim();
+
+}
+
+function humanReadableArgName(arg) {
+  var nameOutput = arg.name + (arg.variadic === true ? '...' : '');
+  return arg.required ? '<' + nameOutput + '>' : '[' + nameOutput + ']';
+}
diff --git a/test/unit/server/bin/plugin/npmInstall.js b/src/cli/plugin/__tests__/npmInstall.js
similarity index 91%
rename from test/unit/server/bin/plugin/npmInstall.js
rename to src/cli/plugin/__tests__/npmInstall.js
index 60c6593766a13..1994f3d568e7b 100644
--- a/test/unit/server/bin/plugin/npmInstall.js
+++ b/src/cli/plugin/__tests__/npmInstall.js
@@ -1,4 +1,3 @@
-var root = require('requirefrom')('');
 var expect = require('expect.js');
 var nock = require('nock');
 var glob = require('glob');
@@ -6,8 +5,9 @@ var rimraf = require('rimraf');
 var fs = require('fs');
 var join = require('path').join;
 var sinon = require('sinon');
-var pluginLogger = root('src/server/bin/plugin/pluginLogger');
-var npmInstall = root('src/server/bin/plugin/npmInstall');
+
+var pluginLogger = require('../pluginLogger');
+var npmInstall = require('../npmInstall');
 
 describe('kibana cli', function () {
 
@@ -66,4 +66,4 @@ describe('kibana cli', function () {
 
   });
 
-});
\ No newline at end of file
+});
diff --git a/src/cli/plugin/__tests__/plugin.js b/src/cli/plugin/__tests__/plugin.js
new file mode 100644
index 0000000000000..1a53ce3b61158
--- /dev/null
+++ b/src/cli/plugin/__tests__/plugin.js
@@ -0,0 +1,80 @@
+var expect = require('expect.js');
+var sinon = require('sinon');
+
+var plugin = require('../plugin');
+var installer = require('../pluginInstaller');
+var remover = require('../pluginRemover');
+var settingParser = require('../settingParser');
+
+describe('kibana cli', function () {
+
+  describe('plugin installer', function () {
+
+    describe('commander options', function () {
+
+      var program = {
+        command: function () { return program; },
+        description: function () { return program; },
+        option: function () { return program; },
+        action: function () { return program; }
+      };
+
+      it('should define the command', function () {
+        sinon.spy(program, 'command');
+
+        plugin(program);
+        expect(program.command.calledWith('plugin')).to.be(true);
+
+        program.command.restore();
+      });
+
+      it('should define the description', function () {
+        sinon.spy(program, 'description');
+
+        plugin(program);
+        expect(program.description.calledWith('Maintain Plugins')).to.be(true);
+
+        program.description.restore();
+      });
+
+      it('should define the command line options', function () {
+        var spy = sinon.spy(program, 'option');
+
+        var options = [
+          /-i/,
+          /-r/,
+          /-s/,
+          /-u/,
+          /-t/
+        ];
+
+        plugin(program);
+
+        for (var i = 0; i < spy.callCount; i++) {
+          var call = spy.getCall(i);
+          for (var o = 0; o < options.length; o++) {
+            var option = options[o];
+            if (call.args[0].match(option)) {
+              options.splice(o, 1);
+              break;
+            }
+          }
+        }
+
+        expect(options).to.have.length(0);
+      });
+
+      it('should call the action function', function () {
+        sinon.spy(program, 'action');
+
+        plugin(program);
+        expect(program.action.calledOnce).to.be(true);
+
+        program.action.restore();
+      });
+
+    });
+
+  });
+
+});
diff --git a/test/unit/server/bin/plugin/pluginCleaner.js b/src/cli/plugin/__tests__/pluginCleaner.js
similarity index 95%
rename from test/unit/server/bin/plugin/pluginCleaner.js
rename to src/cli/plugin/__tests__/pluginCleaner.js
index 933c32b683ba8..2cf0f7d610e75 100644
--- a/test/unit/server/bin/plugin/pluginCleaner.js
+++ b/src/cli/plugin/__tests__/pluginCleaner.js
@@ -1,10 +1,10 @@
-var root = require('requirefrom')('');
 var expect = require('expect.js');
 var sinon = require('sinon');
 var fs = require('fs');
 var rimraf = require('rimraf');
-var pluginCleaner = root('src/server/bin/plugin/pluginCleaner');
-var pluginLogger = root('src/server/bin/plugin/pluginLogger');
+
+var pluginCleaner = require('../pluginCleaner');
+var pluginLogger = require('../pluginLogger');
 
 describe('kibana cli', function () {
 
@@ -144,4 +144,4 @@ describe('kibana cli', function () {
 
   });
 
-});
\ No newline at end of file
+});
diff --git a/src/cli/plugin/__tests__/pluginDownloader.js b/src/cli/plugin/__tests__/pluginDownloader.js
new file mode 100644
index 0000000000000..e1c56ea333c63
--- /dev/null
+++ b/src/cli/plugin/__tests__/pluginDownloader.js
@@ -0,0 +1,249 @@
+var expect = require('expect.js');
+var sinon = require('sinon');
+var nock = require('nock');
+var glob = require('glob');
+var rimraf = require('rimraf');
+var join = require('path').join;
+
+var pluginLogger = require('../pluginLogger');
+var pluginDownloader = require('../pluginDownloader');
+
+describe('kibana cli', function () {
+
+  describe('plugin downloader', function () {
+
+    var testWorkingPath = join(__dirname, '.test.data');
+    var logger;
+    var downloader;
+
+    beforeEach(function () {
+      logger = pluginLogger(false);
+      sinon.stub(logger, 'log');
+      sinon.stub(logger, 'error');
+      rimraf.sync(testWorkingPath);
+    });
+
+    afterEach(function () {
+      logger.log.restore();
+      logger.error.restore();
+      rimraf.sync(testWorkingPath);
+    });
+
+    describe('_downloadSingle', function () {
+
+      beforeEach(function () {
+        downloader = pluginDownloader({}, logger);
+      });
+
+      afterEach(function () {
+      });
+
+      it.skip('should throw an ENOTFOUND error for a 404 error', function () {
+        var couchdb = nock('http://www.files.com')
+                .get('/plugin.tar.gz')
+                .reply(404);
+
+        var source = 'http://www.files.com/plugin.tar.gz';
+
+        var errorStub = sinon.stub();
+        return downloader._downloadSingle(source, testWorkingPath, 0, logger)
+        .catch(errorStub)
+        .then(function (data) {
+          expect(errorStub.called).to.be(true);
+          expect(errorStub.lastCall.args[0].message).to.match(/ENOTFOUND/);
+
+          var files = glob.sync('**/*', { cwd: testWorkingPath });
+          expect(files).to.eql([]);
+        });
+      });
+
+      it.skip('should download and extract a valid plugin', function () {
+        var filename = join(__dirname, 'replies/test-plugin-master.tar.gz');
+        var couchdb = nock('http://www.files.com')
+        .defaultReplyHeaders({
+          'content-length': '10'
+        })
+        .get('/plugin.tar.gz')
+        .replyWithFile(200, filename);
+
+        var source = 'http://www.files.com/plugin.tar.gz';
+
+        return downloader._downloadSingle(source, testWorkingPath, 0, logger)
+        .then(function (data) {
+          var files = glob.sync('**/*', { cwd: testWorkingPath });
+          var expected = [
+            'README.md',
+            'index.js',
+            'package.json',
+            'public',
+            'public/app.js'
+          ];
+          expect(files.sort()).to.eql(expected.sort());
+        });
+      });
+
+      it('should abort the download and extraction for a corrupt archive.', function () {
+        var filename = join(__dirname, 'replies/corrupt.tar.gz');
+        var couchdb = nock('http://www.files.com')
+        .get('/plugin.tar.gz')
+        .replyWithFile(200, filename);
+
+        var source = 'http://www.files.com/plugin.tar.gz';
+
+        var errorStub = sinon.stub();
+        return downloader._downloadSingle(source, testWorkingPath, 0, logger)
+        .catch(errorStub)
+        .then(function (data) {
+          expect(errorStub.called).to.be(true);
+
+          var files = glob.sync('**/*', { cwd: testWorkingPath });
+          expect(files).to.eql([]);
+        });
+      });
+
+    });
+
+    describe('download', function () {
+
+      beforeEach(function () {});
+
+      afterEach(function () {});
+
+      it.skip('should loop through bad urls until it finds a good one.', function () {
+        var filename = join(__dirname, 'replies/test-plugin-master.tar.gz');
+        var settings = {
+          urls: [
+            'http://www.files.com/badfile1.tar.gz',
+            'http://www.files.com/badfile2.tar.gz',
+            'I am a bad uri',
+            'http://www.files.com/goodfile.tar.gz'
+          ],
+          workingPath: testWorkingPath,
+          timeout: 0
+        };
+        downloader = pluginDownloader(settings, logger);
+
+        var couchdb = nock('http://www.files.com')
+        .defaultReplyHeaders({
+          'content-length': '10'
+        })
+        .get('/badfile1.tar.gz')
+        .reply(404)
+        .get('/badfile2.tar.gz')
+        .reply(404)
+        .get('/goodfile.tar.gz')
+        .replyWithFile(200, filename);
+
+        var errorStub = sinon.stub();
+        return downloader.download(settings, logger)
+        .catch(errorStub)
+        .then(function (data) {
+          expect(errorStub.called).to.be(false);
+
+          expect(logger.log.getCall(0).args[0]).to.match(/badfile1.tar.gz/);
+          expect(logger.log.getCall(1).args[0]).to.match(/badfile2.tar.gz/);
+          expect(logger.log.getCall(2).args[0]).to.match(/I am a bad uri/);
+          expect(logger.log.getCall(3).args[0]).to.match(/goodfile.tar.gz/);
+          expect(logger.log.lastCall.args[0]).to.match(/complete/i);
+
+          var files = glob.sync('**/*', { cwd: testWorkingPath });
+          var expected = [
+            'README.md',
+            'index.js',
+            'package.json',
+            'public',
+            'public/app.js'
+          ];
+          expect(files.sort()).to.eql(expected.sort());
+        });
+      });
+
+      it.skip('should stop looping through urls when it finds a good one.', function () {
+        var filename = join(__dirname, 'replies/test-plugin-master.tar.gz');
+        var settings = {
+          urls: [
+            'http://www.files.com/badfile1.tar.gz',
+            'http://www.files.com/badfile2.tar.gz',
+            'http://www.files.com/goodfile.tar.gz',
+            'http://www.files.com/badfile3.tar.gz'
+          ],
+          workingPath: testWorkingPath,
+          timeout: 0
+        };
+        downloader = pluginDownloader(settings, logger);
+
+        var couchdb = nock('http://www.files.com')
+        .defaultReplyHeaders({
+          'content-length': '10'
+        })
+        .get('/badfile1.tar.gz')
+        .reply(404)
+        .get('/badfile2.tar.gz')
+        .reply(404)
+        .get('/goodfile.tar.gz')
+        .replyWithFile(200, filename)
+        .get('/badfile3.tar.gz')
+        .reply(404);
+
+        var errorStub = sinon.stub();
+        return downloader.download(settings, logger)
+        .catch(errorStub)
+        .then(function (data) {
+          expect(errorStub.called).to.be(false);
+
+          for (var i = 0; i < logger.log.callCount; i++) {
+            expect(logger.log.getCall(i).args[0]).to.not.match(/badfile3.tar.gz/);
+          }
+
+          var files = glob.sync('**/*', { cwd: testWorkingPath });
+          var expected = [
+            'README.md',
+            'index.js',
+            'package.json',
+            'public',
+            'public/app.js'
+          ];
+          expect(files.sort()).to.eql(expected.sort());
+        });
+      });
+
+      it.skip('should throw an error when it doesn\'t find a good url.', function () {
+        var settings = {
+          urls: [
+            'http://www.files.com/badfile1.tar.gz',
+            'http://www.files.com/badfile2.tar.gz',
+            'http://www.files.com/badfile3.tar.gz'
+          ],
+          workingPath: testWorkingPath,
+          timeout: 0
+        };
+        downloader = pluginDownloader(settings, logger);
+
+        var couchdb = nock('http://www.files.com')
+        .defaultReplyHeaders({
+          'content-length': '10'
+        })
+        .get('/badfile1.tar.gz')
+        .reply(404)
+        .get('/badfile2.tar.gz')
+        .reply(404)
+        .get('/badfile3.tar.gz')
+        .reply(404);
+
+        var errorStub = sinon.stub();
+        return downloader.download(settings, logger)
+        .catch(errorStub)
+        .then(function (data) {
+          expect(errorStub.called).to.be(true);
+          expect(errorStub.lastCall.args[0].message).to.match(/not a valid/i);
+
+          var files = glob.sync('**/*', { cwd: testWorkingPath });
+          expect(files).to.eql([]);
+        });
+      });
+
+    });
+
+  });
+
+});
diff --git a/test/unit/server/bin/plugin/pluginInstaller.js b/src/cli/plugin/__tests__/pluginInstaller.js
similarity index 91%
rename from test/unit/server/bin/plugin/pluginInstaller.js
rename to src/cli/plugin/__tests__/pluginInstaller.js
index 05e6b62b54874..f8a3de3c04939 100644
--- a/test/unit/server/bin/plugin/pluginInstaller.js
+++ b/src/cli/plugin/__tests__/pluginInstaller.js
@@ -1,4 +1,3 @@
-var root = require('requirefrom')('');
 var expect = require('expect.js');
 var sinon = require('sinon');
 var nock = require('nock');
@@ -6,10 +5,11 @@ var glob = require('glob');
 var rimraf = require('rimraf');
 var fs = require('fs');
 var join = require('path').join;
-var pluginLogger = root('src/server/bin/plugin/pluginLogger');
-var pluginInstaller = root('src/server/bin/plugin/pluginInstaller');
 var Promise = require('bluebird');
 
+var pluginLogger = require('../pluginLogger');
+var pluginInstaller = require('../pluginInstaller');
+
 describe('kibana cli', function () {
 
   describe('plugin installer', function () {
@@ -71,4 +71,4 @@ describe('kibana cli', function () {
 
   });
 
-});
\ No newline at end of file
+});
diff --git a/test/unit/server/bin/plugin/pluginLogger.js b/src/cli/plugin/__tests__/pluginLogger.js
similarity index 97%
rename from test/unit/server/bin/plugin/pluginLogger.js
rename to src/cli/plugin/__tests__/pluginLogger.js
index c19885d2f296c..9390c46089c04 100644
--- a/test/unit/server/bin/plugin/pluginLogger.js
+++ b/src/cli/plugin/__tests__/pluginLogger.js
@@ -1,8 +1,8 @@
-var root = require('requirefrom')('');
-var pluginLogger = root('src/server/bin/plugin/pluginLogger');
 var expect = require('expect.js');
 var sinon = require('sinon');
 
+var pluginLogger = require('../pluginLogger');
+
 describe('kibana cli', function () {
 
   describe('plugin installer', function () {
@@ -125,4 +125,4 @@ describe('kibana cli', function () {
 
   });
 
-});
\ No newline at end of file
+});
diff --git a/test/unit/server/bin/plugin/progressReporter.js b/src/cli/plugin/__tests__/progressReporter.js
similarity index 98%
rename from test/unit/server/bin/plugin/progressReporter.js
rename to src/cli/plugin/__tests__/progressReporter.js
index 68d5d64d82274..d943a45ffc12c 100644
--- a/test/unit/server/bin/plugin/progressReporter.js
+++ b/src/cli/plugin/__tests__/progressReporter.js
@@ -1,8 +1,7 @@
-var root = require('requirefrom')('');
 var expect = require('expect.js');
 var sinon = require('sinon');
-var progressReporter = root('src/server/bin/plugin/progressReporter');
-var pluginLogger = root('src/server/bin/plugin/pluginLogger');
+var progressReporter = require('../progressReporter');
+var pluginLogger = require('../pluginLogger');
 
 describe('kibana cli', function () {
 
@@ -299,4 +298,4 @@ describe('kibana cli', function () {
 
   });
 
-});
\ No newline at end of file
+});
diff --git a/test/unit/server/bin/plugin/replies/corrupt.tar.gz b/src/cli/plugin/__tests__/replies/corrupt.tar.gz
similarity index 100%
rename from test/unit/server/bin/plugin/replies/corrupt.tar.gz
rename to src/cli/plugin/__tests__/replies/corrupt.tar.gz
diff --git a/test/unit/server/bin/plugin/replies/package.json b/src/cli/plugin/__tests__/replies/package.json
similarity index 100%
rename from test/unit/server/bin/plugin/replies/package.json
rename to src/cli/plugin/__tests__/replies/package.json
diff --git a/test/unit/server/bin/plugin/replies/plugin-no-package.gz b/src/cli/plugin/__tests__/replies/plugin-no-package.gz
similarity index 100%
rename from test/unit/server/bin/plugin/replies/plugin-no-package.gz
rename to src/cli/plugin/__tests__/replies/plugin-no-package.gz
diff --git a/test/unit/server/bin/plugin/replies/test-plugin-master.tar.gz b/src/cli/plugin/__tests__/replies/test-plugin-master.tar.gz
similarity index 100%
rename from test/unit/server/bin/plugin/replies/test-plugin-master.tar.gz
rename to src/cli/plugin/__tests__/replies/test-plugin-master.tar.gz
diff --git a/src/cli/plugin/__tests__/settingParser.js b/src/cli/plugin/__tests__/settingParser.js
new file mode 100644
index 0000000000000..afb499a794d59
--- /dev/null
+++ b/src/cli/plugin/__tests__/settingParser.js
@@ -0,0 +1,325 @@
+var path = require('path');
+var expect = require('expect.js');
+
+var utils = require('requirefrom')('src/utils');
+var fromRoot = utils('fromRoot');
+var settingParser = require('../settingParser');
+
+describe('kibana cli', function () {
+
+  describe('plugin installer', function () {
+
+    describe('command line option parsing', function () {
+
+      describe('parseMilliseconds function', function () {
+
+        var parser = settingParser();
+
+        it('should return 0 for an empty string', function () {
+          var value = '';
+
+          var result = parser.parseMilliseconds(value);
+
+          expect(result).to.be(0);
+        });
+
+        it('should return 0 for a number with an invalid unit of measure', function () {
+          var result = parser.parseMilliseconds('1gigablasts');
+          expect(result).to.be(0);
+        });
+
+        it('should assume a number with no unit of measure is specified as milliseconds', function () {
+          var result = parser.parseMilliseconds(1);
+          expect(result).to.be(1);
+
+          result = parser.parseMilliseconds('1');
+          expect(result).to.be(1);
+        });
+
+        it('should interpret a number with "s" as the unit of measure as seconds', function () {
+          var result = parser.parseMilliseconds('5s');
+          expect(result).to.be(5 * 1000);
+        });
+
+        it('should interpret a number with "second" as the unit of measure as seconds', function () {
+          var result = parser.parseMilliseconds('5second');
+          expect(result).to.be(5 * 1000);
+        });
+
+        it('should interpret a number with "seconds" as the unit of measure as seconds', function () {
+          var result = parser.parseMilliseconds('5seconds');
+          expect(result).to.be(5 * 1000);
+        });
+
+        it('should interpret a number with "m" as the unit of measure as minutes', function () {
+          var result = parser.parseMilliseconds('9m');
+          expect(result).to.be(9 * 1000 * 60);
+        });
+
+        it('should interpret a number with "minute" as the unit of measure as minutes', function () {
+          var result = parser.parseMilliseconds('9minute');
+          expect(result).to.be(9 * 1000 * 60);
+        });
+
+        it('should interpret a number with "minutes" as the unit of measure as minutes', function () {
+          var result = parser.parseMilliseconds('9minutes');
+          expect(result).to.be(9 * 1000 * 60);
+        });
+
+      });
+
+      describe('parse function', function () {
+
+        var options;
+        var parser;
+        beforeEach(function () {
+          options = { install: 'dummy/dummy', pluginDir: fromRoot('installedPlugins') };
+        });
+
+        it('should require the user to specify either install and remove', function () {
+          options.install = null;
+          parser = settingParser(options);
+
+          expect(parser.parse).withArgs().to.throwError(/Please specify either --install or --remove./);
+        });
+
+        it('should not allow the user to specify both install and remove', function () {
+          options.remove = 'package';
+          options.install = 'org/package/version';
+          parser = settingParser(options);
+
+          expect(parser.parse).withArgs().to.throwError(/Please specify either --install or --remove./);
+        });
+
+        describe('quiet option', function () {
+
+          it('should default to false', function () {
+            parser = settingParser(options);
+            var settings = parser.parse(options);
+
+            expect(settings.quiet).to.be(false);
+          });
+
+          it('should set settings.quiet property to true', function () {
+            options.parent = { quiet: true };
+            parser = settingParser(options);
+            var settings = parser.parse(options);
+
+            expect(settings.quiet).to.be(true);
+          });
+
+        });
+
+        describe('silent option', function () {
+
+          it('should default to false', function () {
+            parser = settingParser(options);
+            var settings = parser.parse(options);
+
+            expect(settings).to.have.property('silent', false);
+          });
+
+          it('should set settings.silent property to true', function () {
+            options.silent = true;
+            parser = settingParser(options);
+            var settings = parser.parse(options);
+
+            expect(settings).to.have.property('silent', true);
+          });
+
+        });
+
+
+        describe('timeout option', function () {
+
+          it('should default to 0 (milliseconds)', function () {
+            parser = settingParser(options);
+            var settings = parser.parse(options);
+
+            expect(settings).to.have.property('timeout', 0);
+          });
+
+          it('should set settings.timeout property to specified value', function () {
+            options.timeout = 1234;
+            parser = settingParser(options);
+            var settings = parser.parse(options);
+
+            expect(settings).to.have.property('timeout', 1234);
+          });
+
+        });
+
+        describe('install option', function () {
+
+          it('should set settings.action property to "install"', function () {
+            options.install = 'org/package/version';
+            parser = settingParser(options);
+            var settings = parser.parse(options);
+
+            expect(settings).to.have.property('action', 'install');
+          });
+
+          it('should allow two parts to the install parameter', function () {
+            options.install = 'kibana/test-plugin';
+            parser = settingParser(options);
+
+            expect(parser.parse).withArgs().to.not.throwError();
+
+            var settings = parser.parse(options);
+
+            expect(settings).to.have.property('organization', 'kibana');
+            expect(settings).to.have.property('package', 'test-plugin');
+            expect(settings).to.have.property('version', undefined);
+          });
+
+          it('should allow three parts to the install parameter', function () {
+            options.install = 'kibana/test-plugin/v1.0.1';
+            parser = settingParser(options);
+
+            expect(parser.parse).withArgs().to.not.throwError();
+
+            var settings = parser.parse(options);
+
+            expect(settings).to.have.property('organization', 'kibana');
+            expect(settings).to.have.property('package', 'test-plugin');
+            expect(settings).to.have.property('version', 'v1.0.1');
+          });
+
+          it('should not allow one part to the install parameter', function () {
+            options.install = 'test-plugin';
+            parser = settingParser(options);
+
+            expect(parser.parse).withArgs().to.throwError(/Invalid install option. Please use the format <org>\/<plugin>\/<version>./);
+          });
+
+          it('should not allow more than three parts to the install parameter', function () {
+            options.install = 'kibana/test-plugin/v1.0.1/dummy';
+            parser = settingParser(options);
+
+            expect(parser.parse).withArgs().to.throwError(/Invalid install option. Please use the format <org>\/<plugin>\/<version>./);
+          });
+
+          it('should populate the urls collection properly when no version specified', function () {
+            options.install = 'kibana/test-plugin';
+            parser = settingParser(options);
+
+            var settings = parser.parse();
+
+            expect(settings.urls).to.have.property('length', 2);
+            expect(settings.urls).to.contain('https://download.elastic.co/kibana/test-plugin/test-plugin-latest.tar.gz');
+            expect(settings.urls).to.contain('https://github.com/kibana/test-plugin/archive/master.tar.gz');
+          });
+
+          it('should populate the urls collection properly version specified', function () {
+            options.install = 'kibana/test-plugin/v1.1.1';
+            parser = settingParser(options);
+
+            var settings = parser.parse();
+
+            expect(settings.urls).to.have.property('length', 2);
+            expect(settings.urls).to.contain('https://download.elastic.co/kibana/test-plugin/test-plugin-v1.1.1.tar.gz');
+            expect(settings.urls).to.contain('https://github.com/kibana/test-plugin/archive/v1.1.1.tar.gz');
+          });
+
+          it('should populate the pluginPath', function () {
+            options.install = 'kibana/test-plugin';
+            parser = settingParser(options);
+
+            var settings = parser.parse();
+            var expected = fromRoot('installedPlugins/test-plugin');
+
+            expect(settings).to.have.property('pluginPath', expected);
+          });
+
+          describe('with url option', function () {
+
+            it('should allow one part to the install parameter', function () {
+              options.install = 'test-plugin';
+              options.url = 'http://www.google.com/plugin.tar.gz';
+              parser = settingParser(options);
+
+              expect(parser.parse).withArgs().to.not.throwError();
+
+              var settings = parser.parse();
+
+              expect(settings).to.have.property('package', 'test-plugin');
+            });
+
+            it('should not allow more than one part to the install parameter', function () {
+              options.url = 'http://www.google.com/plugin.tar.gz';
+              options.install = 'kibana/test-plugin';
+              parser = settingParser(options);
+
+              expect(parser.parse).withArgs()
+                .to.throwError(/Invalid install option. When providing a url, please use the format <plugin>./);
+            });
+
+            it('should result in only the specified url in urls collection', function () {
+              var url = 'http://www.google.com/plugin.tar.gz';
+              options.install = 'test-plugin';
+              options.url = url;
+              parser = settingParser(options);
+
+              var settings = parser.parse();
+
+              expect(settings).to.have.property('urls');
+              expect(settings.urls).to.be.an('array');
+              expect(settings.urls).to.have.property('length', 1);
+              expect(settings.urls).to.contain(url);
+            });
+
+          });
+
+        });
+
+        describe('remove option', function () {
+
+          it('should set settings.action property to "remove"', function () {
+            options.install = null;
+            options.remove = 'package';
+            parser = settingParser(options);
+
+            var settings = parser.parse();
+
+            expect(settings).to.have.property('action', 'remove');
+          });
+
+          it('should allow one part to the remove parameter', function () {
+            options.install = null;
+            options.remove = 'test-plugin';
+            parser = settingParser(options);
+
+            var settings = parser.parse();
+
+            expect(settings).to.have.property('package', 'test-plugin');
+          });
+
+          it('should not allow more than one part to the install parameter', function () {
+            options.install = null;
+            options.remove = 'kibana/test-plugin';
+            parser = settingParser(options);
+
+            expect(parser.parse).withArgs()
+              .to.throwError(/Invalid remove option. Please use the format <plugin>./);
+          });
+
+          it('should populate the pluginPath', function () {
+            options.install = null;
+            options.remove = 'test-plugin';
+            parser = settingParser(options);
+
+            var settings = parser.parse();
+            var expected = fromRoot('installedPlugins/test-plugin');
+
+            expect(settings).to.have.property('pluginPath', expected);
+          });
+
+        });
+
+      });
+
+    });
+
+  });
+
+});
diff --git a/src/server/bin/plugin/npmInstall.js b/src/cli/plugin/npmInstall.js
similarity index 100%
rename from src/server/bin/plugin/npmInstall.js
rename to src/cli/plugin/npmInstall.js
diff --git a/src/cli/plugin/plugin.js b/src/cli/plugin/plugin.js
new file mode 100644
index 0000000000000..078c5ddb262b8
--- /dev/null
+++ b/src/cli/plugin/plugin.js
@@ -0,0 +1,67 @@
+var utils = require('requirefrom')('src/utils');
+var fromRoot = utils('fromRoot');
+
+var settingParser = require('./settingParser');
+var installer = require('./pluginInstaller');
+var remover = require('./pluginRemover');
+var pluginLogger = require('./pluginLogger');
+
+module.exports = function (program) {
+  function processCommand(command, options) {
+    var settings;
+    try {
+      settings = settingParser(command).parse();
+    } catch (ex) {
+      //The logger has not yet been initialized.
+      console.error(ex.message);
+      process.exit(64);
+    }
+
+    var logger = pluginLogger(settings);
+
+    if (settings.action === 'install') {
+      installer.install(settings, logger);
+    }
+    if (settings.action === 'remove') {
+      remover.remove(settings, logger);
+    }
+  }
+
+  program
+    .command('plugin')
+    .option('-i, --install <org>/<plugin>/<version>', 'The plugin to install')
+    .option('-r, --remove <plugin>', 'The plugin to remove')
+    .option('-q, --quiet', 'Disable all process messaging except errors')
+    .option('-s, --silent', 'Disable all process messaging')
+    .option('-u, --url <url>', 'Specify download url')
+    .option(
+      '-t, --timeout <duration>',
+      'Length of time before failing; 0 for never fail',
+      settingParser.parseMilliseconds
+    )
+    .option(
+      '-d, --plugin-dir <path>',
+      'The path to the directory where plugins are stored',
+      fromRoot('installedPlugins')
+    )
+    .description(
+      'Maintain Plugins',
+`
+  Common examples:
+    -i username/sample
+      attempts to download the latest version from the following urls:
+        https://download.elastic.co/username/sample/sample-latest.tar.gz
+        https://github.com/username/sample/archive/master.tar.gz
+
+    -i username/sample/v1.1.1
+      attempts to download version v1.1.1 from the following urls:
+        https://download.elastic.co/username/sample/sample-v1.1.1.tar.gz
+        https://github.com/username/sample/archive/v1.1.1.tar.gz
+
+    -i sample -u http://www.example.com/other_name.tar.gz
+      attempts to download from the specified url,
+      and installs the plugin found at that url as "sample"
+`
+    )
+    .action(processCommand);
+};
diff --git a/src/server/bin/plugin/pluginCleaner.js b/src/cli/plugin/pluginCleaner.js
similarity index 100%
rename from src/server/bin/plugin/pluginCleaner.js
rename to src/cli/plugin/pluginCleaner.js
diff --git a/src/cli/plugin/pluginDownloader.js b/src/cli/plugin/pluginDownloader.js
new file mode 100644
index 0000000000000..56b99ae75c35f
--- /dev/null
+++ b/src/cli/plugin/pluginDownloader.js
@@ -0,0 +1,91 @@
+var _ = require('lodash');
+var zlib = require('zlib');
+var Promise = require('bluebird');
+var request = require('request');
+var tar = require('tar');
+var progressReporter = require('./progressReporter');
+
+module.exports = function (settings, logger) {
+
+  //Attempts to download each url in turn until one is successful
+  function download() {
+    var urls = settings.urls;
+
+    function tryNext() {
+      var sourceUrl = urls.shift();
+      if (!sourceUrl) {
+        throw new Error('Not a valid url.');
+      }
+
+      logger.log('attempting to download ' + sourceUrl);
+
+      return Promise.try(function () {
+        return downloadSingle(sourceUrl, settings.workingPath, settings.timeout, logger)
+        .catch(function (err) {
+          if (err.message === 'ENOTFOUND') {
+            return tryNext();
+          }
+          if (err.message === 'EEXTRACT') {
+            throw (new Error('Error extracting the plugin archive'));
+          }
+          throw (err);
+        });
+      })
+      .catch(function (err) {
+        //Special case for when request.get throws an exception
+        if (err.message.match(/invalid uri/i)) {
+          return tryNext();
+        }
+        throw (err);
+      });
+    }
+
+    return tryNext();
+  }
+
+  //Attempts to download a single url
+  function downloadSingle(source, dest, timeout) {
+    var gunzip = zlib.createGunzip();
+    var tarExtract = tar.Extract({ path: dest, strip: 1 });
+
+    var requestOptions = { url: source };
+    if (timeout !== 0) {
+      requestOptions.timeout = timeout;
+    }
+
+    return wrappedRequest(requestOptions)
+    .then(function (req) {
+      var reporter = progressReporter(logger, req);
+
+      req
+      .on('response', reporter.handleResponse)
+      .on('data', reporter.handleData)
+      .on('error', _.partial(reporter.handleError, 'ENOTFOUND'))
+      .pipe(gunzip)
+      .on('error', _.partial(reporter.handleError, 'EEXTRACT'))
+      .pipe(tarExtract)
+      .on('error', _.partial(reporter.handleError, 'EEXTRACT'))
+      .on('end', reporter.handleEnd);
+
+      return reporter.promise;
+    });
+  }
+
+  function wrappedRequest(requestOptions) {
+    return Promise.try(function () {
+      return request.get(requestOptions);
+    })
+    .catch(function (err) {
+      if (err.message.match(/invalid uri/i)) {
+        throw new Error('ENOTFOUND');
+      }
+      throw err;
+    });
+  }
+
+
+  return {
+    download: download,
+    _downloadSingle: downloadSingle
+  };
+};
diff --git a/src/server/bin/plugin/pluginInstaller.js b/src/cli/plugin/pluginInstaller.js
similarity index 100%
rename from src/server/bin/plugin/pluginInstaller.js
rename to src/cli/plugin/pluginInstaller.js
diff --git a/src/server/bin/plugin/pluginLogger.js b/src/cli/plugin/pluginLogger.js
similarity index 100%
rename from src/server/bin/plugin/pluginLogger.js
rename to src/cli/plugin/pluginLogger.js
diff --git a/src/server/bin/plugin/pluginRemover.js b/src/cli/plugin/pluginRemover.js
similarity index 100%
rename from src/server/bin/plugin/pluginRemover.js
rename to src/cli/plugin/pluginRemover.js
diff --git a/src/server/bin/plugin/progressReporter.js b/src/cli/plugin/progressReporter.js
similarity index 100%
rename from src/server/bin/plugin/progressReporter.js
rename to src/cli/plugin/progressReporter.js
diff --git a/src/cli/plugin/settingParser.js b/src/cli/plugin/settingParser.js
new file mode 100644
index 0000000000000..652b29bcaa5ce
--- /dev/null
+++ b/src/cli/plugin/settingParser.js
@@ -0,0 +1,108 @@
+var resolve = require('path').resolve;
+var expiry = require('expiry-js');
+
+module.exports = function (options) {
+  function parseMilliseconds(val) {
+    var result;
+
+    try {
+      var timeVal = expiry(val);
+      result = timeVal.asMilliseconds();
+    } catch (ex) {
+      result = 0;
+    }
+
+    return result;
+  }
+
+  function generateDownloadUrl(settings) {
+    var version = (settings.version) || 'latest';
+    var filename = settings.package + '-' + version + '.tar.gz';
+
+    return 'https://download.elastic.co/' + settings.organization + '/' + settings.package + '/' + filename;
+  }
+
+  function generateGithubUrl(settings) {
+    var version = (settings.version) || 'master';
+    var filename = version + '.tar.gz';
+
+    return 'https://github.com/' + settings.organization + '/' + settings.package + '/archive/' + filename;
+  }
+
+  function parse() {
+    var parts;
+    var settings = {
+      timeout: 0,
+      silent: false,
+      quiet: false,
+      urls: []
+    };
+
+    if (options.timeout) {
+      settings.timeout = options.timeout;
+    }
+
+    if (options.parent && options.parent.quiet) {
+      settings.quiet = options.parent.quiet;
+    }
+
+    if (options.silent) {
+      settings.silent = options.silent;
+    }
+
+    if (options.url) {
+      settings.urls.push(options.url);
+    }
+
+    if (options.install) {
+      settings.action = 'install';
+      parts = options.install.split('/');
+
+      if (options.url) {
+        if (parts.length !== 1) {
+          throw new Error('Invalid install option. When providing a url, please use the format <plugin>.');
+        }
+
+        settings.package = parts.shift();
+      } else {
+        if (parts.length < 2 || parts.length > 3) {
+          throw new Error('Invalid install option. Please use the format <org>/<plugin>/<version>.');
+        }
+
+        settings.organization = parts.shift();
+        settings.package = parts.shift();
+        settings.version = parts.shift();
+
+        settings.urls.push(generateDownloadUrl(settings));
+        settings.urls.push(generateGithubUrl(settings));
+      }
+    }
+
+    if (options.remove) {
+      settings.action = 'remove';
+      parts = options.remove.split('/');
+
+      if (parts.length !== 1) {
+        throw new Error('Invalid remove option. Please use the format <plugin>.');
+      }
+      settings.package = parts.shift();
+    }
+
+    if (!settings.action || (options.install && options.remove)) {
+      throw new Error('Please specify either --install or --remove.');
+    }
+
+    settings.pluginDir = options.pluginDir;
+    if (settings.package) {
+      settings.pluginPath = resolve(settings.pluginDir, settings.package);
+      settings.workingPath = resolve(settings.pluginDir, '.plugin.installing');
+    }
+
+    return settings;
+  }
+
+  return {
+    parse: parse,
+    parseMilliseconds: parseMilliseconds
+  };
+};
diff --git a/src/cli/serve/readYamlConfig.js b/src/cli/serve/readYamlConfig.js
new file mode 100644
index 0000000000000..aa5f7ff691b2f
--- /dev/null
+++ b/src/cli/serve/readYamlConfig.js
@@ -0,0 +1,64 @@
+'use strict';
+
+let _ = require('lodash');
+let fs = require('fs');
+let yaml = require('js-yaml');
+
+let utils = require('requirefrom')('src/utils');
+let fromRoot = utils('fromRoot');
+
+let legacySettingMap = {
+  // server
+  port: 'server.port',
+  host: 'server.host',
+  pid_file: 'pid.file',
+  ssl_cert_file: 'server.ssl.cert',
+  ssl_key_file: 'server.ssl.key',
+
+  // logging
+  log_file: 'logging.dest',
+
+  // kibana
+  kibana_index: 'kibana.index',
+  default_app_id: 'kibana.defaultAppId',
+
+  // es
+  ca: 'elasticsearch.ssl.ca',
+  elasticsearch_preserve_host: 'elasticsearch.preserveHost',
+  elasticsearch_url: 'elasticsearch.url',
+  kibana_elasticsearch_client_crt: 'elasticsearch.ssl.cert',
+  kibana_elasticsearch_client_key: 'elasticsearch.ssl.key',
+  kibana_elasticsearch_password: 'elasticsearch.password',
+  kibana_elasticsearch_username: 'elasticsearch.username',
+  ping_timeout: 'elasticsearch.pingTimeout',
+  request_timeout: 'elasticsearch.requestTimeout',
+  shard_timeout: 'elasticsearch.shardTimeout',
+  startup_timeout: 'elasticsearch.startupTimeout',
+  verify_ssl: 'elasticsearch.ssl.verify',
+};
+
+module.exports = function (path) {
+  if (!path) return {};
+
+  let file = yaml.safeLoad(fs.readFileSync(path, 'utf8'));
+
+  function apply(config, val, key) {
+    if (_.isPlainObject(val)) {
+      _.forOwn(val, function (subVal, subKey) {
+        apply(config, subVal, key + '.' + subKey);
+      });
+    } else {
+      _.set(config, key, val);
+    }
+  }
+
+  // transform legeacy options into new namespaced versions
+  return _.transform(file, function (config, val, key) {
+    if (legacySettingMap.hasOwnProperty(key)) {
+      key = legacySettingMap[key];
+    }
+
+    apply(config, val, key);
+  }, {});
+};
+
diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js
new file mode 100644
index 0000000000000..283b1193c7233
--- /dev/null
+++ b/src/cli/serve/serve.js
@@ -0,0 +1,96 @@
+'use strict';
+
+let _ = require('lodash');
+let isWorker = require('cluster').isWorker;
+let resolve = require('path').resolve;
+
+let cwd = process.cwd();
+let readYamlConfig = require('./readYamlConfig');
+let src = require('requirefrom')('src');
+let fromRoot = src('utils/fromRoot');
+let KbnServer = src('server/KbnServer');
+
+let pathCollector = function () {
+  let paths = [];
+  return function (path) {
+    paths.push(resolve(process.cwd(), path));
+    return paths;
+  };
+};
+
+let pluginDirCollector = pathCollector();
+let pluginPathCollector = pathCollector();
+
+module.exports = function (program) {
+  program
+  .command('serve')
+  .description('Run the kibana server')
+  .collectUnknownOptions()
+  .option('-e, --elasticsearch <uri>', 'Elasticsearch instance')
+  .option('-c, --config <path>', 'Path to the config file')
+  .option('-p, --port <port>', 'The port to bind to', parseInt)
+  .option('-q, --quiet', 'Prevent all logging except errors')
+  .option('-Q, --silent', 'Prevent all logging')
+  .option('--verbose', 'Turns on verbose logging')
+  .option('-H, --host <host>', 'The host to bind to')
+  .option('-l, --log-file <path>', 'The file to log to')
+  .option(
+    '--plugin-dir <path>',
+    'A path to scan for plugins, this can be specified multiple ' +
+    'times to specify multiple directories',
+    pluginDirCollector,
+    [
+      fromRoot('installedPlugins'),
+      fromRoot('src/plugins')
+    ]
+  )
+  .option(
+    '--plugin-path <path>',
+    'A path to a plugin which should be included by the server, ' +
+    'this can be specified multiple times to specify multiple paths',
+    pluginPathCollector,
+    []
+  )
+  .option('--plugins <path>', 'an alias for --plugin-dir', pluginDirCollector)
+  .option('--dev', 'Run the server with development mode defaults')
+  .option('--no-watch', 'Prevent watching, use with --dev to prevent server restarts')
+  .action(function (opts) {
+    if (opts.dev && opts.watch && !isWorker) {
+      // stop processing the action and handoff to watch cluster manager
+      return require('../watch/watch')(opts);
+    }
+
+    let settings = readYamlConfig(opts.config || fromRoot('config/kibana.yml'));
+    let set = _.partial(_.set, settings);
+    let get = _.partial(_.get, settings);
+
+    if (opts.dev) {
+      set('env', 'development');
+      set('optimize.watch', opts.watch);
+    }
+
+    if (opts.elasticsearch) set('elasticsearch.url', opts.elasticsearch);
+    if (opts.port) set('server.port', opts.port);
+    if (opts.host) set('server.host', opts.host);
+    if (opts.quiet) set('logging.quiet', true);
+    if (opts.silent) set('logging.silent', true);
+    if (opts.verbose) set('logging.verbose', true);
+    if (opts.logFile) set('logging.dest', opts.logFile);
+
+    set('plugins.scanDirs', _.compact([].concat(
+      get('plugins.scanDirs'),
+      opts.pluginDir
+    )));
+
+    set('plugins.paths', [].concat(opts.pluginPath || []));
+
+    let server = new KbnServer(_.merge(settings, this.getUnknownOptions()));
+
+    server.ready().catch(function (err) {
+      console.error(err.stack);
+      process.exit(1);
+    });
+
+    return server;
+  });
+};
diff --git a/src/cli/watch/Worker.js b/src/cli/watch/Worker.js
new file mode 100644
index 0000000000000..3e7511c9186a6
--- /dev/null
+++ b/src/cli/watch/Worker.js
@@ -0,0 +1,106 @@
+'use strict';
+
+let _ = require('lodash');
+let cluster = require('cluster');
+let resolve = require('path').resolve;
+let EventEmitter = require('events').EventEmitter;
+
+let fromRoot = require('../../utils/fromRoot');
+
+let cliPath = fromRoot('src/cli/cli.js');
+let baseArgs = _.difference(process.argv.slice(2), ['--no-watch']);
+let baseArgv = [process.execPath, cliPath].concat(baseArgs);
+
+cluster.setupMaster({
+  exec: cliPath,
+  silent: false
+});
+
+module.exports = class Worker extends EventEmitter {
+  constructor(opts) {
+    opts = opts || {};
+    super();
+
+    this.log = opts.log;
+    this.type = opts.type;
+    this.title = opts.title || opts.type;
+    this.filters = opts.filters;
+    this.changes = [];
+
+    let argv = _.union(baseArgv, opts.argv || []);
+    this.env = {
+      kbnWorkerType: this.type,
+      kbnWorkerArgv: JSON.stringify(argv)
+    };
+
+    _.bindAll(this, ['onExit', 'onMessage', 'shutdown', 'start']);
+
+    this.start = _.debounce(this.start, 25);
+    cluster.on('exit', this.onExit);
+    process.on('exit', this.shutdown);
+  }
+
+  onExit(fork, code) {
+    if (this.fork !== fork) return;
+
+    // our fork is gone, clear our ref so we don't try to talk to it anymore
+    this.fork = null;
+
+    if (code) {
+      this.log.bad(`${this.title} crashed`, 'with status code', code);
+    } else {
+      // restart after graceful shutdowns
+      this.start();
+    }
+  }
+
+  onChange(path) {
+    var valid = true;
+
+    if (this.filters) {
+      valid = _.any(this.filters, function (filter) {
+        return filter.test(path);
+      });
+    }
+
+    if (!valid) return;
+    this.changes.push(path);
+    this.start();
+  }
+
+  shutdown() {
+    if (this.fork && !this.fork.isDead()) {
+      this.fork.kill();
+      this.fork.removeListener('message', this.onMessage);
+    }
+  }
+
+  onMessage(msg) {
+    if (!_.isArray(msg) || msg[0] !== 'WORKER_BROADCAST') return;
+    this.emit('broadcast', msg[1]);
+  }
+
+  flushChangeBuffer() {
+    let files = _.unique(this.changes.splice(0));
+    let prefix = files.length > 1 ? '\n - ' : '';
+    return files.reduce(function (list, file, i, files) {
+      return `${list || ''}${prefix}"${file}"`;
+    }, '');
+  }
+
+  start() {
+    if (this.fork && !this.fork.isDead()) {
+      // once "exit" event is received with 0 status, start() is called again
+      return this.shutdown();
+    }
+
+    if (this.fork && this.changes.length) {
+      this.log.warn(`${this.title} restarting`, `due to changes in ${this.flushChangeBuffer()}`);
+    } else {
+      this.log.warn(`${this.title} starting`);
+    }
+
+    this.fork = cluster.fork(this.env);
+    this.fork.on('message', this.onMessage);
+  }
+};
diff --git a/src/cli/watch/watch.js b/src/cli/watch/watch.js
new file mode 100644
index 0000000000000..fe9b037eb5158
--- /dev/null
+++ b/src/cli/watch/watch.js
@@ -0,0 +1,92 @@
+'use strict';
+
+let cluster = require('cluster');
+let join = require('path').join;
+let _ = require('lodash');
+var chokidar = require('chokidar');
+
+let utils = require('requirefrom')('src/utils');
+let fromRoot = utils('fromRoot');
+let Log = require('../Log');
+let Worker = require('./Worker');
+
+module.exports = function (opts) {
+
+  let watcher = chokidar.watch([
+    'src/cli',
+    'src/fixtures',
+    'src/server',
+    'src/utils',
+    'src/plugins',
+    'config',
+  ], {
+    cwd: fromRoot('.'),
+    ignore: 'src/plugins/*/public/**/*'
+  });
+
+  let log = new Log(opts.quiet, opts.silent);
+  let customLogging = opts.quiet || opts.silent || opts.verbose;
+
+  let workers = [
+    new Worker({
+      type: 'optmzr',
+      title: 'optimizer',
+      log: log,
+      argv: _.compact([
+        customLogging ? null : '--quiet',
+        '--plugins.initialize=false',
+        '--server.autoListen=false',
+        '--optimize._workerRole=send'
+      ]),
+      filters: [
+        /src\/server\/(optimize|ui|plugins)\//,
+        /src\/plugins\/[^\/]+\/[^\/]+\.js$/,
+        /src\/cli\//
+      ]
+    }),
+
+    new Worker({
+      type: 'server',
+      log: log,
+      argv: [
+        '--optimize._workerRole=receive'
+      ]
+    })
+  ];
+
+  workers.forEach(function (worker) {
+    worker.on('broadcast', function (msg) {
+      workers.forEach(function (to) {
+        if (to !== worker && to.fork) to.fork.send(msg);
+      });
+    });
+  });
+
+
+  var addedCount = 0;
+  function onAddBeforeReady() {
+    addedCount += 1;
+  }
+
+  function onReady() {
+    // start sending changes to workers
+    watcher.removeListener('add', onAddBeforeReady);
+    watcher.on('all', onAnyChangeAfterReady);
+
+    log.good('Watching for changes', `(${addedCount} files)`);
+    _.invoke(workers, 'start');
+  }
+
+  function onAnyChangeAfterReady(e, path) {
+    _.invoke(workers, 'onChange', path);
+  }
+
+  function onError(err) {
+    log.bad('Failed to watch files!\n', err.stack);
+    process.exit(1);
+  }
+
+  watcher.on('add', onAddBeforeReady);
+  watcher.on('ready', onReady);
+  watcher.on('error', onError);
+};
diff --git a/test/unit/fixtures/agg_resp/date_histogram.js b/src/fixtures/agg_resp/date_histogram.js
similarity index 100%
rename from test/unit/fixtures/agg_resp/date_histogram.js
rename to src/fixtures/agg_resp/date_histogram.js
diff --git a/test/unit/fixtures/agg_resp/geohash_grid.js b/src/fixtures/agg_resp/geohash_grid.js
similarity index 100%
rename from test/unit/fixtures/agg_resp/geohash_grid.js
rename to src/fixtures/agg_resp/geohash_grid.js
diff --git a/test/unit/fixtures/config_upgrade_from_4.0.0.json b/src/fixtures/config_upgrade_from_4.0.0.json
similarity index 100%
rename from test/unit/fixtures/config_upgrade_from_4.0.0.json
rename to src/fixtures/config_upgrade_from_4.0.0.json
diff --git a/test/unit/fixtures/config_upgrade_from_4.0.0_to_4.0.1-snapshot.json b/src/fixtures/config_upgrade_from_4.0.0_to_4.0.1-snapshot.json
similarity index 100%
rename from test/unit/fixtures/config_upgrade_from_4.0.0_to_4.0.1-snapshot.json
rename to src/fixtures/config_upgrade_from_4.0.0_to_4.0.1-snapshot.json
diff --git a/test/unit/fixtures/config_upgrade_from_4.0.0_to_4.0.1.json b/src/fixtures/config_upgrade_from_4.0.0_to_4.0.1.json
similarity index 100%
rename from test/unit/fixtures/config_upgrade_from_4.0.0_to_4.0.1.json
rename to src/fixtures/config_upgrade_from_4.0.0_to_4.0.1.json
diff --git a/test/unit/fixtures/fake_chart_events.js b/src/fixtures/fake_chart_events.js
similarity index 100%
rename from test/unit/fixtures/fake_chart_events.js
rename to src/fixtures/fake_chart_events.js
diff --git a/test/unit/fixtures/fake_hierarchical_data.js b/src/fixtures/fake_hierarchical_data.js
similarity index 100%
rename from test/unit/fixtures/fake_hierarchical_data.js
rename to src/fixtures/fake_hierarchical_data.js
diff --git a/test/unit/fixtures/fake_row.js b/src/fixtures/fake_row.js
similarity index 100%
rename from test/unit/fixtures/fake_row.js
rename to src/fixtures/fake_row.js
diff --git a/test/unit/fixtures/field_mapping.js b/src/fixtures/field_mapping.js
similarity index 100%
rename from test/unit/fixtures/field_mapping.js
rename to src/fixtures/field_mapping.js
diff --git a/test/unit/fixtures/filter_skeleton.js b/src/fixtures/filter_skeleton.js
similarity index 100%
rename from test/unit/fixtures/filter_skeleton.js
rename to src/fixtures/filter_skeleton.js
diff --git a/test/unit/fixtures/hits.js b/src/fixtures/hits.js
similarity index 100%
rename from test/unit/fixtures/hits.js
rename to src/fixtures/hits.js
diff --git a/test/unit/fixtures/logstash_fields.js b/src/fixtures/logstash_fields.js
similarity index 100%
rename from test/unit/fixtures/logstash_fields.js
rename to src/fixtures/logstash_fields.js
diff --git a/test/unit/fixtures/mapping_with_dupes.js b/src/fixtures/mapping_with_dupes.js
similarity index 100%
rename from test/unit/fixtures/mapping_with_dupes.js
rename to src/fixtures/mapping_with_dupes.js
diff --git a/test/unit/fixtures/mock_courier.js b/src/fixtures/mock_courier.js
similarity index 88%
rename from test/unit/fixtures/mock_courier.js
rename to src/fixtures/mock_courier.js
index 933c54dd1efc8..07e6de0091f62 100644
--- a/test/unit/fixtures/mock_courier.js
+++ b/src/fixtures/mock_courier.js
@@ -1,6 +1,6 @@
 define(function (require) {
   var _ = require('lodash');
-  var sinon = require('test_utils/auto_release_sinon');
+  var sinon = require('auto-release-sinon');
 
   return function (Private, Promise) {
     var indexPatterns = Private(require('fixtures/stubbed_logstash_index_pattern'));
diff --git a/test/unit/fixtures/mock_state.js b/src/fixtures/mock_state.js
similarity index 85%
rename from test/unit/fixtures/mock_state.js
rename to src/fixtures/mock_state.js
index ce0b14312d0b0..1346b8386ec02 100644
--- a/test/unit/fixtures/mock_state.js
+++ b/src/fixtures/mock_state.js
@@ -1,6 +1,6 @@
 define(function (require) {
   var _ = require('lodash');
-  var sinon = require('test_utils/auto_release_sinon');
+  var sinon = require('auto-release-sinon');
 
   function MockState(defaults) {
     this.on = _.noop;
diff --git a/test/unit/fixtures/real_hits.js b/src/fixtures/real_hits.js
similarity index 100%
rename from test/unit/fixtures/real_hits.js
rename to src/fixtures/real_hits.js
diff --git a/test/unit/fixtures/require_from.js b/src/fixtures/require_from.js
similarity index 100%
rename from test/unit/fixtures/require_from.js
rename to src/fixtures/require_from.js
diff --git a/test/unit/fixtures/search_response.js b/src/fixtures/search_response.js
similarity index 100%
rename from test/unit/fixtures/search_response.js
rename to src/fixtures/search_response.js
diff --git a/test/unit/fixtures/stubbed_doc_source_response.js b/src/fixtures/stubbed_doc_source_response.js
similarity index 100%
rename from test/unit/fixtures/stubbed_doc_source_response.js
rename to src/fixtures/stubbed_doc_source_response.js
diff --git a/test/unit/fixtures/stubbed_logstash_index_pattern.js b/src/fixtures/stubbed_logstash_index_pattern.js
similarity index 82%
rename from test/unit/fixtures/stubbed_logstash_index_pattern.js
rename to src/fixtures/stubbed_logstash_index_pattern.js
index 75b8c8811b5d3..2b114919a81e5 100644
--- a/test/unit/fixtures/stubbed_logstash_index_pattern.js
+++ b/src/fixtures/stubbed_logstash_index_pattern.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function stubbedLogstashIndexPatternService(Private) {
-    var StubIndexPattern = Private(require('test_utils/stub_index_pattern'));
-    var fieldTypes = Private(require('components/index_patterns/_field_types'));
+    var StubIndexPattern = Private(require('testUtils/stubIndexPattern'));
+    var fieldTypes = Private(require('ui/index_patterns/_field_types'));
     var mockLogstashFields = Private(require('fixtures/logstash_fields'));
 
     var _ = require('lodash');
diff --git a/test/unit/fixtures/stubbed_search_source.js b/src/fixtures/stubbed_search_source.js
similarity index 94%
rename from test/unit/fixtures/stubbed_search_source.js
rename to src/fixtures/stubbed_search_source.js
index d7067d868534b..d738f8c1e8d7c 100644
--- a/test/unit/fixtures/stubbed_search_source.js
+++ b/src/fixtures/stubbed_search_source.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var sinon = require('test_utils/auto_release_sinon');
+  var sinon = require('auto-release-sinon');
   var searchResponse = require('fixtures/search_response');
 
   return function stubSearchSource(Private, $q) {
diff --git a/test/unit/fixtures/tilemap_map.js b/src/fixtures/tilemap_map.js
similarity index 88%
rename from test/unit/fixtures/tilemap_map.js
rename to src/fixtures/tilemap_map.js
index 0c7a69781b6e8..5d07de8349212 100644
--- a/test/unit/fixtures/tilemap_map.js
+++ b/src/fixtures/tilemap_map.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var sinon = require('test_utils/auto_release_sinon');
+  var sinon = require('auto-release-sinon');
 
   function MockMap(container, chartData, params) {
     this.container = container;
diff --git a/src/fixtures/vislib/_vis_fixture.js b/src/fixtures/vislib/_vis_fixture.js
new file mode 100644
index 0000000000000..d7e74a634f3c0
--- /dev/null
+++ b/src/fixtures/vislib/_vis_fixture.js
@@ -0,0 +1,33 @@
+var $ = require('jquery');
+var _ = require('lodash');
+
+var $visCanvas = $('<div>').attr('id', 'vislib-vis-fixtures').appendTo('body');
+var count = 0;
+var visHeight = $visCanvas.height();
+
+$visCanvas.new = function () {
+  count += 1;
+  if (count > 1) $visCanvas.height(visHeight * count);
+  return $('<div>').addClass('visualize-chart').appendTo($visCanvas);
+};
+
+afterEach(function () {
+  $visCanvas.empty();
+  if (count > 1) $visCanvas.height(visHeight);
+  count = 0;
+});
+
+module.exports = function VislibFixtures(Private) {
+  return function (visLibParams) {
+    var Vis = Private(require('ui/vislib/vis'));
+    return new Vis($visCanvas.new(), _.defaults({}, visLibParams || {}, {
+      shareYAxis: true,
+      addTooltip: true,
+      addLegend: true,
+      defaultYExtents: false,
+      setYExtents: false,
+      yAxis: {},
+      type: 'histogram'
+    }));
+  };
+};
diff --git a/src/fixtures/vislib/mock_data/date_histogram/_columns.js b/src/fixtures/vislib/mock_data/date_histogram/_columns.js
new file mode 100644
index 0000000000000..6fa4d1ee8aad2
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/date_histogram/_columns.js
@@ -0,0 +1,264 @@
+var moment = require('moment');
+
+module.exports = {
+  'columns': [
+    {
+      'label': '200: response',
+      'xAxisLabel': '@timestamp per 30 sec',
+      'ordered': {
+        'date': true,
+        'interval': 30000,
+        'min': 1415826608440,
+        'max': 1415827508440
+      },
+      'yAxisLabel': 'Count of documents',
+      'xAxisFormatter': function (thing) {
+        return moment(thing);
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      },
+      'series': [
+        {
+          'values': [
+            {
+              'x': 1415826600000,
+              'y': 4
+            },
+            {
+              'x': 1415826630000,
+              'y': 8
+            },
+            {
+              'x': 1415826660000,
+              'y': 7
+            },
+            {
+              'x': 1415826690000,
+              'y': 5
+            },
+            {
+              'x': 1415826720000,
+              'y': 5
+            },
+            {
+              'x': 1415826750000,
+              'y': 4
+            },
+            {
+              'x': 1415826780000,
+              'y': 10
+            },
+            {
+              'x': 1415826810000,
+              'y': 7
+            },
+            {
+              'x': 1415826840000,
+              'y': 9
+            },
+            {
+              'x': 1415826870000,
+              'y': 8
+            },
+            {
+              'x': 1415826900000,
+              'y': 9
+            },
+            {
+              'x': 1415826930000,
+              'y': 8
+            },
+            {
+              'x': 1415826960000,
+              'y': 3
+            },
+            {
+              'x': 1415826990000,
+              'y': 9
+            },
+            {
+              'x': 1415827020000,
+              'y': 6
+            },
+            {
+              'x': 1415827050000,
+              'y': 8
+            },
+            {
+              'x': 1415827080000,
+              'y': 7
+            },
+            {
+              'x': 1415827110000,
+              'y': 4
+            },
+            {
+              'x': 1415827140000,
+              'y': 6
+            },
+            {
+              'x': 1415827170000,
+              'y': 10
+            },
+            {
+              'x': 1415827200000,
+              'y': 2
+            },
+            {
+              'x': 1415827230000,
+              'y': 8
+            },
+            {
+              'x': 1415827260000,
+              'y': 5
+            },
+            {
+              'x': 1415827290000,
+              'y': 6
+            },
+            {
+              'x': 1415827320000,
+              'y': 6
+            },
+            {
+              'x': 1415827350000,
+              'y': 10
+            },
+            {
+              'x': 1415827380000,
+              'y': 6
+            },
+            {
+              'x': 1415827410000,
+              'y': 6
+            },
+            {
+              'x': 1415827440000,
+              'y': 12
+            },
+            {
+              'x': 1415827470000,
+              'y': 9
+            },
+            {
+              'x': 1415827500000,
+              'y': 1
+            }
+          ]
+        }
+      ]
+    },
+    {
+      'label': '503: response',
+      'xAxisLabel': '@timestamp per 30 sec',
+      'ordered': {
+        'date': true,
+        'interval': 30000,
+        'min': 1415826608440,
+        'max': 1415827508440
+      },
+      'yAxisLabel': 'Count of documents',
+      'xAxisFormatter': function (thing) {
+        return moment(thing);
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      },
+      'series': [
+        {
+          'values': [
+            {
+              'x': 1415826630000,
+              'y': 1
+            },
+            {
+              'x': 1415826660000,
+              'y': 1
+            },
+            {
+              'x': 1415826720000,
+              'y': 1
+            },
+            {
+              'x': 1415826780000,
+              'y': 1
+            },
+            {
+              'x': 1415826900000,
+              'y': 1
+            },
+            {
+              'x': 1415827020000,
+              'y': 1
+            },
+            {
+              'x': 1415827080000,
+              'y': 1
+            },
+            {
+              'x': 1415827110000,
+              'y': 2
+            }
+          ]
+        }
+      ]
+    },
+    {
+      'label': '404: response',
+      'xAxisLabel': '@timestamp per 30 sec',
+      'ordered': {
+        'date': true,
+        'interval': 30000,
+        'min': 1415826608440,
+        'max': 1415827508440
+      },
+      'yAxisLabel': 'Count of documents',
+      'xAxisFormatter': function (thing) {
+        return moment(thing);
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      },
+      'series': [
+        {
+          'values': [
+            {
+              'x': 1415826660000,
+              'y': 1
+            },
+            {
+              'x': 1415826720000,
+              'y': 1
+            },
+            {
+              'x': 1415826810000,
+              'y': 1
+            },
+            {
+              'x': 1415826960000,
+              'y': 1
+            },
+            {
+              'x': 1415827050000,
+              'y': 1
+            },
+            {
+              'x': 1415827260000,
+              'y': 1
+            },
+            {
+              'x': 1415827380000,
+              'y': 1
+            },
+            {
+              'x': 1415827410000,
+              'y': 1
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  'hits': 225
+};
diff --git a/src/fixtures/vislib/mock_data/date_histogram/_rows.js b/src/fixtures/vislib/mock_data/date_histogram/_rows.js
new file mode 100644
index 0000000000000..c2ff7a40de5f5
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/date_histogram/_rows.js
@@ -0,0 +1,1645 @@
+var moment = require('moment');
+
+module.exports = {
+  'rows': [
+    {
+      'label': '0.0-1000.0: bytes',
+      'xAxisLabel': '@timestamp per 30 sec',
+      'ordered': {
+        'date': true,
+        'interval': 30000,
+        'min': 1415826260456,
+        'max': 1415827160456
+      },
+      'yAxisLabel': 'Count of documents',
+      'xAxisFormatter': function (thing) {
+        return moment(thing);
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      },
+      'series': [
+        {
+          'label': 'jpg',
+          'values': [
+            {
+              'x': 1415826240000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826270000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826300000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826330000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 1415826360000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826390000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826420000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826450000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826480000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826510000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826540000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826570000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826600000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826630000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 1415826660000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826690000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826720000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826750000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826780000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 1415826810000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826840000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826870000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826900000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 1415826930000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826960000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826990000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827020000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 1415827050000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827080000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827110000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 1415827140000,
+              'y': 0,
+              'y0': 0
+            }
+          ]
+        },
+        {
+          'label': 'css',
+          'values': [
+            {
+              'x': 1415826240000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826270000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826300000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826330000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826360000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826390000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826420000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826450000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826480000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826510000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826540000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826570000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826600000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826630000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826660000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826690000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826720000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826750000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826780000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826810000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826840000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826870000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826900000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826930000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826960000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826990000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827020000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415827050000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827080000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 1415827110000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415827140000,
+              'y': 0,
+              'y0': 0
+            }
+          ]
+        },
+        {
+          'label': 'png',
+          'values': [
+            {
+              'x': 1415826240000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826270000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826300000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826330000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826360000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826390000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826420000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826450000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826480000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826510000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826540000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826570000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826600000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826630000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826660000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826690000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826720000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826750000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826780000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826810000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826840000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826870000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826900000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826930000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826960000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826990000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827020000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415827050000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827080000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415827110000,
+              'y': 1,
+              'y0': 1
+            },
+            {
+              'x': 1415827140000,
+              'y': 0,
+              'y0': 0
+            }
+          ]
+        },
+        {
+          'label': 'php',
+          'values': [
+            {
+              'x': 1415826240000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826270000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826300000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 1415826330000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826360000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826390000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826420000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826450000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826480000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826510000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826540000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826570000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826600000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826630000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826660000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826690000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826720000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826750000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826780000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826810000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826840000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826870000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826900000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826930000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826960000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826990000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827020000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415827050000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827080000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415827110000,
+              'y': 0,
+              'y0': 2
+            },
+            {
+              'x': 1415827140000,
+              'y': 0,
+              'y0': 0
+            }
+          ]
+        },
+        {
+          'label': 'gif',
+          'values': [
+            {
+              'x': 1415826240000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826270000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826300000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826330000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826360000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826390000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826420000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826450000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 1415826480000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 1415826510000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826540000,
+              'y': 3,
+              'y0': 0
+            },
+            {
+              'x': 1415826570000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826600000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826630000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826660000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 1415826690000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826720000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 1415826750000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826780000,
+              'y': 1,
+              'y0': 1
+            },
+            {
+              'x': 1415826810000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826840000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826870000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826900000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826930000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826960000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826990000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827020000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415827050000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827080000,
+              'y': 1,
+              'y0': 1
+            },
+            {
+              'x': 1415827110000,
+              'y': 1,
+              'y0': 2
+            },
+            {
+              'x': 1415827140000,
+              'y': 0,
+              'y0': 0
+            }
+          ]
+        }
+      ]
+    },
+    {
+      'label': '1000.0-2000.0: bytes',
+      'xAxisLabel': '@timestamp per 30 sec',
+      'ordered': {
+        'date': true,
+        'interval': 30000,
+        'min': 1415826260457,
+        'max': 1415827160457
+      },
+      'yAxisLabel': 'Count of documents',
+      'xAxisFormatter': function (thing) {
+        return moment(thing);
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      },
+      'series': [
+        {
+          'label': 'jpg',
+          'values': [
+            {
+              'x': 1415826240000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826270000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826300000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826330000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826360000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826390000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826420000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826450000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826480000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826510000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826540000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826570000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 1415826600000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826630000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826660000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 1415826690000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826720000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826750000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826780000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826810000,
+              'y': 2,
+              'y0': 0
+            },
+            {
+              'x': 1415826840000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 1415826870000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826900000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 1415826930000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826960000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826990000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827020000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 1415827050000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827080000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827110000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 1415827140000,
+              'y': 0,
+              'y0': 0
+            }
+          ]
+        },
+        {
+          'label': 'css',
+          'values': [
+            {
+              'x': 1415826240000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826270000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826300000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826330000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826360000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826390000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826420000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826450000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826480000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826510000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826540000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826570000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826600000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826630000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826660000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826690000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826720000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826750000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826780000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826810000,
+              'y': 0,
+              'y0': 2
+            },
+            {
+              'x': 1415826840000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826870000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826900000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826930000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826960000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826990000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827020000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415827050000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827080000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827110000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415827140000,
+              'y': 0,
+              'y0': 0
+            }
+          ]
+        },
+        {
+          'label': 'png',
+          'values': [
+            {
+              'x': 1415826240000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826270000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826300000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826330000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826360000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826390000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826420000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826450000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826480000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826510000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826540000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826570000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826600000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826630000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826660000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826690000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826720000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826750000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826780000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826810000,
+              'y': 0,
+              'y0': 2
+            },
+            {
+              'x': 1415826840000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826870000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826900000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826930000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826960000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826990000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 1415827020000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415827050000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827080000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827110000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415827140000,
+              'y': 0,
+              'y0': 0
+            }
+          ]
+        },
+        {
+          'label': 'php',
+          'values': [
+            {
+              'x': 1415826240000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826270000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826300000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826330000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826360000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826390000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826420000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826450000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 1415826480000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826510000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826540000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826570000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826600000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826630000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826660000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826690000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826720000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826750000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826780000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826810000,
+              'y': 0,
+              'y0': 2
+            },
+            {
+              'x': 1415826840000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826870000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826900000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826930000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826960000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826990000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415827020000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415827050000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827080000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827110000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415827140000,
+              'y': 0,
+              'y0': 0
+            }
+          ]
+        },
+        {
+          'label': 'gif',
+          'values': [
+            {
+              'x': 1415826240000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826270000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826300000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826330000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826360000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826390000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826420000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826450000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826480000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826510000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826540000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826570000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826600000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826630000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826660000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826690000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826720000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826750000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826780000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826810000,
+              'y': 0,
+              'y0': 2
+            },
+            {
+              'x': 1415826840000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826870000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826900000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415826930000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826960000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415826990000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415827020000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415827050000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827080000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 1415827110000,
+              'y': 0,
+              'y0': 1
+            },
+            {
+              'x': 1415827140000,
+              'y': 0,
+              'y0': 0
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  'hits': 236
+};
diff --git a/src/fixtures/vislib/mock_data/date_histogram/_series.js b/src/fixtures/vislib/mock_data/date_histogram/_series.js
new file mode 100644
index 0000000000000..7c126c41eb9d3
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/date_histogram/_series.js
@@ -0,0 +1,150 @@
+var moment = require('moment');
+
+module.exports = {
+  'label': '',
+  'xAxisLabel': '@timestamp per 30 sec',
+  'ordered': {
+    'date': true,
+    'min': 1411761457636,
+    'max': 1411762357636,
+    'interval': 30000
+  },
+  'yAxisLabel': 'Count of documents',
+  'series': [
+    {
+      'values': [
+        {
+          'x': 1411761450000,
+          'y': 41
+        },
+        {
+          'x': 1411761480000,
+          'y': 18
+        },
+        {
+          'x': 1411761510000,
+          'y': 22
+        },
+        {
+          'x': 1411761540000,
+          'y': 17
+        },
+        {
+          'x': 1411761570000,
+          'y': 17
+        },
+        {
+          'x': 1411761600000,
+          'y': 21
+        },
+        {
+          'x': 1411761630000,
+          'y': 16
+        },
+        {
+          'x': 1411761660000,
+          'y': 17
+        },
+        {
+          'x': 1411761690000,
+          'y': 15
+        },
+        {
+          'x': 1411761720000,
+          'y': 19
+        },
+        {
+          'x': 1411761750000,
+          'y': 11
+        },
+        {
+          'x': 1411761780000,
+          'y': 13
+        },
+        {
+          'x': 1411761810000,
+          'y': 24
+        },
+        {
+          'x': 1411761840000,
+          'y': 20
+        },
+        {
+          'x': 1411761870000,
+          'y': 20
+        },
+        {
+          'x': 1411761900000,
+          'y': 21
+        },
+        {
+          'x': 1411761930000,
+          'y': 17
+        },
+        {
+          'x': 1411761960000,
+          'y': 20
+        },
+        {
+          'x': 1411761990000,
+          'y': 13
+        },
+        {
+          'x': 1411762020000,
+          'y': 14
+        },
+        {
+          'x': 1411762050000,
+          'y': 25
+        },
+        {
+          'x': 1411762080000,
+          'y': 17
+        },
+        {
+          'x': 1411762110000,
+          'y': 14
+        },
+        {
+          'x': 1411762140000,
+          'y': 22
+        },
+        {
+          'x': 1411762170000,
+          'y': 14
+        },
+        {
+          'x': 1411762200000,
+          'y': 19
+        },
+        {
+          'x': 1411762230000,
+          'y': 22
+        },
+        {
+          'x': 1411762260000,
+          'y': 17
+        },
+        {
+          'x': 1411762290000,
+          'y': 8
+        },
+        {
+          'x': 1411762320000,
+          'y': 15
+        },
+        {
+          'x': 1411762350000,
+          'y': 4
+        }
+      ]
+    }
+  ],
+  'hits': 533,
+  'xAxisFormatter': function (thing) {
+    return moment(thing);
+  },
+  'tooltipFormatter': function (d) {
+    return d;
+  }
+};
diff --git a/src/fixtures/vislib/mock_data/date_histogram/_series_neg.js b/src/fixtures/vislib/mock_data/date_histogram/_series_neg.js
new file mode 100644
index 0000000000000..a514c0000efcf
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/date_histogram/_series_neg.js
@@ -0,0 +1,150 @@
+var moment = require('moment');
+
+module.exports = {
+  'label': '',
+  'xAxisLabel': '@timestamp per 30 sec',
+  'ordered': {
+    'date': true,
+    'min': 1411761457636,
+    'max': 1411762357636,
+    'interval': 30000
+  },
+  'yAxisLabel': 'Count of documents',
+  'series': [
+    {
+      'values': [
+        {
+          'x': 1411761450000,
+          'y': -41
+        },
+        {
+          'x': 1411761480000,
+          'y': -18
+        },
+        {
+          'x': 1411761510000,
+          'y': -22
+        },
+        {
+          'x': 1411761540000,
+          'y': -17
+        },
+        {
+          'x': 1411761570000,
+          'y': -17
+        },
+        {
+          'x': 1411761600000,
+          'y': -21
+        },
+        {
+          'x': 1411761630000,
+          'y': -16
+        },
+        {
+          'x': 1411761660000,
+          'y': -17
+        },
+        {
+          'x': 1411761690000,
+          'y': -15
+        },
+        {
+          'x': 1411761720000,
+          'y': -19
+        },
+        {
+          'x': 1411761750000,
+          'y': -11
+        },
+        {
+          'x': 1411761780000,
+          'y': -13
+        },
+        {
+          'x': 1411761810000,
+          'y': -24
+        },
+        {
+          'x': 1411761840000,
+          'y': -20
+        },
+        {
+          'x': 1411761870000,
+          'y': -20
+        },
+        {
+          'x': 1411761900000,
+          'y': -21
+        },
+        {
+          'x': 1411761930000,
+          'y': -17
+        },
+        {
+          'x': 1411761960000,
+          'y': -20
+        },
+        {
+          'x': 1411761990000,
+          'y': -13
+        },
+        {
+          'x': 1411762020000,
+          'y': -14
+        },
+        {
+          'x': 1411762050000,
+          'y': -25
+        },
+        {
+          'x': 1411762080000,
+          'y': -17
+        },
+        {
+          'x': 1411762110000,
+          'y': -14
+        },
+        {
+          'x': 1411762140000,
+          'y': -22
+        },
+        {
+          'x': 1411762170000,
+          'y': -14
+        },
+        {
+          'x': 1411762200000,
+          'y': -19
+        },
+        {
+          'x': 1411762230000,
+          'y': -22
+        },
+        {
+          'x': 1411762260000,
+          'y': -17
+        },
+        {
+          'x': 1411762290000,
+          'y': -8
+        },
+        {
+          'x': 1411762320000,
+          'y': -15
+        },
+        {
+          'x': 1411762350000,
+          'y': -4
+        }
+      ]
+    }
+  ],
+  'hits': 533,
+  'xAxisFormatter': function (thing) {
+    return moment(thing);
+  },
+  'tooltipFormatter': function (d) {
+    return d;
+  }
+};
diff --git a/src/fixtures/vislib/mock_data/date_histogram/_series_pos_neg.js b/src/fixtures/vislib/mock_data/date_histogram/_series_pos_neg.js
new file mode 100644
index 0000000000000..f7345c1e10c8a
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/date_histogram/_series_pos_neg.js
@@ -0,0 +1,150 @@
+var moment = require('moment');
+
+module.exports = {
+  'label': '',
+  'xAxisLabel': '@timestamp per 30 sec',
+  'ordered': {
+    'date': true,
+    'min': 1411761457636,
+    'max': 1411762357636,
+    'interval': 30000
+  },
+  'yAxisLabel': 'Count of documents',
+  'series': [
+    {
+      'values': [
+        {
+          'x': 1411761450000,
+          'y': 41
+        },
+        {
+          'x': 1411761480000,
+          'y': 18
+        },
+        {
+          'x': 1411761510000,
+          'y': -22
+        },
+        {
+          'x': 1411761540000,
+          'y': -17
+        },
+        {
+          'x': 1411761570000,
+          'y': -17
+        },
+        {
+          'x': 1411761600000,
+          'y': -21
+        },
+        {
+          'x': 1411761630000,
+          'y': -16
+        },
+        {
+          'x': 1411761660000,
+          'y': 17
+        },
+        {
+          'x': 1411761690000,
+          'y': 15
+        },
+        {
+          'x': 1411761720000,
+          'y': 19
+        },
+        {
+          'x': 1411761750000,
+          'y': 11
+        },
+        {
+          'x': 1411761780000,
+          'y': -13
+        },
+        {
+          'x': 1411761810000,
+          'y': -24
+        },
+        {
+          'x': 1411761840000,
+          'y': -20
+        },
+        {
+          'x': 1411761870000,
+          'y': -20
+        },
+        {
+          'x': 1411761900000,
+          'y': -21
+        },
+        {
+          'x': 1411761930000,
+          'y': 17
+        },
+        {
+          'x': 1411761960000,
+          'y': 20
+        },
+        {
+          'x': 1411761990000,
+          'y': -13
+        },
+        {
+          'x': 1411762020000,
+          'y': -14
+        },
+        {
+          'x': 1411762050000,
+          'y': 25
+        },
+        {
+          'x': 1411762080000,
+          'y': -17
+        },
+        {
+          'x': 1411762110000,
+          'y': -14
+        },
+        {
+          'x': 1411762140000,
+          'y': -22
+        },
+        {
+          'x': 1411762170000,
+          'y': -14
+        },
+        {
+          'x': 1411762200000,
+          'y': 19
+        },
+        {
+          'x': 1411762230000,
+          'y': 22
+        },
+        {
+          'x': 1411762260000,
+          'y': 17
+        },
+        {
+          'x': 1411762290000,
+          'y': 8
+        },
+        {
+          'x': 1411762320000,
+          'y': -15
+        },
+        {
+          'x': 1411762350000,
+          'y': -4
+        }
+      ]
+    }
+  ],
+  'hits': 533,
+  'xAxisFormatter': function (thing) {
+    return moment(thing);
+  },
+  'tooltipFormatter': function (d) {
+    return d;
+  }
+};
diff --git a/src/fixtures/vislib/mock_data/date_histogram/_stacked_series.js b/src/fixtures/vislib/mock_data/date_histogram/_stacked_series.js
new file mode 100644
index 0000000000000..e124703fda690
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/date_histogram/_stacked_series.js
@@ -0,0 +1,1483 @@
+var moment = require('moment');
+
+module.exports = {
+  'label': '',
+  'xAxisLabel': '@timestamp per 10 min',
+  'ordered': {
+    'date': true,
+    'min': 1413544140087,
+    'max': 1413587340087,
+    'interval': 600000
+  },
+  'yAxisLabel': 'Count of documents',
+  'series': [
+    {
+      'label': 'html',
+      'values': [
+        {
+          'x': 1413543600000,
+          'y': 140
+        },
+        {
+          'x': 1413544200000,
+          'y': 1388
+        },
+        {
+          'x': 1413544800000,
+          'y': 1308
+        },
+        {
+          'x': 1413545400000,
+          'y': 1356
+        },
+        {
+          'x': 1413546000000,
+          'y': 1314
+        },
+        {
+          'x': 1413546600000,
+          'y': 1343
+        },
+        {
+          'x': 1413547200000,
+          'y': 1353
+        },
+        {
+          'x': 1413547800000,
+          'y': 1353
+        },
+        {
+          'x': 1413548400000,
+          'y': 1334
+        },
+        {
+          'x': 1413549000000,
+          'y': 1433
+        },
+        {
+          'x': 1413549600000,
+          'y': 1331
+        },
+        {
+          'x': 1413550200000,
+          'y': 1349
+        },
+        {
+          'x': 1413550800000,
+          'y': 1323
+        },
+        {
+          'x': 1413551400000,
+          'y': 1203
+        },
+        {
+          'x': 1413552000000,
+          'y': 1231
+        },
+        {
+          'x': 1413552600000,
+          'y': 1227
+        },
+        {
+          'x': 1413553200000,
+          'y': 1187
+        },
+        {
+          'x': 1413553800000,
+          'y': 1119
+        },
+        {
+          'x': 1413554400000,
+          'y': 1159
+        },
+        {
+          'x': 1413555000000,
+          'y': 1117
+        },
+        {
+          'x': 1413555600000,
+          'y': 1152
+        },
+        {
+          'x': 1413556200000,
+          'y': 1057
+        },
+        {
+          'x': 1413556800000,
+          'y': 1009
+        },
+        {
+          'x': 1413557400000,
+          'y': 979
+        },
+        {
+          'x': 1413558000000,
+          'y': 975
+        },
+        {
+          'x': 1413558600000,
+          'y': 848
+        },
+        {
+          'x': 1413559200000,
+          'y': 873
+        },
+        {
+          'x': 1413559800000,
+          'y': 808
+        },
+        {
+          'x': 1413560400000,
+          'y': 784
+        },
+        {
+          'x': 1413561000000,
+          'y': 799
+        },
+        {
+          'x': 1413561600000,
+          'y': 684
+        },
+        {
+          'x': 1413562200000,
+          'y': 727
+        },
+        {
+          'x': 1413562800000,
+          'y': 621
+        },
+        {
+          'x': 1413563400000,
+          'y': 615
+        },
+        {
+          'x': 1413564000000,
+          'y': 569
+        },
+        {
+          'x': 1413564600000,
+          'y': 523
+        },
+        {
+          'x': 1413565200000,
+          'y': 474
+        },
+        {
+          'x': 1413565800000,
+          'y': 470
+        },
+        {
+          'x': 1413566400000,
+          'y': 466
+        },
+        {
+          'x': 1413567000000,
+          'y': 394
+        },
+        {
+          'x': 1413567600000,
+          'y': 404
+        },
+        {
+          'x': 1413568200000,
+          'y': 389
+        },
+        {
+          'x': 1413568800000,
+          'y': 312
+        },
+        {
+          'x': 1413569400000,
+          'y': 274
+        },
+        {
+          'x': 1413570000000,
+          'y': 285
+        },
+        {
+          'x': 1413570600000,
+          'y': 299
+        },
+        {
+          'x': 1413571200000,
+          'y': 207
+        },
+        {
+          'x': 1413571800000,
+          'y': 213
+        },
+        {
+          'x': 1413572400000,
+          'y': 119
+        },
+        {
+          'x': 1413573600000,
+          'y': 122
+        },
+        {
+          'x': 1413574200000,
+          'y': 169
+        },
+        {
+          'x': 1413574800000,
+          'y': 151
+        },
+        {
+          'x': 1413575400000,
+          'y': 152
+        },
+        {
+          'x': 1413576000000,
+          'y': 115
+        },
+        {
+          'x': 1413576600000,
+          'y': 117
+        },
+        {
+          'x': 1413577200000,
+          'y': 108
+        },
+        {
+          'x': 1413577800000,
+          'y': 100
+        },
+        {
+          'x': 1413578400000,
+          'y': 78
+        },
+        {
+          'x': 1413579000000,
+          'y': 88
+        },
+        {
+          'x': 1413579600000,
+          'y': 63
+        },
+        {
+          'x': 1413580200000,
+          'y': 58
+        },
+        {
+          'x': 1413580800000,
+          'y': 45
+        },
+        {
+          'x': 1413581400000,
+          'y': 57
+        },
+        {
+          'x': 1413582000000,
+          'y': 34
+        },
+        {
+          'x': 1413582600000,
+          'y': 41
+        },
+        {
+          'x': 1413583200000,
+          'y': 24
+        },
+        {
+          'x': 1413583800000,
+          'y': 27
+        },
+        {
+          'x': 1413584400000,
+          'y': 19
+        },
+        {
+          'x': 1413585000000,
+          'y': 24
+        },
+        {
+          'x': 1413585600000,
+          'y': 18
+        },
+        {
+          'x': 1413586200000,
+          'y': 17
+        },
+        {
+          'x': 1413586800000,
+          'y': 14
+        }
+      ]
+    },
+    {
+      'label': 'php',
+      'values': [
+        {
+          'x': 1413543600000,
+          'y': 90
+        },
+        {
+          'x': 1413544200000,
+          'y': 949
+        },
+        {
+          'x': 1413544800000,
+          'y': 1012
+        },
+        {
+          'x': 1413545400000,
+          'y': 1027
+        },
+        {
+          'x': 1413546000000,
+          'y': 1073
+        },
+        {
+          'x': 1413546600000,
+          'y': 992
+        },
+        {
+          'x': 1413547200000,
+          'y': 1005
+        },
+        {
+          'x': 1413547800000,
+          'y': 1014
+        },
+        {
+          'x': 1413548400000,
+          'y': 987
+        },
+        {
+          'x': 1413549000000,
+          'y': 982
+        },
+        {
+          'x': 1413549600000,
+          'y': 1086
+        },
+        {
+          'x': 1413550200000,
+          'y': 998
+        },
+        {
+          'x': 1413550800000,
+          'y': 935
+        },
+        {
+          'x': 1413551400000,
+          'y': 995
+        },
+        {
+          'x': 1413552000000,
+          'y': 926
+        },
+        {
+          'x': 1413552600000,
+          'y': 897
+        },
+        {
+          'x': 1413553200000,
+          'y': 873
+        },
+        {
+          'x': 1413553800000,
+          'y': 885
+        },
+        {
+          'x': 1413554400000,
+          'y': 859
+        },
+        {
+          'x': 1413555000000,
+          'y': 852
+        },
+        {
+          'x': 1413555600000,
+          'y': 779
+        },
+        {
+          'x': 1413556200000,
+          'y': 739
+        },
+        {
+          'x': 1413556800000,
+          'y': 783
+        },
+        {
+          'x': 1413557400000,
+          'y': 784
+        },
+        {
+          'x': 1413558000000,
+          'y': 687
+        },
+        {
+          'x': 1413558600000,
+          'y': 660
+        },
+        {
+          'x': 1413559200000,
+          'y': 672
+        },
+        {
+          'x': 1413559800000,
+          'y': 600
+        },
+        {
+          'x': 1413560400000,
+          'y': 659
+        },
+        {
+          'x': 1413561000000,
+          'y': 540
+        },
+        {
+          'x': 1413561600000,
+          'y': 539
+        },
+        {
+          'x': 1413562200000,
+          'y': 481
+        },
+        {
+          'x': 1413562800000,
+          'y': 498
+        },
+        {
+          'x': 1413563400000,
+          'y': 444
+        },
+        {
+          'x': 1413564000000,
+          'y': 452
+        },
+        {
+          'x': 1413564600000,
+          'y': 408
+        },
+        {
+          'x': 1413565200000,
+          'y': 358
+        },
+        {
+          'x': 1413565800000,
+          'y': 321
+        },
+        {
+          'x': 1413566400000,
+          'y': 305
+        },
+        {
+          'x': 1413567000000,
+          'y': 292
+        },
+        {
+          'x': 1413567600000,
+          'y': 289
+        },
+        {
+          'x': 1413568200000,
+          'y': 239
+        },
+        {
+          'x': 1413568800000,
+          'y': 256
+        },
+        {
+          'x': 1413569400000,
+          'y': 220
+        },
+        {
+          'x': 1413570000000,
+          'y': 205
+        },
+        {
+          'x': 1413570600000,
+          'y': 201
+        },
+        {
+          'x': 1413571200000,
+          'y': 183
+        },
+        {
+          'x': 1413571800000,
+          'y': 172
+        },
+        {
+          'x': 1413572400000,
+          'y': 73
+        },
+        {
+          'x': 1413573600000,
+          'y': 90
+        },
+        {
+          'x': 1413574200000,
+          'y': 130
+        },
+        {
+          'x': 1413574800000,
+          'y': 104
+        },
+        {
+          'x': 1413575400000,
+          'y': 108
+        },
+        {
+          'x': 1413576000000,
+          'y': 92
+        },
+        {
+          'x': 1413576600000,
+          'y': 79
+        },
+        {
+          'x': 1413577200000,
+          'y': 90
+        },
+        {
+          'x': 1413577800000,
+          'y': 72
+        },
+        {
+          'x': 1413578400000,
+          'y': 68
+        },
+        {
+          'x': 1413579000000,
+          'y': 52
+        },
+        {
+          'x': 1413579600000,
+          'y': 60
+        },
+        {
+          'x': 1413580200000,
+          'y': 51
+        },
+        {
+          'x': 1413580800000,
+          'y': 32
+        },
+        {
+          'x': 1413581400000,
+          'y': 37
+        },
+        {
+          'x': 1413582000000,
+          'y': 30
+        },
+        {
+          'x': 1413582600000,
+          'y': 29
+        },
+        {
+          'x': 1413583200000,
+          'y': 24
+        },
+        {
+          'x': 1413583800000,
+          'y': 16
+        },
+        {
+          'x': 1413584400000,
+          'y': 15
+        },
+        {
+          'x': 1413585000000,
+          'y': 15
+        },
+        {
+          'x': 1413585600000,
+          'y': 10
+        },
+        {
+          'x': 1413586200000,
+          'y': 9
+        },
+        {
+          'x': 1413586800000,
+          'y': 9
+        }
+      ]
+    },
+    {
+      'label': 'png',
+      'values': [
+        {
+          'x': 1413543600000,
+          'y': 44
+        },
+        {
+          'x': 1413544200000,
+          'y': 495
+        },
+        {
+          'x': 1413544800000,
+          'y': 489
+        },
+        {
+          'x': 1413545400000,
+          'y': 492
+        },
+        {
+          'x': 1413546000000,
+          'y': 556
+        },
+        {
+          'x': 1413546600000,
+          'y': 536
+        },
+        {
+          'x': 1413547200000,
+          'y': 511
+        },
+        {
+          'x': 1413547800000,
+          'y': 479
+        },
+        {
+          'x': 1413548400000,
+          'y': 544
+        },
+        {
+          'x': 1413549000000,
+          'y': 513
+        },
+        {
+          'x': 1413549600000,
+          'y': 501
+        },
+        {
+          'x': 1413550200000,
+          'y': 532
+        },
+        {
+          'x': 1413550800000,
+          'y': 440
+        },
+        {
+          'x': 1413551400000,
+          'y': 455
+        },
+        {
+          'x': 1413552000000,
+          'y': 455
+        },
+        {
+          'x': 1413552600000,
+          'y': 471
+        },
+        {
+          'x': 1413553200000,
+          'y': 428
+        },
+        {
+          'x': 1413553800000,
+          'y': 457
+        },
+        {
+          'x': 1413554400000,
+          'y': 450
+        },
+        {
+          'x': 1413555000000,
+          'y': 418
+        },
+        {
+          'x': 1413555600000,
+          'y': 398
+        },
+        {
+          'x': 1413556200000,
+          'y': 397
+        },
+        {
+          'x': 1413556800000,
+          'y': 359
+        },
+        {
+          'x': 1413557400000,
+          'y': 398
+        },
+        {
+          'x': 1413558000000,
+          'y': 339
+        },
+        {
+          'x': 1413558600000,
+          'y': 363
+        },
+        {
+          'x': 1413559200000,
+          'y': 297
+        },
+        {
+          'x': 1413559800000,
+          'y': 323
+        },
+        {
+          'x': 1413560400000,
+          'y': 302
+        },
+        {
+          'x': 1413561000000,
+          'y': 260
+        },
+        {
+          'x': 1413561600000,
+          'y': 276
+        },
+        {
+          'x': 1413562200000,
+          'y': 249
+        },
+        {
+          'x': 1413562800000,
+          'y': 248
+        },
+        {
+          'x': 1413563400000,
+          'y': 235
+        },
+        {
+          'x': 1413564000000,
+          'y': 234
+        },
+        {
+          'x': 1413564600000,
+          'y': 188
+        },
+        {
+          'x': 1413565200000,
+          'y': 192
+        },
+        {
+          'x': 1413565800000,
+          'y': 173
+        },
+        {
+          'x': 1413566400000,
+          'y': 160
+        },
+        {
+          'x': 1413567000000,
+          'y': 137
+        },
+        {
+          'x': 1413567600000,
+          'y': 158
+        },
+        {
+          'x': 1413568200000,
+          'y': 111
+        },
+        {
+          'x': 1413568800000,
+          'y': 145
+        },
+        {
+          'x': 1413569400000,
+          'y': 118
+        },
+        {
+          'x': 1413570000000,
+          'y': 104
+        },
+        {
+          'x': 1413570600000,
+          'y': 80
+        },
+        {
+          'x': 1413571200000,
+          'y': 79
+        },
+        {
+          'x': 1413571800000,
+          'y': 86
+        },
+        {
+          'x': 1413572400000,
+          'y': 47
+        },
+        {
+          'x': 1413573600000,
+          'y': 49
+        },
+        {
+          'x': 1413574200000,
+          'y': 68
+        },
+        {
+          'x': 1413574800000,
+          'y': 78
+        },
+        {
+          'x': 1413575400000,
+          'y': 77
+        },
+        {
+          'x': 1413576000000,
+          'y': 50
+        },
+        {
+          'x': 1413576600000,
+          'y': 51
+        },
+        {
+          'x': 1413577200000,
+          'y': 40
+        },
+        {
+          'x': 1413577800000,
+          'y': 42
+        },
+        {
+          'x': 1413578400000,
+          'y': 29
+        },
+        {
+          'x': 1413579000000,
+          'y': 24
+        },
+        {
+          'x': 1413579600000,
+          'y': 30
+        },
+        {
+          'x': 1413580200000,
+          'y': 18
+        },
+        {
+          'x': 1413580800000,
+          'y': 15
+        },
+        {
+          'x': 1413581400000,
+          'y': 19
+        },
+        {
+          'x': 1413582000000,
+          'y': 18
+        },
+        {
+          'x': 1413582600000,
+          'y': 13
+        },
+        {
+          'x': 1413583200000,
+          'y': 11
+        },
+        {
+          'x': 1413583800000,
+          'y': 11
+        },
+        {
+          'x': 1413584400000,
+          'y': 13
+        },
+        {
+          'x': 1413585000000,
+          'y': 9
+        },
+        {
+          'x': 1413585600000,
+          'y': 9
+        },
+        {
+          'x': 1413586200000,
+          'y': 9
+        },
+        {
+          'x': 1413586800000,
+          'y': 3
+        }
+      ]
+    },
+    {
+      'label': 'css',
+      'values': [
+        {
+          'x': 1413543600000,
+          'y': 35
+        },
+        {
+          'x': 1413544200000,
+          'y': 360
+        },
+        {
+          'x': 1413544800000,
+          'y': 343
+        },
+        {
+          'x': 1413545400000,
+          'y': 329
+        },
+        {
+          'x': 1413546000000,
+          'y': 345
+        },
+        {
+          'x': 1413546600000,
+          'y': 336
+        },
+        {
+          'x': 1413547200000,
+          'y': 330
+        },
+        {
+          'x': 1413547800000,
+          'y': 334
+        },
+        {
+          'x': 1413548400000,
+          'y': 326
+        },
+        {
+          'x': 1413549000000,
+          'y': 351
+        },
+        {
+          'x': 1413549600000,
+          'y': 334
+        },
+        {
+          'x': 1413550200000,
+          'y': 351
+        },
+        {
+          'x': 1413550800000,
+          'y': 337
+        },
+        {
+          'x': 1413551400000,
+          'y': 306
+        },
+        {
+          'x': 1413552000000,
+          'y': 346
+        },
+        {
+          'x': 1413552600000,
+          'y': 317
+        },
+        {
+          'x': 1413553200000,
+          'y': 298
+        },
+        {
+          'x': 1413553800000,
+          'y': 288
+        },
+        {
+          'x': 1413554400000,
+          'y': 283
+        },
+        {
+          'x': 1413555000000,
+          'y': 262
+        },
+        {
+          'x': 1413555600000,
+          'y': 245
+        },
+        {
+          'x': 1413556200000,
+          'y': 259
+        },
+        {
+          'x': 1413556800000,
+          'y': 267
+        },
+        {
+          'x': 1413557400000,
+          'y': 230
+        },
+        {
+          'x': 1413558000000,
+          'y': 218
+        },
+        {
+          'x': 1413558600000,
+          'y': 241
+        },
+        {
+          'x': 1413559200000,
+          'y': 213
+        },
+        {
+          'x': 1413559800000,
+          'y': 239
+        },
+        {
+          'x': 1413560400000,
+          'y': 208
+        },
+        {
+          'x': 1413561000000,
+          'y': 187
+        },
+        {
+          'x': 1413561600000,
+          'y': 166
+        },
+        {
+          'x': 1413562200000,
+          'y': 154
+        },
+        {
+          'x': 1413562800000,
+          'y': 184
+        },
+        {
+          'x': 1413563400000,
+          'y': 148
+        },
+        {
+          'x': 1413564000000,
+          'y': 153
+        },
+        {
+          'x': 1413564600000,
+          'y': 149
+        },
+        {
+          'x': 1413565200000,
+          'y': 102
+        },
+        {
+          'x': 1413565800000,
+          'y': 110
+        },
+        {
+          'x': 1413566400000,
+          'y': 121
+        },
+        {
+          'x': 1413567000000,
+          'y': 120
+        },
+        {
+          'x': 1413567600000,
+          'y': 86
+        },
+        {
+          'x': 1413568200000,
+          'y': 96
+        },
+        {
+          'x': 1413568800000,
+          'y': 71
+        },
+        {
+          'x': 1413569400000,
+          'y': 92
+        },
+        {
+          'x': 1413570000000,
+          'y': 65
+        },
+        {
+          'x': 1413570600000,
+          'y': 54
+        },
+        {
+          'x': 1413571200000,
+          'y': 68
+        },
+        {
+          'x': 1413571800000,
+          'y': 57
+        },
+        {
+          'x': 1413572400000,
+          'y': 33
+        },
+        {
+          'x': 1413573600000,
+          'y': 47
+        },
+        {
+          'x': 1413574200000,
+          'y': 42
+        },
+        {
+          'x': 1413574800000,
+          'y': 39
+        },
+        {
+          'x': 1413575400000,
+          'y': 25
+        },
+        {
+          'x': 1413576000000,
+          'y': 31
+        },
+        {
+          'x': 1413576600000,
+          'y': 37
+        },
+        {
+          'x': 1413577200000,
+          'y': 35
+        },
+        {
+          'x': 1413577800000,
+          'y': 19
+        },
+        {
+          'x': 1413578400000,
+          'y': 15
+        },
+        {
+          'x': 1413579000000,
+          'y': 21
+        },
+        {
+          'x': 1413579600000,
+          'y': 16
+        },
+        {
+          'x': 1413580200000,
+          'y': 18
+        },
+        {
+          'x': 1413580800000,
+          'y': 10
+        },
+        {
+          'x': 1413581400000,
+          'y': 13
+        },
+        {
+          'x': 1413582000000,
+          'y': 14
+        },
+        {
+          'x': 1413582600000,
+          'y': 11
+        },
+        {
+          'x': 1413583200000,
+          'y': 4
+        },
+        {
+          'x': 1413583800000,
+          'y': 6
+        },
+        {
+          'x': 1413584400000,
+          'y': 3
+        },
+        {
+          'x': 1413585000000,
+          'y': 6
+        },
+        {
+          'x': 1413585600000,
+          'y': 6
+        },
+        {
+          'x': 1413586200000,
+          'y': 2
+        },
+        {
+          'x': 1413586800000,
+          'y': 3
+        }
+      ]
+    },
+    {
+      'label': 'gif',
+      'values': [
+        {
+          'x': 1413543600000,
+          'y': 21
+        },
+        {
+          'x': 1413544200000,
+          'y': 191
+        },
+        {
+          'x': 1413544800000,
+          'y': 176
+        },
+        {
+          'x': 1413545400000,
+          'y': 166
+        },
+        {
+          'x': 1413546000000,
+          'y': 183
+        },
+        {
+          'x': 1413546600000,
+          'y': 170
+        },
+        {
+          'x': 1413547200000,
+          'y': 153
+        },
+        {
+          'x': 1413547800000,
+          'y': 202
+        },
+        {
+          'x': 1413548400000,
+          'y': 175
+        },
+        {
+          'x': 1413549000000,
+          'y': 161
+        },
+        {
+          'x': 1413549600000,
+          'y': 174
+        },
+        {
+          'x': 1413550200000,
+          'y': 167
+        },
+        {
+          'x': 1413550800000,
+          'y': 171
+        },
+        {
+          'x': 1413551400000,
+          'y': 176
+        },
+        {
+          'x': 1413552000000,
+          'y': 139
+        },
+        {
+          'x': 1413552600000,
+          'y': 145
+        },
+        {
+          'x': 1413553200000,
+          'y': 157
+        },
+        {
+          'x': 1413553800000,
+          'y': 148
+        },
+        {
+          'x': 1413554400000,
+          'y': 149
+        },
+        {
+          'x': 1413555000000,
+          'y': 135
+        },
+        {
+          'x': 1413555600000,
+          'y': 118
+        },
+        {
+          'x': 1413556200000,
+          'y': 142
+        },
+        {
+          'x': 1413556800000,
+          'y': 141
+        },
+        {
+          'x': 1413557400000,
+          'y': 146
+        },
+        {
+          'x': 1413558000000,
+          'y': 114
+        },
+        {
+          'x': 1413558600000,
+          'y': 115
+        },
+        {
+          'x': 1413559200000,
+          'y': 136
+        },
+        {
+          'x': 1413559800000,
+          'y': 106
+        },
+        {
+          'x': 1413560400000,
+          'y': 92
+        },
+        {
+          'x': 1413561000000,
+          'y': 97
+        },
+        {
+          'x': 1413561600000,
+          'y': 90
+        },
+        {
+          'x': 1413562200000,
+          'y': 69
+        },
+        {
+          'x': 1413562800000,
+          'y': 66
+        },
+        {
+          'x': 1413563400000,
+          'y': 93
+        },
+        {
+          'x': 1413564000000,
+          'y': 75
+        },
+        {
+          'x': 1413564600000,
+          'y': 68
+        },
+        {
+          'x': 1413565200000,
+          'y': 55
+        },
+        {
+          'x': 1413565800000,
+          'y': 73
+        },
+        {
+          'x': 1413566400000,
+          'y': 57
+        },
+        {
+          'x': 1413567000000,
+          'y': 48
+        },
+        {
+          'x': 1413567600000,
+          'y': 41
+        },
+        {
+          'x': 1413568200000,
+          'y': 39
+        },
+        {
+          'x': 1413568800000,
+          'y': 32
+        },
+        {
+          'x': 1413569400000,
+          'y': 33
+        },
+        {
+          'x': 1413570000000,
+          'y': 39
+        },
+        {
+          'x': 1413570600000,
+          'y': 35
+        },
+        {
+          'x': 1413571200000,
+          'y': 25
+        },
+        {
+          'x': 1413571800000,
+          'y': 28
+        },
+        {
+          'x': 1413572400000,
+          'y': 8
+        },
+        {
+          'x': 1413573600000,
+          'y': 13
+        },
+        {
+          'x': 1413574200000,
+          'y': 23
+        },
+        {
+          'x': 1413574800000,
+          'y': 19
+        },
+        {
+          'x': 1413575400000,
+          'y': 16
+        },
+        {
+          'x': 1413576000000,
+          'y': 22
+        },
+        {
+          'x': 1413576600000,
+          'y': 13
+        },
+        {
+          'x': 1413577200000,
+          'y': 21
+        },
+        {
+          'x': 1413577800000,
+          'y': 11
+        },
+        {
+          'x': 1413578400000,
+          'y': 12
+        },
+        {
+          'x': 1413579000000,
+          'y': 10
+        },
+        {
+          'x': 1413579600000,
+          'y': 7
+        },
+        {
+          'x': 1413580200000,
+          'y': 4
+        },
+        {
+          'x': 1413580800000,
+          'y': 5
+        },
+        {
+          'x': 1413581400000,
+          'y': 7
+        },
+        {
+          'x': 1413582000000,
+          'y': 9
+        },
+        {
+          'x': 1413582600000,
+          'y': 2
+        },
+        {
+          'x': 1413583200000,
+          'y': 2
+        },
+        {
+          'x': 1413583800000,
+          'y': 4
+        },
+        {
+          'x': 1413584400000,
+          'y': 6
+        },
+        {
+          'x': 1413585600000,
+          'y': 2
+        },
+        {
+          'x': 1413586200000,
+          'y': 4
+        },
+        {
+          'x': 1413586800000,
+          'y': 4
+        }
+      ]
+    }
+  ],
+  'hits': 108970,
+  'xAxisFormatter': function (thing) {
+    return moment(thing);
+  },
+  'tooltipFormatter': function (d) {
+    return d;
+  }
+};
diff --git a/src/fixtures/vislib/mock_data/filters/_columns.js b/src/fixtures/vislib/mock_data/filters/_columns.js
new file mode 100644
index 0000000000000..ea5ab1b097070
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/filters/_columns.js
@@ -0,0 +1,106 @@
+var _ = require('lodash');
+
+module.exports = {
+  'columns': [
+    {
+      'label': 'Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 Firefox/6.0a1: agent.raw',
+      'xAxisLabel': 'filters',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'css',
+              'y': 10379
+            },
+            {
+              'x': 'png',
+              'y': 6395
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    },
+    {
+      'label': 'Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.50 Safari/534.24: agent.raw',
+      'xAxisLabel': 'filters',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'css',
+              'y': 9253
+            },
+            {
+              'x': 'png',
+              'y': 5571
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    },
+    {
+      'label': 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322): agent.raw',
+      'xAxisLabel': 'filters',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'css',
+              'y': 7740
+            },
+            {
+              'x': 'png',
+              'y': 4697
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    }
+  ],
+  'hits': 171443
+};
diff --git a/src/fixtures/vislib/mock_data/filters/_rows.js b/src/fixtures/vislib/mock_data/filters/_rows.js
new file mode 100644
index 0000000000000..d3c27ed491b50
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/filters/_rows.js
@@ -0,0 +1,106 @@
+var _ = require('lodash');
+
+module.exports = {
+  'rows': [
+    {
+      'label': '200: response',
+      'xAxisLabel': 'filters',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'css',
+              'y': 25260
+            },
+            {
+              'x': 'png',
+              'y': 15311
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    },
+    {
+      'label': '404: response',
+      'xAxisLabel': 'filters',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'css',
+              'y': 1352
+            },
+            {
+              'x': 'png',
+              'y': 826
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    },
+    {
+      'label': '503: response',
+      'xAxisLabel': 'filters',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'css',
+              'y': 761
+            },
+            {
+              'x': 'png',
+              'y': 527
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    }
+  ],
+  'hits': 171443
+};
diff --git a/src/fixtures/vislib/mock_data/filters/_series.js b/src/fixtures/vislib/mock_data/filters/_series.js
new file mode 100644
index 0000000000000..46cdbbc3794a4
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/filters/_series.js
@@ -0,0 +1,40 @@
+var _ = require('lodash');
+
+module.exports = {
+  'label': '',
+  'xAxisLabel': 'filters',
+  'yAxisLabel': 'Count of documents',
+  'series': [
+    {
+      'values': [
+        {
+          'x': 'css',
+          'y': 27374
+        },
+        {
+          'x': 'html',
+          'y': 0
+        },
+        {
+          'x': 'png',
+          'y': 16663
+        }
+      ]
+    }
+  ],
+  'hits': 171454,
+  'xAxisFormatter': function (val) {
+    if (_.isObject(val)) {
+      return JSON.stringify(val);
+    }
+    else if (val == null) {
+      return '';
+    }
+    else {
+      return '' + val;
+    }
+  },
+  'tooltipFormatter': function (d) {
+    return d;
+  }
+};
diff --git a/src/fixtures/vislib/mock_data/geohash/_columns.js b/src/fixtures/vislib/mock_data/geohash/_columns.js
new file mode 100644
index 0000000000000..2f39a449c9551
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/geohash/_columns.js
@@ -0,0 +1,3744 @@
+var _ = require('lodash');
+module.exports = {
+  'columns': [
+      {
+        'title': 'Top 2 geo.dest: CN',
+        'valueFormatter': _.identity,
+        'geoJson': {
+          'type': 'FeatureCollection',
+          'features': [
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  22.5,
+                  22.5
+                ]
+              },
+              'properties': {
+                'value': 42,
+                'geohash': 's',
+                'center': [
+                  22.5,
+                  22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 's',
+                    'value': 's',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 42,
+                  'value': 42,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    0,
+                    0
+                  ],
+                  [
+                    45,
+                    0
+                  ],
+                  [
+                    45,
+                    45
+                  ],
+                  [
+                    0,
+                    45
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -67.5,
+                  22.5
+                ]
+              },
+              'properties': {
+                'value': 31,
+                'geohash': 'd',
+                'center': [
+                  -67.5,
+                  22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'd',
+                    'value': 'd',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 31,
+                  'value': 31,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -90,
+                    0
+                  ],
+                  [
+                    -45,
+                    0
+                  ],
+                  [
+                    -45,
+                    45
+                  ],
+                  [
+                    -90,
+                    45
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  112.5,
+                  22.5
+                ]
+              },
+              'properties': {
+                'value': 30,
+                'geohash': 'w',
+                'center': [
+                  112.5,
+                  22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'w',
+                    'value': 'w',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 30,
+                  'value': 30,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    90,
+                    0
+                  ],
+                  [
+                    135,
+                    0
+                  ],
+                  [
+                    135,
+                    45
+                  ],
+                  [
+                    90,
+                    45
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -112.5,
+                  22.5
+                ]
+              },
+              'properties': {
+                'value': 25,
+                'geohash': '9',
+                'center': [
+                  -112.5,
+                  22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': '9',
+                    'value': '9',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 25,
+                  'value': 25,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -135,
+                    0
+                  ],
+                  [
+                    -90,
+                    0
+                  ],
+                  [
+                    -90,
+                    45
+                  ],
+                  [
+                    -135,
+                    45
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  67.5,
+                  22.5
+                ]
+              },
+              'properties': {
+                'value': 22,
+                'geohash': 't',
+                'center': [
+                  67.5,
+                  22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 't',
+                    'value': 't',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 22,
+                  'value': 22,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    45,
+                    0
+                  ],
+                  [
+                    90,
+                    0
+                  ],
+                  [
+                    90,
+                    45
+                  ],
+                  [
+                    45,
+                    45
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  22.5,
+                  -22.5
+                ]
+              },
+              'properties': {
+                'value': 22,
+                'geohash': 'k',
+                'center': [
+                  22.5,
+                  -22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'k',
+                    'value': 'k',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 22,
+                  'value': 22,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    0,
+                    -45
+                  ],
+                  [
+                    45,
+                    -45
+                  ],
+                  [
+                    45,
+                    0
+                  ],
+                  [
+                    0,
+                    0
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -67.5,
+                  -22.5
+                ]
+              },
+              'properties': {
+                'value': 21,
+                'geohash': '6',
+                'center': [
+                  -67.5,
+                  -22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': '6',
+                    'value': '6',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 21,
+                  'value': 21,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -90,
+                    -45
+                  ],
+                  [
+                    -45,
+                    -45
+                  ],
+                  [
+                    -45,
+                    0
+                  ],
+                  [
+                    -90,
+                    0
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  22.5,
+                  67.5
+                ]
+              },
+              'properties': {
+                'value': 19,
+                'geohash': 'u',
+                'center': [
+                  22.5,
+                  67.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'u',
+                    'value': 'u',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 19,
+                  'value': 19,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    0,
+                    45
+                  ],
+                  [
+                    45,
+                    45
+                  ],
+                  [
+                    45,
+                    90
+                  ],
+                  [
+                    0,
+                    90
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  67.5,
+                  67.5
+                ]
+              },
+              'properties': {
+                'value': 18,
+                'geohash': 'v',
+                'center': [
+                  67.5,
+                  67.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'v',
+                    'value': 'v',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 18,
+                  'value': 18,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    45,
+                    45
+                  ],
+                  [
+                    90,
+                    45
+                  ],
+                  [
+                    90,
+                    90
+                  ],
+                  [
+                    45,
+                    90
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -112.5,
+                  67.5
+                ]
+              },
+              'properties': {
+                'value': 11,
+                'geohash': 'c',
+                'center': [
+                  -112.5,
+                  67.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'c',
+                    'value': 'c',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 11,
+                  'value': 11,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -135,
+                    45
+                  ],
+                  [
+                    -90,
+                    45
+                  ],
+                  [
+                    -90,
+                    90
+                  ],
+                  [
+                    -135,
+                    90
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  157.5,
+                  -22.5
+                ]
+              },
+              'properties': {
+                'value': 10,
+                'geohash': 'r',
+                'center': [
+                  157.5,
+                  -22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'r',
+                    'value': 'r',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 10,
+                  'value': 10,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    135,
+                    -45
+                  ],
+                  [
+                    180,
+                    -45
+                  ],
+                  [
+                    180,
+                    0
+                  ],
+                  [
+                    135,
+                    0
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  112.5,
+                  67.5
+                ]
+              },
+              'properties': {
+                'value': 9,
+                'geohash': 'y',
+                'center': [
+                  112.5,
+                  67.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'y',
+                    'value': 'y',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 9,
+                  'value': 9,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    90,
+                    45
+                  ],
+                  [
+                    135,
+                    45
+                  ],
+                  [
+                    135,
+                    90
+                  ],
+                  [
+                    90,
+                    90
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -22.5,
+                  22.5
+                ]
+              },
+              'properties': {
+                'value': 9,
+                'geohash': 'e',
+                'center': [
+                  -22.5,
+                  22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'e',
+                    'value': 'e',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 9,
+                  'value': 9,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -45,
+                    0
+                  ],
+                  [
+                    0,
+                    0
+                  ],
+                  [
+                    0,
+                    45
+                  ],
+                  [
+                    -45,
+                    45
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -67.5,
+                  67.5
+                ]
+              },
+              'properties': {
+                'value': 8,
+                'geohash': 'f',
+                'center': [
+                  -67.5,
+                  67.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'f',
+                    'value': 'f',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 8,
+                  'value': 8,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -90,
+                    45
+                  ],
+                  [
+                    -45,
+                    45
+                  ],
+                  [
+                    -45,
+                    90
+                  ],
+                  [
+                    -90,
+                    90
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -22.5,
+                  -22.5
+                ]
+              },
+              'properties': {
+                'value': 8,
+                'geohash': '7',
+                'center': [
+                  -22.5,
+                  -22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': '7',
+                    'value': '7',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 8,
+                  'value': 8,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -45,
+                    -45
+                  ],
+                  [
+                    0,
+                    -45
+                  ],
+                  [
+                    0,
+                    0
+                  ],
+                  [
+                    -45,
+                    0
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  112.5,
+                  -22.5
+                ]
+              },
+              'properties': {
+                'value': 6,
+                'geohash': 'q',
+                'center': [
+                  112.5,
+                  -22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'q',
+                    'value': 'q',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 6,
+                  'value': 6,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    90,
+                    -45
+                  ],
+                  [
+                    135,
+                    -45
+                  ],
+                  [
+                    135,
+                    0
+                  ],
+                  [
+                    90,
+                    0
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -22.5,
+                  67.5
+                ]
+              },
+              'properties': {
+                'value': 6,
+                'geohash': 'g',
+                'center': [
+                  -22.5,
+                  67.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'g',
+                    'value': 'g',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 6,
+                  'value': 6,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -45,
+                    45
+                  ],
+                  [
+                    0,
+                    45
+                  ],
+                  [
+                    0,
+                    90
+                  ],
+                  [
+                    -45,
+                    90
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  157.5,
+                  22.5
+                ]
+              },
+              'properties': {
+                'value': 4,
+                'geohash': 'x',
+                'center': [
+                  157.5,
+                  22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'x',
+                    'value': 'x',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 4,
+                  'value': 4,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    135,
+                    0
+                  ],
+                  [
+                    180,
+                    0
+                  ],
+                  [
+                    180,
+                    45
+                  ],
+                  [
+                    135,
+                    45
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -157.5,
+                  67.5
+                ]
+              },
+              'properties': {
+                'value': 3,
+                'geohash': 'b',
+                'center': [
+                  -157.5,
+                  67.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'b',
+                    'value': 'b',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 3,
+                  'value': 3,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -180,
+                    45
+                  ],
+                  [
+                    -135,
+                    45
+                  ],
+                  [
+                    -135,
+                    90
+                  ],
+                  [
+                    -180,
+                    90
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  157.5,
+                  67.5
+                ]
+              },
+              'properties': {
+                'value': 2,
+                'geohash': 'z',
+                'center': [
+                  157.5,
+                  67.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'z',
+                    'value': 'z',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 2,
+                  'value': 2,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    135,
+                    45
+                  ],
+                  [
+                    180,
+                    45
+                  ],
+                  [
+                    180,
+                    90
+                  ],
+                  [
+                    135,
+                    90
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  67.5,
+                  -22.5
+                ]
+              },
+              'properties': {
+                'value': 1,
+                'geohash': 'm',
+                'center': [
+                  67.5,
+                  -22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'm',
+                    'value': 'm',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 1,
+                  'value': 1,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    45,
+                    -45
+                  ],
+                  [
+                    90,
+                    -45
+                  ],
+                  [
+                    90,
+                    0
+                  ],
+                  [
+                    45,
+                    0
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -22.5,
+                  -67.5
+                ]
+              },
+              'properties': {
+                'value': 1,
+                'geohash': '5',
+                'center': [
+                  -22.5,
+                  -67.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': '5',
+                    'value': '5',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 1,
+                  'value': 1,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -45,
+                    -90
+                  ],
+                  [
+                    0,
+                    -90
+                  ],
+                  [
+                    0,
+                    -45
+                  ],
+                  [
+                    -45,
+                    -45
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -67.5,
+                  -67.5
+                ]
+              },
+              'properties': {
+                'value': 1,
+                'geohash': '4',
+                'center': [
+                  -67.5,
+                  -67.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': '4',
+                    'value': '4',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 1,
+                  'value': 1,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -90,
+                    -90
+                  ],
+                  [
+                    -45,
+                    -90
+                  ],
+                  [
+                    -45,
+                    -45
+                  ],
+                  [
+                    -90,
+                    -45
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -112.5,
+                  -22.5
+                ]
+              },
+              'properties': {
+                'value': 1,
+                'geohash': '3',
+                'center': [
+                  -112.5,
+                  -22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'CN',
+                      'value': 'CN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': '3',
+                    'value': '3',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 1,
+                  'value': 1,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -135,
+                    -45
+                  ],
+                  [
+                    -90,
+                    -45
+                  ],
+                  [
+                    -90,
+                    0
+                  ],
+                  [
+                    -135,
+                    0
+                  ]
+                ]
+              }
+            }
+          ],
+          'properties': {
+            'min': 1,
+            'max': 42
+          }
+        }
+      },
+      {
+        'label': 'Top 2 geo.dest: IN',
+        'valueFormatter': _.identity,
+        'geoJson': {
+          'type': 'FeatureCollection',
+          'features': [
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  22.5,
+                  22.5
+                ]
+              },
+              'properties': {
+                'value': 32,
+                'geohash': 's',
+                'center': [
+                  22.5,
+                  22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 's',
+                    'value': 's',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 32,
+                  'value': 32,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    0,
+                    0
+                  ],
+                  [
+                    45,
+                    0
+                  ],
+                  [
+                    45,
+                    45
+                  ],
+                  [
+                    0,
+                    45
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -67.5,
+                  -22.5
+                ]
+              },
+              'properties': {
+                'value': 31,
+                'geohash': '6',
+                'center': [
+                  -67.5,
+                  -22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': '6',
+                    'value': '6',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 31,
+                  'value': 31,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -90,
+                    -45
+                  ],
+                  [
+                    -45,
+                    -45
+                  ],
+                  [
+                    -45,
+                    0
+                  ],
+                  [
+                    -90,
+                    0
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -67.5,
+                  22.5
+                ]
+              },
+              'properties': {
+                'value': 28,
+                'geohash': 'd',
+                'center': [
+                  -67.5,
+                  22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'd',
+                    'value': 'd',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 28,
+                  'value': 28,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -90,
+                    0
+                  ],
+                  [
+                    -45,
+                    0
+                  ],
+                  [
+                    -45,
+                    45
+                  ],
+                  [
+                    -90,
+                    45
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  112.5,
+                  22.5
+                ]
+              },
+              'properties': {
+                'value': 27,
+                'geohash': 'w',
+                'center': [
+                  112.5,
+                  22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'w',
+                    'value': 'w',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 27,
+                  'value': 27,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    90,
+                    0
+                  ],
+                  [
+                    135,
+                    0
+                  ],
+                  [
+                    135,
+                    45
+                  ],
+                  [
+                    90,
+                    45
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  67.5,
+                  22.5
+                ]
+              },
+              'properties': {
+                'value': 24,
+                'geohash': 't',
+                'center': [
+                  67.5,
+                  22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 't',
+                    'value': 't',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 24,
+                  'value': 24,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    45,
+                    0
+                  ],
+                  [
+                    90,
+                    0
+                  ],
+                  [
+                    90,
+                    45
+                  ],
+                  [
+                    45,
+                    45
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  22.5,
+                  -22.5
+                ]
+              },
+              'properties': {
+                'value': 23,
+                'geohash': 'k',
+                'center': [
+                  22.5,
+                  -22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'k',
+                    'value': 'k',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 23,
+                  'value': 23,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    0,
+                    -45
+                  ],
+                  [
+                    45,
+                    -45
+                  ],
+                  [
+                    45,
+                    0
+                  ],
+                  [
+                    0,
+                    0
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  22.5,
+                  67.5
+                ]
+              },
+              'properties': {
+                'value': 17,
+                'geohash': 'u',
+                'center': [
+                  22.5,
+                  67.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'u',
+                    'value': 'u',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 17,
+                  'value': 17,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    0,
+                    45
+                  ],
+                  [
+                    45,
+                    45
+                  ],
+                  [
+                    45,
+                    90
+                  ],
+                  [
+                    0,
+                    90
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -112.5,
+                  22.5
+                ]
+              },
+              'properties': {
+                'value': 16,
+                'geohash': '9',
+                'center': [
+                  -112.5,
+                  22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': '9',
+                    'value': '9',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 16,
+                  'value': 16,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -135,
+                    0
+                  ],
+                  [
+                    -90,
+                    0
+                  ],
+                  [
+                    -90,
+                    45
+                  ],
+                  [
+                    -135,
+                    45
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  67.5,
+                  67.5
+                ]
+              },
+              'properties': {
+                'value': 14,
+                'geohash': 'v',
+                'center': [
+                  67.5,
+                  67.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'v',
+                    'value': 'v',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 14,
+                  'value': 14,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    45,
+                    45
+                  ],
+                  [
+                    90,
+                    45
+                  ],
+                  [
+                    90,
+                    90
+                  ],
+                  [
+                    45,
+                    90
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -22.5,
+                  22.5
+                ]
+              },
+              'properties': {
+                'value': 13,
+                'geohash': 'e',
+                'center': [
+                  -22.5,
+                  22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'e',
+                    'value': 'e',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 13,
+                  'value': 13,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -45,
+                    0
+                  ],
+                  [
+                    0,
+                    0
+                  ],
+                  [
+                    0,
+                    45
+                  ],
+                  [
+                    -45,
+                    45
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  157.5,
+                  -22.5
+                ]
+              },
+              'properties': {
+                'value': 9,
+                'geohash': 'r',
+                'center': [
+                  157.5,
+                  -22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'r',
+                    'value': 'r',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 9,
+                  'value': 9,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    135,
+                    -45
+                  ],
+                  [
+                    180,
+                    -45
+                  ],
+                  [
+                    180,
+                    0
+                  ],
+                  [
+                    135,
+                    0
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  112.5,
+                  67.5
+                ]
+              },
+              'properties': {
+                'value': 6,
+                'geohash': 'y',
+                'center': [
+                  112.5,
+                  67.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'y',
+                    'value': 'y',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 6,
+                  'value': 6,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    90,
+                    45
+                  ],
+                  [
+                    135,
+                    45
+                  ],
+                  [
+                    135,
+                    90
+                  ],
+                  [
+                    90,
+                    90
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -22.5,
+                  67.5
+                ]
+              },
+              'properties': {
+                'value': 6,
+                'geohash': 'g',
+                'center': [
+                  -22.5,
+                  67.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'g',
+                    'value': 'g',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 6,
+                  'value': 6,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -45,
+                    45
+                  ],
+                  [
+                    0,
+                    45
+                  ],
+                  [
+                    0,
+                    90
+                  ],
+                  [
+                    -45,
+                    90
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -67.5,
+                  67.5
+                ]
+              },
+              'properties': {
+                'value': 6,
+                'geohash': 'f',
+                'center': [
+                  -67.5,
+                  67.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'f',
+                    'value': 'f',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 6,
+                  'value': 6,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -90,
+                    45
+                  ],
+                  [
+                    -45,
+                    45
+                  ],
+                  [
+                    -45,
+                    90
+                  ],
+                  [
+                    -90,
+                    90
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -112.5,
+                  67.5
+                ]
+              },
+              'properties': {
+                'value': 5,
+                'geohash': 'c',
+                'center': [
+                  -112.5,
+                  67.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'c',
+                    'value': 'c',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 5,
+                  'value': 5,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -135,
+                    45
+                  ],
+                  [
+                    -90,
+                    45
+                  ],
+                  [
+                    -90,
+                    90
+                  ],
+                  [
+                    -135,
+                    90
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -157.5,
+                  67.5
+                ]
+              },
+              'properties': {
+                'value': 4,
+                'geohash': 'b',
+                'center': [
+                  -157.5,
+                  67.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'b',
+                    'value': 'b',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 4,
+                  'value': 4,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -180,
+                    45
+                  ],
+                  [
+                    -135,
+                    45
+                  ],
+                  [
+                    -135,
+                    90
+                  ],
+                  [
+                    -180,
+                    90
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  112.5,
+                  -22.5
+                ]
+              },
+              'properties': {
+                'value': 3,
+                'geohash': 'q',
+                'center': [
+                  112.5,
+                  -22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'q',
+                    'value': 'q',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 3,
+                  'value': 3,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    90,
+                    -45
+                  ],
+                  [
+                    135,
+                    -45
+                  ],
+                  [
+                    135,
+                    0
+                  ],
+                  [
+                    90,
+                    0
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -67.5,
+                  -67.5
+                ]
+              },
+              'properties': {
+                'value': 2,
+                'geohash': '4',
+                'center': [
+                  -67.5,
+                  -67.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': '4',
+                    'value': '4',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 2,
+                  'value': 2,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -90,
+                    -90
+                  ],
+                  [
+                    -45,
+                    -90
+                  ],
+                  [
+                    -45,
+                    -45
+                  ],
+                  [
+                    -90,
+                    -45
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  157.5,
+                  67.5
+                ]
+              },
+              'properties': {
+                'value': 1,
+                'geohash': 'z',
+                'center': [
+                  157.5,
+                  67.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'z',
+                    'value': 'z',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 1,
+                  'value': 1,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    135,
+                    45
+                  ],
+                  [
+                    180,
+                    45
+                  ],
+                  [
+                    180,
+                    90
+                  ],
+                  [
+                    135,
+                    90
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  157.5,
+                  22.5
+                ]
+              },
+              'properties': {
+                'value': 1,
+                'geohash': 'x',
+                'center': [
+                  157.5,
+                  22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'x',
+                    'value': 'x',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 1,
+                  'value': 1,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    135,
+                    0
+                  ],
+                  [
+                    180,
+                    0
+                  ],
+                  [
+                    180,
+                    45
+                  ],
+                  [
+                    135,
+                    45
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  157.5,
+                  -67.5
+                ]
+              },
+              'properties': {
+                'value': 1,
+                'geohash': 'p',
+                'center': [
+                  157.5,
+                  -67.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'p',
+                    'value': 'p',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 1,
+                  'value': 1,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    135,
+                    -90
+                  ],
+                  [
+                    180,
+                    -90
+                  ],
+                  [
+                    180,
+                    -45
+                  ],
+                  [
+                    135,
+                    -45
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  67.5,
+                  -22.5
+                ]
+              },
+              'properties': {
+                'value': 1,
+                'geohash': 'm',
+                'center': [
+                  67.5,
+                  -22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': 'm',
+                    'value': 'm',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 1,
+                  'value': 1,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    45,
+                    -45
+                  ],
+                  [
+                    90,
+                    -45
+                  ],
+                  [
+                    90,
+                    0
+                  ],
+                  [
+                    45,
+                    0
+                  ]
+                ]
+              }
+            },
+            {
+              'type': 'Feature',
+              'geometry': {
+                'type': 'Point',
+                'coordinates': [
+                  -22.5,
+                  -22.5
+                ]
+              },
+              'properties': {
+                'value': 1,
+                'geohash': '7',
+                'center': [
+                  -22.5,
+                  -22.5
+                ],
+                'aggConfigResult': {
+                  '$parent': {
+                    '$parent': {
+                      '$parent': null,
+                      'key': 'IN',
+                      'value': 'IN',
+                      'aggConfig': {
+                        'id': '3',
+                        'type': 'terms',
+                        'schema': 'split',
+                        'params': {
+                          'field': 'geo.dest',
+                          'size': 2,
+                          'order': 'desc',
+                          'orderBy': '1',
+                          'row': false
+                        }
+                      },
+                      'type': 'bucket'
+                    },
+                    'key': '7',
+                    'value': '7',
+                    'aggConfig': {
+                      'id': '2',
+                      'type': 'geohash_grid',
+                      'schema': 'segment',
+                      'params': {
+                        'field': 'geo.coordinates',
+                        'precision': 1
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 1,
+                  'value': 1,
+                  'aggConfig': {
+                    'id': '1',
+                    'type': 'count',
+                    'schema': 'metric',
+                    'params': {}
+                  },
+                  'type': 'metric'
+                },
+                'rectangle': [
+                  [
+                    -45,
+                    -45
+                  ],
+                  [
+                    0,
+                    -45
+                  ],
+                  [
+                    0,
+                    0
+                  ],
+                  [
+                    -45,
+                    0
+                  ]
+                ]
+              }
+            }
+          ],
+          'properties': {
+            'min': 1,
+            'max': 32
+          }
+        }
+      }
+    ]
+};
diff --git a/src/fixtures/vislib/mock_data/geohash/_geo_json.js b/src/fixtures/vislib/mock_data/geohash/_geo_json.js
new file mode 100644
index 0000000000000..ac84284a1a78a
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/geohash/_geo_json.js
@@ -0,0 +1,1846 @@
+var _ = require('lodash');
+
+module.exports = {
+  'valueFormatter': _.identity,
+  'geoJson': {
+    'type': 'FeatureCollection',
+    'features': [
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            22.5,
+            22.5
+          ]
+        },
+        'properties': {
+          'value': 608,
+          'geohash': 's',
+          'center': [
+            22.5,
+            22.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 's',
+              'value': 's',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 608,
+            'value': 608,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              0,
+              0
+            ],
+            [
+              0,
+              45
+            ],
+            [
+              45,
+              45
+            ],
+            [
+              45,
+              0
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            112.5,
+            22.5
+          ]
+        },
+        'properties': {
+          'value': 522,
+          'geohash': 'w',
+          'center': [
+            112.5,
+            22.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 'w',
+              'value': 'w',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 522,
+            'value': 522,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              0,
+              90
+            ],
+            [
+              0,
+              135
+            ],
+            [
+              45,
+              135
+            ],
+            [
+              45,
+              90
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            -67.5,
+            -22.5
+          ]
+        },
+        'properties': {
+          'value': 517,
+          'geohash': '6',
+          'center': [
+            -67.5,
+            -22.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': '6',
+              'value': '6',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 517,
+            'value': 517,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              -45,
+              -90
+            ],
+            [
+              -45,
+              -45
+            ],
+            [
+              0,
+              -45
+            ],
+            [
+              0,
+              -90
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            -67.5,
+            22.5
+          ]
+        },
+        'properties': {
+          'value': 446,
+          'geohash': 'd',
+          'center': [
+            -67.5,
+            22.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 'd',
+              'value': 'd',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 446,
+            'value': 446,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              0,
+              -90
+            ],
+            [
+              0,
+              -45
+            ],
+            [
+              45,
+              -45
+            ],
+            [
+              45,
+              -90
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            22.5,
+            67.5
+          ]
+        },
+        'properties': {
+          'value': 426,
+          'geohash': 'u',
+          'center': [
+            22.5,
+            67.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 'u',
+              'value': 'u',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 426,
+            'value': 426,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              45,
+              0
+            ],
+            [
+              45,
+              45
+            ],
+            [
+              90,
+              45
+            ],
+            [
+              90,
+              0
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            67.5,
+            22.5
+          ]
+        },
+        'properties': {
+          'value': 413,
+          'geohash': 't',
+          'center': [
+            67.5,
+            22.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 't',
+              'value': 't',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 413,
+            'value': 413,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              0,
+              45
+            ],
+            [
+              0,
+              90
+            ],
+            [
+              45,
+              90
+            ],
+            [
+              45,
+              45
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            22.5,
+            -22.5
+          ]
+        },
+        'properties': {
+          'value': 362,
+          'geohash': 'k',
+          'center': [
+            22.5,
+            -22.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 'k',
+              'value': 'k',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 362,
+            'value': 362,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              -45,
+              0
+            ],
+            [
+              -45,
+              45
+            ],
+            [
+              0,
+              45
+            ],
+            [
+              0,
+              0
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            -112.5,
+            22.5
+          ]
+        },
+        'properties': {
+          'value': 352,
+          'geohash': '9',
+          'center': [
+            -112.5,
+            22.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': '9',
+              'value': '9',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 352,
+            'value': 352,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              0,
+              -135
+            ],
+            [
+              0,
+              -90
+            ],
+            [
+              45,
+              -90
+            ],
+            [
+              45,
+              -135
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            -22.5,
+            22.5
+          ]
+        },
+        'properties': {
+          'value': 216,
+          'geohash': 'e',
+          'center': [
+            -22.5,
+            22.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 'e',
+              'value': 'e',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 216,
+            'value': 216,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              0,
+              -45
+            ],
+            [
+              0,
+              0
+            ],
+            [
+              45,
+              0
+            ],
+            [
+              45,
+              -45
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            67.5,
+            67.5
+          ]
+        },
+        'properties': {
+          'value': 183,
+          'geohash': 'v',
+          'center': [
+            67.5,
+            67.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 'v',
+              'value': 'v',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 183,
+            'value': 183,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              45,
+              45
+            ],
+            [
+              45,
+              90
+            ],
+            [
+              90,
+              90
+            ],
+            [
+              90,
+              45
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            157.5,
+            -22.5
+          ]
+        },
+        'properties': {
+          'value': 158,
+          'geohash': 'r',
+          'center': [
+            157.5,
+            -22.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 'r',
+              'value': 'r',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 158,
+            'value': 158,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              -45,
+              135
+            ],
+            [
+              -45,
+              180
+            ],
+            [
+              0,
+              180
+            ],
+            [
+              0,
+              135
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            112.5,
+            67.5
+          ]
+        },
+        'properties': {
+          'value': 139,
+          'geohash': 'y',
+          'center': [
+            112.5,
+            67.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 'y',
+              'value': 'y',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 139,
+            'value': 139,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              45,
+              90
+            ],
+            [
+              45,
+              135
+            ],
+            [
+              90,
+              135
+            ],
+            [
+              90,
+              90
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            -112.5,
+            67.5
+          ]
+        },
+        'properties': {
+          'value': 110,
+          'geohash': 'c',
+          'center': [
+            -112.5,
+            67.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 'c',
+              'value': 'c',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 110,
+            'value': 110,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              45,
+              -135
+            ],
+            [
+              45,
+              -90
+            ],
+            [
+              90,
+              -90
+            ],
+            [
+              90,
+              -135
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            112.5,
+            -22.5
+          ]
+        },
+        'properties': {
+          'value': 101,
+          'geohash': 'q',
+          'center': [
+            112.5,
+            -22.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 'q',
+              'value': 'q',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 101,
+            'value': 101,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              -45,
+              90
+            ],
+            [
+              -45,
+              135
+            ],
+            [
+              0,
+              135
+            ],
+            [
+              0,
+              90
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            -22.5,
+            -22.5
+          ]
+        },
+        'properties': {
+          'value': 101,
+          'geohash': '7',
+          'center': [
+            -22.5,
+            -22.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': '7',
+              'value': '7',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 101,
+            'value': 101,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              -45,
+              -45
+            ],
+            [
+              -45,
+              0
+            ],
+            [
+              0,
+              0
+            ],
+            [
+              0,
+              -45
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            -67.5,
+            67.5
+          ]
+        },
+        'properties': {
+          'value': 92,
+          'geohash': 'f',
+          'center': [
+            -67.5,
+            67.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 'f',
+              'value': 'f',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 92,
+            'value': 92,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              45,
+              -90
+            ],
+            [
+              45,
+              -45
+            ],
+            [
+              90,
+              -45
+            ],
+            [
+              90,
+              -90
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            -157.5,
+            67.5
+          ]
+        },
+        'properties': {
+          'value': 75,
+          'geohash': 'b',
+          'center': [
+            -157.5,
+            67.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 'b',
+              'value': 'b',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 75,
+            'value': 75,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              45,
+              -180
+            ],
+            [
+              45,
+              -135
+            ],
+            [
+              90,
+              -135
+            ],
+            [
+              90,
+              -180
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            -22.5,
+            67.5
+          ]
+        },
+        'properties': {
+          'value': 64,
+          'geohash': 'g',
+          'center': [
+            -22.5,
+            67.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 'g',
+              'value': 'g',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 64,
+            'value': 64,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              45,
+              -45
+            ],
+            [
+              45,
+              0
+            ],
+            [
+              90,
+              0
+            ],
+            [
+              90,
+              -45
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            157.5,
+            67.5
+          ]
+        },
+        'properties': {
+          'value': 36,
+          'geohash': 'z',
+          'center': [
+            157.5,
+            67.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 'z',
+              'value': 'z',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 36,
+            'value': 36,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              45,
+              135
+            ],
+            [
+              45,
+              180
+            ],
+            [
+              90,
+              180
+            ],
+            [
+              90,
+              135
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            157.5,
+            22.5
+          ]
+        },
+        'properties': {
+          'value': 34,
+          'geohash': 'x',
+          'center': [
+            157.5,
+            22.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 'x',
+              'value': 'x',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 34,
+            'value': 34,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              0,
+              135
+            ],
+            [
+              0,
+              180
+            ],
+            [
+              45,
+              180
+            ],
+            [
+              45,
+              135
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            -67.5,
+            -67.5
+          ]
+        },
+        'properties': {
+          'value': 30,
+          'geohash': '4',
+          'center': [
+            -67.5,
+            -67.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': '4',
+              'value': '4',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 30,
+            'value': 30,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              -90,
+              -90
+            ],
+            [
+              -90,
+              -45
+            ],
+            [
+              -45,
+              -45
+            ],
+            [
+              -45,
+              -90
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            67.5,
+            -22.5
+          ]
+        },
+        'properties': {
+          'value': 16,
+          'geohash': 'm',
+          'center': [
+            67.5,
+            -22.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 'm',
+              'value': 'm',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 16,
+            'value': 16,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              -45,
+              45
+            ],
+            [
+              -45,
+              90
+            ],
+            [
+              0,
+              90
+            ],
+            [
+              0,
+              45
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            -22.5,
+            -67.5
+          ]
+        },
+        'properties': {
+          'value': 10,
+          'geohash': '5',
+          'center': [
+            -22.5,
+            -67.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': '5',
+              'value': '5',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 10,
+            'value': 10,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              -90,
+              -45
+            ],
+            [
+              -90,
+              0
+            ],
+            [
+              -45,
+              0
+            ],
+            [
+              -45,
+              -45
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            157.5,
+            -67.5
+          ]
+        },
+        'properties': {
+          'value': 6,
+          'geohash': 'p',
+          'center': [
+            157.5,
+            -67.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 'p',
+              'value': 'p',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 6,
+            'value': 6,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              -90,
+              135
+            ],
+            [
+              -90,
+              180
+            ],
+            [
+              -45,
+              180
+            ],
+            [
+              -45,
+              135
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            -157.5,
+            -22.5
+          ]
+        },
+        'properties': {
+          'value': 6,
+          'geohash': '2',
+          'center': [
+            -157.5,
+            -22.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': '2',
+              'value': '2',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 6,
+            'value': 6,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              -45,
+              -180
+            ],
+            [
+              -45,
+              -135
+            ],
+            [
+              0,
+              -135
+            ],
+            [
+              0,
+              -180
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            22.5,
+            -67.5
+          ]
+        },
+        'properties': {
+          'value': 4,
+          'geohash': 'h',
+          'center': [
+            22.5,
+            -67.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 'h',
+              'value': 'h',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 4,
+            'value': 4,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              -90,
+              0
+            ],
+            [
+              -90,
+              45
+            ],
+            [
+              -45,
+              45
+            ],
+            [
+              -45,
+              0
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            112.5,
+            -67.5
+          ]
+        },
+        'properties': {
+          'value': 2,
+          'geohash': 'n',
+          'center': [
+            112.5,
+            -67.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 'n',
+              'value': 'n',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 2,
+            'value': 2,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              -90,
+              90
+            ],
+            [
+              -90,
+              135
+            ],
+            [
+              -45,
+              135
+            ],
+            [
+              -45,
+              90
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            67.5,
+            -67.5
+          ]
+        },
+        'properties': {
+          'value': 2,
+          'geohash': 'j',
+          'center': [
+            67.5,
+            -67.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': 'j',
+              'value': 'j',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 2,
+            'value': 2,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              -90,
+              45
+            ],
+            [
+              -90,
+              90
+            ],
+            [
+              -45,
+              90
+            ],
+            [
+              -45,
+              45
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            -112.5,
+            -22.5
+          ]
+        },
+        'properties': {
+          'value': 1,
+          'geohash': '3',
+          'center': [
+            -112.5,
+            -22.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': '3',
+              'value': '3',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 1,
+            'value': 1,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              -45,
+              -135
+            ],
+            [
+              -45,
+              -90
+            ],
+            [
+              0,
+              -90
+            ],
+            [
+              0,
+              -135
+            ]
+          ]
+        }
+      },
+      {
+        'type': 'Feature',
+        'geometry': {
+          'type': 'Point',
+          'coordinates': [
+            -112.5,
+            -67.5
+          ]
+        },
+        'properties': {
+          'value': 1,
+          'geohash': '1',
+          'center': [
+            -112.5,
+            -67.5
+          ],
+          'aggConfigResult': {
+            '$parent': {
+              'key': '1',
+              'value': '1',
+              'aggConfig': {
+                'id': '2',
+                'type': 'geohash_grid',
+                'schema': 'segment',
+                'params': {
+                  'field': 'geo.coordinates',
+                  'precision': 1
+                }
+              },
+              'type': 'bucket'
+            },
+            'key': 1,
+            'value': 1,
+            'aggConfig': {
+              'id': '1',
+              'type': 'count',
+              'schema': 'metric',
+              'params': {}
+            },
+            'type': 'metric'
+          },
+          'rectangle': [
+            [
+              -90,
+              -135
+            ],
+            [
+              -90,
+              -90
+            ],
+            [
+              -45,
+              -90
+            ],
+            [
+              -45,
+              -135
+            ]
+          ]
+        }
+      }
+    ],
+    'properties': {
+      'min': 1,
+      'max': 608,
+      'zoom': 2,
+      'center': [5, 15]
+    }
+  },
+};
diff --git a/src/fixtures/vislib/mock_data/geohash/_rows.js b/src/fixtures/vislib/mock_data/geohash/_rows.js
new file mode 100644
index 0000000000000..e0e1e6e7560c1
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/geohash/_rows.js
@@ -0,0 +1,3667 @@
+var _ = require('lodash');
+
+module.exports = {
+  'rows': [
+    {
+      'title': 'Top 2 geo.dest: CN',
+      'valueFormatter': _.identity,
+      'geoJson': {
+        'type': 'FeatureCollection',
+        'features': [
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                22.5,
+                22.5
+              ]
+            },
+            'properties': {
+              'value': 39,
+              'geohash': 's',
+              'center': [
+                22.5,
+                22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 's',
+                  'value': 's',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 39,
+                'value': 39,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  0,
+                  0
+                ],
+                [
+                  45,
+                  0
+                ],
+                [
+                  45,
+                  45
+                ],
+                [
+                  0,
+                  45
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                112.5,
+                22.5
+              ]
+            },
+            'properties': {
+              'value': 31,
+              'geohash': 'w',
+              'center': [
+                112.5,
+                22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'w',
+                  'value': 'w',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 31,
+                'value': 31,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  90,
+                  0
+                ],
+                [
+                  135,
+                  0
+                ],
+                [
+                  135,
+                  45
+                ],
+                [
+                  90,
+                  45
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -67.5,
+                22.5
+              ]
+            },
+            'properties': {
+              'value': 30,
+              'geohash': 'd',
+              'center': [
+                -67.5,
+                22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'd',
+                  'value': 'd',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 30,
+                'value': 30,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -90,
+                  0
+                ],
+                [
+                  -45,
+                  0
+                ],
+                [
+                  -45,
+                  45
+                ],
+                [
+                  -90,
+                  45
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -112.5,
+                22.5
+              ]
+            },
+            'properties': {
+              'value': 25,
+              'geohash': '9',
+              'center': [
+                -112.5,
+                22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': '9',
+                  'value': '9',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 25,
+                'value': 25,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -135,
+                  0
+                ],
+                [
+                  -90,
+                  0
+                ],
+                [
+                  -90,
+                  45
+                ],
+                [
+                  -135,
+                  45
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                67.5,
+                22.5
+              ]
+            },
+            'properties': {
+              'value': 23,
+              'geohash': 't',
+              'center': [
+                67.5,
+                22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 't',
+                  'value': 't',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 23,
+                'value': 23,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  45,
+                  0
+                ],
+                [
+                  90,
+                  0
+                ],
+                [
+                  90,
+                  45
+                ],
+                [
+                  45,
+                  45
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                22.5,
+                -22.5
+              ]
+            },
+            'properties': {
+              'value': 23,
+              'geohash': 'k',
+              'center': [
+                22.5,
+                -22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'k',
+                  'value': 'k',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 23,
+                'value': 23,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  0,
+                  -45
+                ],
+                [
+                  45,
+                  -45
+                ],
+                [
+                  45,
+                  0
+                ],
+                [
+                  0,
+                  0
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -67.5,
+                -22.5
+              ]
+            },
+            'properties': {
+              'value': 22,
+              'geohash': '6',
+              'center': [
+                -67.5,
+                -22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': '6',
+                  'value': '6',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 22,
+                'value': 22,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -90,
+                  -45
+                ],
+                [
+                  -45,
+                  -45
+                ],
+                [
+                  -45,
+                  0
+                ],
+                [
+                  -90,
+                  0
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                22.5,
+                67.5
+              ]
+            },
+            'properties': {
+              'value': 20,
+              'geohash': 'u',
+              'center': [
+                22.5,
+                67.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'u',
+                  'value': 'u',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 20,
+                'value': 20,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  0,
+                  45
+                ],
+                [
+                  45,
+                  45
+                ],
+                [
+                  45,
+                  90
+                ],
+                [
+                  0,
+                  90
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                67.5,
+                67.5
+              ]
+            },
+            'properties': {
+              'value': 18,
+              'geohash': 'v',
+              'center': [
+                67.5,
+                67.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'v',
+                  'value': 'v',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 18,
+                'value': 18,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  45,
+                  45
+                ],
+                [
+                  90,
+                  45
+                ],
+                [
+                  90,
+                  90
+                ],
+                [
+                  45,
+                  90
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                157.5,
+                -22.5
+              ]
+            },
+            'properties': {
+              'value': 11,
+              'geohash': 'r',
+              'center': [
+                157.5,
+                -22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'r',
+                  'value': 'r',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 11,
+                'value': 11,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  135,
+                  -45
+                ],
+                [
+                  180,
+                  -45
+                ],
+                [
+                  180,
+                  0
+                ],
+                [
+                  135,
+                  0
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -22.5,
+                22.5
+              ]
+            },
+            'properties': {
+              'value': 11,
+              'geohash': 'e',
+              'center': [
+                -22.5,
+                22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'e',
+                  'value': 'e',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 11,
+                'value': 11,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -45,
+                  0
+                ],
+                [
+                  0,
+                  0
+                ],
+                [
+                  0,
+                  45
+                ],
+                [
+                  -45,
+                  45
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                112.5,
+                67.5
+              ]
+            },
+            'properties': {
+              'value': 10,
+              'geohash': 'y',
+              'center': [
+                112.5,
+                67.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'y',
+                  'value': 'y',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 10,
+                'value': 10,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  90,
+                  45
+                ],
+                [
+                  135,
+                  45
+                ],
+                [
+                  135,
+                  90
+                ],
+                [
+                  90,
+                  90
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -112.5,
+                67.5
+              ]
+            },
+            'properties': {
+              'value': 10,
+              'geohash': 'c',
+              'center': [
+                -112.5,
+                67.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'c',
+                  'value': 'c',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 10,
+                'value': 10,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -135,
+                  45
+                ],
+                [
+                  -90,
+                  45
+                ],
+                [
+                  -90,
+                  90
+                ],
+                [
+                  -135,
+                  90
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -67.5,
+                67.5
+              ]
+            },
+            'properties': {
+              'value': 8,
+              'geohash': 'f',
+              'center': [
+                -67.5,
+                67.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'f',
+                  'value': 'f',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 8,
+                'value': 8,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -90,
+                  45
+                ],
+                [
+                  -45,
+                  45
+                ],
+                [
+                  -45,
+                  90
+                ],
+                [
+                  -90,
+                  90
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -22.5,
+                -22.5
+              ]
+            },
+            'properties': {
+              'value': 8,
+              'geohash': '7',
+              'center': [
+                -22.5,
+                -22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': '7',
+                  'value': '7',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 8,
+                'value': 8,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -45,
+                  -45
+                ],
+                [
+                  0,
+                  -45
+                ],
+                [
+                  0,
+                  0
+                ],
+                [
+                  -45,
+                  0
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                112.5,
+                -22.5
+              ]
+            },
+            'properties': {
+              'value': 6,
+              'geohash': 'q',
+              'center': [
+                112.5,
+                -22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'q',
+                  'value': 'q',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 6,
+                'value': 6,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  90,
+                  -45
+                ],
+                [
+                  135,
+                  -45
+                ],
+                [
+                  135,
+                  0
+                ],
+                [
+                  90,
+                  0
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -22.5,
+                67.5
+              ]
+            },
+            'properties': {
+              'value': 6,
+              'geohash': 'g',
+              'center': [
+                -22.5,
+                67.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'g',
+                  'value': 'g',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 6,
+                'value': 6,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -45,
+                  45
+                ],
+                [
+                  0,
+                  45
+                ],
+                [
+                  0,
+                  90
+                ],
+                [
+                  -45,
+                  90
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                157.5,
+                22.5
+              ]
+            },
+            'properties': {
+              'value': 4,
+              'geohash': 'x',
+              'center': [
+                157.5,
+                22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'x',
+                  'value': 'x',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 4,
+                'value': 4,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  135,
+                  0
+                ],
+                [
+                  180,
+                  0
+                ],
+                [
+                  180,
+                  45
+                ],
+                [
+                  135,
+                  45
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -157.5,
+                67.5
+              ]
+            },
+            'properties': {
+              'value': 3,
+              'geohash': 'b',
+              'center': [
+                -157.5,
+                67.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'b',
+                  'value': 'b',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 3,
+                'value': 3,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -180,
+                  45
+                ],
+                [
+                  -135,
+                  45
+                ],
+                [
+                  -135,
+                  90
+                ],
+                [
+                  -180,
+                  90
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                157.5,
+                67.5
+              ]
+            },
+            'properties': {
+              'value': 2,
+              'geohash': 'z',
+              'center': [
+                157.5,
+                67.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'z',
+                  'value': 'z',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 2,
+                'value': 2,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  135,
+                  45
+                ],
+                [
+                  180,
+                  45
+                ],
+                [
+                  180,
+                  90
+                ],
+                [
+                  135,
+                  90
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -67.5,
+                -67.5
+              ]
+            },
+            'properties': {
+              'value': 2,
+              'geohash': '4',
+              'center': [
+                -67.5,
+                -67.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': '4',
+                  'value': '4',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 2,
+                'value': 2,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -90,
+                  -90
+                ],
+                [
+                  -45,
+                  -90
+                ],
+                [
+                  -45,
+                  -45
+                ],
+                [
+                  -90,
+                  -45
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -22.5,
+                -67.5
+              ]
+            },
+            'properties': {
+              'value': 1,
+              'geohash': '5',
+              'center': [
+                -22.5,
+                -67.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': '5',
+                  'value': '5',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 1,
+                'value': 1,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -45,
+                  -90
+                ],
+                [
+                  0,
+                  -90
+                ],
+                [
+                  0,
+                  -45
+                ],
+                [
+                  -45,
+                  -45
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -112.5,
+                -22.5
+              ]
+            },
+            'properties': {
+              'value': 1,
+              'geohash': '3',
+              'center': [
+                -112.5,
+                -22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'CN',
+                    'value': 'CN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': '3',
+                  'value': '3',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 1,
+                'value': 1,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -135,
+                  -45
+                ],
+                [
+                  -90,
+                  -45
+                ],
+                [
+                  -90,
+                  0
+                ],
+                [
+                  -135,
+                  0
+                ]
+              ]
+            }
+          }
+        ],
+        'properties': {
+          'min': 1,
+          'max': 39
+        }
+      }
+    },
+    {
+      'label': 'Top 2 geo.dest: IN',
+      'valueFormatter': _.identity,
+      'geoJson': {
+        'type': 'FeatureCollection',
+        'features': [
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -67.5,
+                -22.5
+              ]
+            },
+            'properties': {
+              'value': 31,
+              'geohash': '6',
+              'center': [
+                -67.5,
+                -22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': '6',
+                  'value': '6',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 31,
+                'value': 31,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -90,
+                  -45
+                ],
+                [
+                  -45,
+                  -45
+                ],
+                [
+                  -45,
+                  0
+                ],
+                [
+                  -90,
+                  0
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                22.5,
+                22.5
+              ]
+            },
+            'properties': {
+              'value': 30,
+              'geohash': 's',
+              'center': [
+                22.5,
+                22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 's',
+                  'value': 's',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 30,
+                'value': 30,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  0,
+                  0
+                ],
+                [
+                  45,
+                  0
+                ],
+                [
+                  45,
+                  45
+                ],
+                [
+                  0,
+                  45
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                112.5,
+                22.5
+              ]
+            },
+            'properties': {
+              'value': 29,
+              'geohash': 'w',
+              'center': [
+                112.5,
+                22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'w',
+                  'value': 'w',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 29,
+                'value': 29,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  90,
+                  0
+                ],
+                [
+                  135,
+                  0
+                ],
+                [
+                  135,
+                  45
+                ],
+                [
+                  90,
+                  45
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -67.5,
+                22.5
+              ]
+            },
+            'properties': {
+              'value': 28,
+              'geohash': 'd',
+              'center': [
+                -67.5,
+                22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'd',
+                  'value': 'd',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 28,
+                'value': 28,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -90,
+                  0
+                ],
+                [
+                  -45,
+                  0
+                ],
+                [
+                  -45,
+                  45
+                ],
+                [
+                  -90,
+                  45
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                67.5,
+                22.5
+              ]
+            },
+            'properties': {
+              'value': 25,
+              'geohash': 't',
+              'center': [
+                67.5,
+                22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 't',
+                  'value': 't',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 25,
+                'value': 25,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  45,
+                  0
+                ],
+                [
+                  90,
+                  0
+                ],
+                [
+                  90,
+                  45
+                ],
+                [
+                  45,
+                  45
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                22.5,
+                -22.5
+              ]
+            },
+            'properties': {
+              'value': 24,
+              'geohash': 'k',
+              'center': [
+                22.5,
+                -22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'k',
+                  'value': 'k',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 24,
+                'value': 24,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  0,
+                  -45
+                ],
+                [
+                  45,
+                  -45
+                ],
+                [
+                  45,
+                  0
+                ],
+                [
+                  0,
+                  0
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                22.5,
+                67.5
+              ]
+            },
+            'properties': {
+              'value': 20,
+              'geohash': 'u',
+              'center': [
+                22.5,
+                67.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'u',
+                  'value': 'u',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 20,
+                'value': 20,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  0,
+                  45
+                ],
+                [
+                  45,
+                  45
+                ],
+                [
+                  45,
+                  90
+                ],
+                [
+                  0,
+                  90
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -112.5,
+                22.5
+              ]
+            },
+            'properties': {
+              'value': 18,
+              'geohash': '9',
+              'center': [
+                -112.5,
+                22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': '9',
+                  'value': '9',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 18,
+                'value': 18,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -135,
+                  0
+                ],
+                [
+                  -90,
+                  0
+                ],
+                [
+                  -90,
+                  45
+                ],
+                [
+                  -135,
+                  45
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                67.5,
+                67.5
+              ]
+            },
+            'properties': {
+              'value': 14,
+              'geohash': 'v',
+              'center': [
+                67.5,
+                67.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'v',
+                  'value': 'v',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 14,
+                'value': 14,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  45,
+                  45
+                ],
+                [
+                  90,
+                  45
+                ],
+                [
+                  90,
+                  90
+                ],
+                [
+                  45,
+                  90
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -22.5,
+                22.5
+              ]
+            },
+            'properties': {
+              'value': 11,
+              'geohash': 'e',
+              'center': [
+                -22.5,
+                22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'e',
+                  'value': 'e',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 11,
+                'value': 11,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -45,
+                  0
+                ],
+                [
+                  0,
+                  0
+                ],
+                [
+                  0,
+                  45
+                ],
+                [
+                  -45,
+                  45
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                157.5,
+                -22.5
+              ]
+            },
+            'properties': {
+              'value': 9,
+              'geohash': 'r',
+              'center': [
+                157.5,
+                -22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'r',
+                  'value': 'r',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 9,
+                'value': 9,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  135,
+                  -45
+                ],
+                [
+                  180,
+                  -45
+                ],
+                [
+                  180,
+                  0
+                ],
+                [
+                  135,
+                  0
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                112.5,
+                67.5
+              ]
+            },
+            'properties': {
+              'value': 6,
+              'geohash': 'y',
+              'center': [
+                112.5,
+                67.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'y',
+                  'value': 'y',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 6,
+                'value': 6,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  90,
+                  45
+                ],
+                [
+                  135,
+                  45
+                ],
+                [
+                  135,
+                  90
+                ],
+                [
+                  90,
+                  90
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -67.5,
+                67.5
+              ]
+            },
+            'properties': {
+              'value': 6,
+              'geohash': 'f',
+              'center': [
+                -67.5,
+                67.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'f',
+                  'value': 'f',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 6,
+                'value': 6,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -90,
+                  45
+                ],
+                [
+                  -45,
+                  45
+                ],
+                [
+                  -45,
+                  90
+                ],
+                [
+                  -90,
+                  90
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -22.5,
+                67.5
+              ]
+            },
+            'properties': {
+              'value': 5,
+              'geohash': 'g',
+              'center': [
+                -22.5,
+                67.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'g',
+                  'value': 'g',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 5,
+                'value': 5,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -45,
+                  45
+                ],
+                [
+                  0,
+                  45
+                ],
+                [
+                  0,
+                  90
+                ],
+                [
+                  -45,
+                  90
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -112.5,
+                67.5
+              ]
+            },
+            'properties': {
+              'value': 5,
+              'geohash': 'c',
+              'center': [
+                -112.5,
+                67.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'c',
+                  'value': 'c',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 5,
+                'value': 5,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -135,
+                  45
+                ],
+                [
+                  -90,
+                  45
+                ],
+                [
+                  -90,
+                  90
+                ],
+                [
+                  -135,
+                  90
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -157.5,
+                67.5
+              ]
+            },
+            'properties': {
+              'value': 4,
+              'geohash': 'b',
+              'center': [
+                -157.5,
+                67.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'b',
+                  'value': 'b',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 4,
+                'value': 4,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -180,
+                  45
+                ],
+                [
+                  -135,
+                  45
+                ],
+                [
+                  -135,
+                  90
+                ],
+                [
+                  -180,
+                  90
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                112.5,
+                -22.5
+              ]
+            },
+            'properties': {
+              'value': 3,
+              'geohash': 'q',
+              'center': [
+                112.5,
+                -22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'q',
+                  'value': 'q',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 3,
+                'value': 3,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  90,
+                  -45
+                ],
+                [
+                  135,
+                  -45
+                ],
+                [
+                  135,
+                  0
+                ],
+                [
+                  90,
+                  0
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -67.5,
+                -67.5
+              ]
+            },
+            'properties': {
+              'value': 2,
+              'geohash': '4',
+              'center': [
+                -67.5,
+                -67.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': '4',
+                  'value': '4',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 2,
+                'value': 2,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -90,
+                  -90
+                ],
+                [
+                  -45,
+                  -90
+                ],
+                [
+                  -45,
+                  -45
+                ],
+                [
+                  -90,
+                  -45
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                157.5,
+                67.5
+              ]
+            },
+            'properties': {
+              'value': 1,
+              'geohash': 'z',
+              'center': [
+                157.5,
+                67.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'z',
+                  'value': 'z',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 1,
+                'value': 1,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  135,
+                  45
+                ],
+                [
+                  180,
+                  45
+                ],
+                [
+                  180,
+                  90
+                ],
+                [
+                  135,
+                  90
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                157.5,
+                22.5
+              ]
+            },
+            'properties': {
+              'value': 1,
+              'geohash': 'x',
+              'center': [
+                157.5,
+                22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'x',
+                  'value': 'x',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 1,
+                'value': 1,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  135,
+                  0
+                ],
+                [
+                  180,
+                  0
+                ],
+                [
+                  180,
+                  45
+                ],
+                [
+                  135,
+                  45
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                157.5,
+                -67.5
+              ]
+            },
+            'properties': {
+              'value': 1,
+              'geohash': 'p',
+              'center': [
+                157.5,
+                -67.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'p',
+                  'value': 'p',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 1,
+                'value': 1,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  135,
+                  -90
+                ],
+                [
+                  180,
+                  -90
+                ],
+                [
+                  180,
+                  -45
+                ],
+                [
+                  135,
+                  -45
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                67.5,
+                -22.5
+              ]
+            },
+            'properties': {
+              'value': 1,
+              'geohash': 'm',
+              'center': [
+                67.5,
+                -22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': 'm',
+                  'value': 'm',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 1,
+                'value': 1,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  45,
+                  -45
+                ],
+                [
+                  90,
+                  -45
+                ],
+                [
+                  90,
+                  0
+                ],
+                [
+                  45,
+                  0
+                ]
+              ]
+            }
+          },
+          {
+            'type': 'Feature',
+            'geometry': {
+              'type': 'Point',
+              'coordinates': [
+                -22.5,
+                -22.5
+              ]
+            },
+            'properties': {
+              'value': 1,
+              'geohash': '7',
+              'center': [
+                -22.5,
+                -22.5
+              ],
+              'aggConfigResult': {
+                '$parent': {
+                  '$parent': {
+                    '$parent': null,
+                    'key': 'IN',
+                    'value': 'IN',
+                    'aggConfig': {
+                      'id': '3',
+                      'type': 'terms',
+                      'schema': 'split',
+                      'params': {
+                        'field': 'geo.dest',
+                        'size': 2,
+                        'order': 'desc',
+                        'orderBy': '1',
+                        'row': true
+                      }
+                    },
+                    'type': 'bucket'
+                  },
+                  'key': '7',
+                  'value': '7',
+                  'aggConfig': {
+                    'id': '2',
+                    'type': 'geohash_grid',
+                    'schema': 'segment',
+                    'params': {
+                      'field': 'geo.coordinates',
+                      'precision': 1
+                    }
+                  },
+                  'type': 'bucket'
+                },
+                'key': 1,
+                'value': 1,
+                'aggConfig': {
+                  'id': '1',
+                  'type': 'count',
+                  'schema': 'metric',
+                  'params': {}
+                },
+                'type': 'metric'
+              },
+              'rectangle': [
+                [
+                  -45,
+                  -45
+                ],
+                [
+                  0,
+                  -45
+                ],
+                [
+                  0,
+                  0
+                ],
+                [
+                  -45,
+                  0
+                ]
+              ]
+            }
+          }
+        ],
+        'properties': {
+          'min': 1,
+          'max': 31
+        }
+      }
+    }
+  ],
+  'hits': 1639
+};
diff --git a/src/fixtures/vislib/mock_data/histogram/_columns.js b/src/fixtures/vislib/mock_data/histogram/_columns.js
new file mode 100644
index 0000000000000..aa022fefa2a05
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/histogram/_columns.js
@@ -0,0 +1,346 @@
+var _ = require('lodash');
+
+module.exports = {
+  'columns': [
+    {
+      'label': '404: response',
+      'xAxisLabel': 'machine.ram',
+      'ordered': {
+        'interval': 100
+      },
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 2147483600,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 3221225400,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 4294967200,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 5368709100,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 6442450900,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 7516192700,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 8589934500,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 10737418200,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 11811160000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 12884901800,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 13958643700,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 15032385500,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 16106127300,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 18253611000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 19327352800,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 20401094600,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 21474836400,
+              'y': 0,
+              'y0': 0
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    },
+    {
+      'label': '200: response',
+      'xAxisLabel': 'machine.ram',
+      'ordered': {
+        'interval': 100
+      },
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 2147483600,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 3221225400,
+              'y': 2,
+              'y0': 0
+            },
+            {
+              'x': 4294967200,
+              'y': 3,
+              'y0': 0
+            },
+            {
+              'x': 5368709100,
+              'y': 3,
+              'y0': 0
+            },
+            {
+              'x': 6442450900,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 7516192700,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 8589934500,
+              'y': 4,
+              'y0': 0
+            },
+            {
+              'x': 10737418200,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 11811160000,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 12884901800,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 13958643700,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 15032385500,
+              'y': 2,
+              'y0': 0
+            },
+            {
+              'x': 16106127300,
+              'y': 3,
+              'y0': 0
+            },
+            {
+              'x': 18253611000,
+              'y': 4,
+              'y0': 0
+            },
+            {
+              'x': 19327352800,
+              'y': 5,
+              'y0': 0
+            },
+            {
+              'x': 20401094600,
+              'y': 2,
+              'y0': 0
+            },
+            {
+              'x': 21474836400,
+              'y': 2,
+              'y0': 0
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    },
+    {
+      'label': '503: response',
+      'xAxisLabel': 'machine.ram',
+      'ordered': {
+        'interval': 100
+      },
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 2147483600,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 3221225400,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 4294967200,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 5368709100,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 6442450900,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 7516192700,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 8589934500,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 10737418200,
+              'y': 1,
+              'y0': 0
+            },
+            {
+              'x': 11811160000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 12884901800,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 13958643700,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 15032385500,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 16106127300,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 18253611000,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 19327352800,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 20401094600,
+              'y': 0,
+              'y0': 0
+            },
+            {
+              'x': 21474836400,
+              'y': 0,
+              'y0': 0
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    }
+  ],
+  'hits': 40
+};
diff --git a/src/fixtures/vislib/mock_data/histogram/_rows.js b/src/fixtures/vislib/mock_data/histogram/_rows.js
new file mode 100644
index 0000000000000..bf15c31b9ceb5
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/histogram/_rows.js
@@ -0,0 +1,187 @@
+var _ = require('lodash');
+
+module.exports = {
+  'rows': [
+    {
+      'label': '404: response',
+      'xAxisLabel': 'machine.ram',
+      'ordered': {
+        'interval': 100
+      },
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 2147483600,
+              'y': 1
+            },
+            {
+              'x': 10737418200,
+              'y': 1
+            },
+            {
+              'x': 15032385500,
+              'y': 2
+            },
+            {
+              'x': 19327352800,
+              'y': 1
+            },
+            {
+              'x': 32212254700,
+              'y': 1
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    },
+    {
+      'label': '200: response',
+      'xAxisLabel': 'machine.ram',
+      'ordered': {
+        'interval': 100
+      },
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 3221225400,
+              'y': 4
+            },
+            {
+              'x': 4294967200,
+              'y': 3
+            },
+            {
+              'x': 5368709100,
+              'y': 3
+            },
+            {
+              'x': 6442450900,
+              'y': 2
+            },
+            {
+              'x': 7516192700,
+              'y': 2
+            },
+            {
+              'x': 8589934500,
+              'y': 2
+            },
+            {
+              'x': 9663676400,
+              'y': 3
+            },
+            {
+              'x': 11811160000,
+              'y': 3
+            },
+            {
+              'x': 12884901800,
+              'y': 2
+            },
+            {
+              'x': 13958643700,
+              'y': 1
+            },
+            {
+              'x': 15032385500,
+              'y': 2
+            },
+            {
+              'x': 16106127300,
+              'y': 3
+            },
+            {
+              'x': 17179869100,
+              'y': 1
+            },
+            {
+              'x': 18253611000,
+              'y': 4
+            },
+            {
+              'x': 19327352800,
+              'y': 1
+            },
+            {
+              'x': 20401094600,
+              'y': 1
+            },
+            {
+              'x': 21474836400,
+              'y': 4
+            },
+            {
+              'x': 32212254700,
+              'y': 3
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    },
+    {
+      'label': '503: response',
+      'xAxisLabel': 'machine.ram',
+      'ordered': {
+        'interval': 100
+      },
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 10737418200,
+              'y': 1
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    }
+  ],
+  'hits': 51
+};
diff --git a/src/fixtures/vislib/mock_data/histogram/_series.js b/src/fixtures/vislib/mock_data/histogram/_series.js
new file mode 100644
index 0000000000000..6eb3d10b12b21
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/histogram/_series.js
@@ -0,0 +1,103 @@
+var _ = require('lodash');
+
+module.exports = {
+  'label': '',
+  'xAxisLabel': 'machine.ram',
+  'ordered': {
+    'interval': 100
+  },
+  'yAxisLabel': 'Count of documents',
+  'series': [
+    {
+      'values': [
+        {
+          'x': 3221225400,
+          'y': 5
+        },
+        {
+          'x': 4294967200,
+          'y': 2
+        },
+        {
+          'x': 5368709100,
+          'y': 5
+        },
+        {
+          'x': 6442450900,
+          'y': 4
+        },
+        {
+          'x': 7516192700,
+          'y': 1
+        },
+        {
+          'x': 9663676400,
+          'y': 9
+        },
+        {
+          'x': 10737418200,
+          'y': 5
+        },
+        {
+          'x': 11811160000,
+          'y': 5
+        },
+        {
+          'x': 12884901800,
+          'y': 2
+        },
+        {
+          'x': 13958643700,
+          'y': 3
+        },
+        {
+          'x': 15032385500,
+          'y': 3
+        },
+        {
+          'x': 16106127300,
+          'y': 3
+        },
+        {
+          'x': 17179869100,
+          'y': 1
+        },
+        {
+          'x': 18253611000,
+          'y': 6
+        },
+        {
+          'x': 19327352800,
+          'y': 3
+        },
+        {
+          'x': 20401094600,
+          'y': 3
+        },
+        {
+          'x': 21474836400,
+          'y': 7
+        },
+        {
+          'x': 32212254700,
+          'y': 4
+        }
+      ]
+    }
+  ],
+  'hits': 71,
+  'xAxisFormatter': function (val) {
+    if (_.isObject(val)) {
+      return JSON.stringify(val);
+    }
+    else if (val == null) {
+      return '';
+    }
+    else {
+      return '' + val;
+    }
+  },
+  'tooltipFormatter': function (d) {
+    return d;
+  }
+};
diff --git a/src/fixtures/vislib/mock_data/histogram/_slices.js b/src/fixtures/vislib/mock_data/histogram/_slices.js
new file mode 100644
index 0000000000000..0d280cad11bec
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/histogram/_slices.js
@@ -0,0 +1,309 @@
+var _ = require('lodash');
+
+module.exports = {
+  'label': '',
+  'slices': {
+    'children': [
+      {
+        'name': 0,
+        'size': 378611,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      },
+      {
+        'name': 1000,
+        'size': 205997,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      },
+      {
+        'name': 2000,
+        'size': 397189,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      },
+      {
+        'name': 3000,
+        'size': 397195,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      },
+      {
+        'name': 4000,
+        'size': 398429,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      },
+      {
+        'name': 5000,
+        'size': 397843,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      },
+      {
+        'name': 6000,
+        'size': 398140,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      },
+      {
+        'name': 7000,
+        'size': 398076,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      },
+      {
+        'name': 8000,
+        'size': 396746,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      },
+      {
+        'name': 9000,
+        'size': 397418,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      },
+      {
+        'name': 10000,
+        'size': 20222,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      },
+      {
+        'name': 11000,
+        'size': 20173,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      },
+      {
+        'name': 12000,
+        'size': 20026,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      },
+      {
+        'name': 13000,
+        'size': 19986,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      },
+      {
+        'name': 14000,
+        'size': 20091,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      },
+      {
+        'name': 15000,
+        'size': 20052,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      },
+      {
+        'name': 16000,
+        'size': 20349,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      },
+      {
+        'name': 17000,
+        'size': 20290,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      },
+      {
+        'name': 18000,
+        'size': 20399,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      },
+      {
+        'name': 19000,
+        'size': 20133,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      },
+      {
+        'name': 20000,
+        'size': 9,
+        'aggConfig': {
+          'type': 'histogram',
+          'schema': 'segment',
+          'fieldFormatter': _.constant(String),
+          'params': {
+            'interval': 1000,
+            'extended_bounds': {}
+          }
+        }
+      }
+    ]
+  },
+  'names': [
+    0,
+    1000,
+    2000,
+    3000,
+    4000,
+    5000,
+    6000,
+    7000,
+    8000,
+    9000,
+    10000,
+    11000,
+    12000,
+    13000,
+    14000,
+    15000,
+    16000,
+    17000,
+    18000,
+    19000,
+    20000
+  ],
+  'hits': 3967374,
+  'tooltipFormatter': function (event) {
+    return event.point;
+  }
+};
diff --git a/src/fixtures/vislib/mock_data/not_enough_data/_one_point.js b/src/fixtures/vislib/mock_data/not_enough_data/_one_point.js
new file mode 100644
index 0000000000000..c08ba4444e37a
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/not_enough_data/_one_point.js
@@ -0,0 +1,32 @@
+var _ = require('lodash');
+
+module.exports = {
+  'label': '',
+  'xAxisLabel': '',
+  'yAxisLabel': 'Count of documents',
+  'series': [
+    {
+      'values': [
+        {
+          'x': '_all',
+          'y': 274
+        }
+      ]
+    }
+  ],
+  'hits': 274,
+  'xAxisFormatter': function (val) {
+    if (_.isObject(val)) {
+      return JSON.stringify(val);
+    }
+    else if (val == null) {
+      return '';
+    }
+    else {
+      return '' + val;
+    }
+  },
+  'tooltipFormatter': function (d) {
+    return d;
+  }
+};
diff --git a/src/fixtures/vislib/mock_data/range/_columns.js b/src/fixtures/vislib/mock_data/range/_columns.js
new file mode 100644
index 0000000000000..1ac57060f323d
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/range/_columns.js
@@ -0,0 +1,59 @@
+var _ = require('lodash');
+
+module.exports = {
+  'columns': [
+    {
+      'label': 'apache: _type',
+      'xAxisLabel': 'bytes ranges',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': '0.0-1000.0',
+              'y': 13309
+            },
+            {
+              'x': '1000.0-2000.0',
+              'y': 7196
+            }
+          ]
+        }
+      ]
+    },
+    {
+      'label': 'nginx: _type',
+      'xAxisLabel': 'bytes ranges',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': '0.0-1000.0',
+              'y': 3278
+            },
+            {
+              'x': '1000.0-2000.0',
+              'y': 1804
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  'hits': 171499,
+  'xAxisFormatter': function (val) {
+    if (_.isObject(val)) {
+      return JSON.stringify(val);
+    }
+    else if (val == null) {
+      return '';
+    }
+    else {
+      return '' + val;
+    }
+  },
+  'tooltipFormatter': function (d) {
+    return d;
+  }
+};
diff --git a/src/fixtures/vislib/mock_data/range/_rows.js b/src/fixtures/vislib/mock_data/range/_rows.js
new file mode 100644
index 0000000000000..3868b0ff9b27b
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/range/_rows.js
@@ -0,0 +1,84 @@
+var _ = require('lodash');
+
+module.exports = {
+  'rows': [
+    {
+      'label': 'Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 Firefox/6.0a1: agent.raw',
+      'xAxisLabel': 'bytes ranges',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': '0.0-1000.0',
+              'y': 6422,
+              'y0': 0
+            },
+            {
+              'x': '1000.0-2000.0',
+              'y': 3446,
+              'y0': 0
+            }
+          ]
+        }
+      ]
+    },
+    {
+      'label': 'Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.50 Safari/534.24: agent.raw',
+      'xAxisLabel': 'bytes ranges',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': '0.0-1000.0',
+              'y': 5430,
+              'y0': 0
+            },
+            {
+              'x': '1000.0-2000.0',
+              'y': 3010,
+              'y0': 0
+            }
+          ]
+        }
+      ]
+    },
+    {
+      'label': 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322): agent.raw',
+      'xAxisLabel': 'bytes ranges',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': '0.0-1000.0',
+              'y': 4735,
+              'y0': 0
+            },
+            {
+              'x': '1000.0-2000.0',
+              'y': 2542,
+              'y0': 0
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  'hits': 171501,
+  'xAxisFormatter': function (val) {
+    if (_.isObject(val)) {
+      return JSON.stringify(val);
+    }
+    else if (val == null) {
+      return '';
+    }
+    else {
+      return '' + val;
+    }
+  },
+  'tooltipFormatter': function (d) {
+    return d;
+  }
+};
diff --git a/src/fixtures/vislib/mock_data/range/_series.js b/src/fixtures/vislib/mock_data/range/_series.js
new file mode 100644
index 0000000000000..4b5e8f6181695
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/range/_series.js
@@ -0,0 +1,36 @@
+var _ = require('lodash');
+
+module.exports = {
+  'label': '',
+  'xAxisLabel': 'bytes ranges',
+  'yAxisLabel': 'Count of documents',
+  'series': [
+    {
+      'values': [
+        {
+          'x': '0.0-1000.0',
+          'y': 16576
+        },
+        {
+          'x': '1000.0-2000.0',
+          'y': 9005
+        }
+      ]
+    }
+  ],
+  'hits': 171500,
+  'xAxisFormatter': function (val) {
+    if (_.isObject(val)) {
+      return JSON.stringify(val);
+    }
+    else if (val == null) {
+      return '';
+    }
+    else {
+      return '' + val;
+    }
+  },
+  'tooltipFormatter': function (d) {
+    return d;
+  }
+};
diff --git a/src/fixtures/vislib/mock_data/significant_terms/_columns.js b/src/fixtures/vislib/mock_data/significant_terms/_columns.js
new file mode 100644
index 0000000000000..3bdaa0dc3954a
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/significant_terms/_columns.js
@@ -0,0 +1,232 @@
+var _ = require('lodash');
+
+module.exports = {
+  'columns': [
+    {
+      'label': 'http: links',
+      'xAxisLabel': 'Top 5 unusual terms in @tags',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'success',
+              'y': 144000
+            },
+            {
+              'x': 'info',
+              'y': 128237
+            },
+            {
+              'x': 'security',
+              'y': 34518
+            },
+            {
+              'x': 'error',
+              'y': 10258
+            },
+            {
+              'x': 'warning',
+              'y': 17188
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    },
+    {
+      'label': 'info: links',
+      'xAxisLabel': 'Top 5 unusual terms in @tags',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'success',
+              'y': 108148
+            },
+            {
+              'x': 'info',
+              'y': 96242
+            },
+            {
+              'x': 'security',
+              'y': 25889
+            },
+            {
+              'x': 'error',
+              'y': 7673
+            },
+            {
+              'x': 'warning',
+              'y': 12842
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    },
+    {
+      'label': 'www.slate.com: links',
+      'xAxisLabel': 'Top 5 unusual terms in @tags',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'success',
+              'y': 98056
+            },
+            {
+              'x': 'info',
+              'y': 87344
+            },
+            {
+              'x': 'security',
+              'y': 23577
+            },
+            {
+              'x': 'error',
+              'y': 7004
+            },
+            {
+              'x': 'warning',
+              'y': 11759
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    },
+    {
+      'label': 'twitter.com: links',
+      'xAxisLabel': 'Top 5 unusual terms in @tags',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'success',
+              'y': 74154
+            },
+            {
+              'x': 'info',
+              'y': 65963
+            },
+            {
+              'x': 'security',
+              'y': 17832
+            },
+            {
+              'x': 'error',
+              'y': 5258
+            },
+            {
+              'x': 'warning',
+              'y': 8906
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    },
+    {
+      'label': 'www.www.slate.com: links',
+      'xAxisLabel': 'Top 5 unusual terms in @tags',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'success',
+              'y': 62591
+            },
+            {
+              'x': 'info',
+              'y': 55822
+            },
+            {
+              'x': 'security',
+              'y': 15100
+            },
+            {
+              'x': 'error',
+              'y': 4564
+            },
+            {
+              'x': 'warning',
+              'y': 7498
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    }
+  ],
+  'hits': 171446
+};
diff --git a/src/fixtures/vislib/mock_data/significant_terms/_rows.js b/src/fixtures/vislib/mock_data/significant_terms/_rows.js
new file mode 100644
index 0000000000000..b7d07251b5ca8
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/significant_terms/_rows.js
@@ -0,0 +1,232 @@
+var _ = require('lodash');
+
+module.exports = {
+  'rows': [
+    {
+      'label': 'h3: headings',
+      'xAxisLabel': 'Top 5 unusual terms in @tags',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'success',
+              'y': 144000
+            },
+            {
+              'x': 'info',
+              'y': 128235
+            },
+            {
+              'x': 'security',
+              'y': 34518
+            },
+            {
+              'x': 'error',
+              'y': 10257
+            },
+            {
+              'x': 'warning',
+              'y': 17188
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    },
+    {
+      'label': 'h5: headings',
+      'xAxisLabel': 'Top 5 unusual terms in @tags',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'success',
+              'y': 144000
+            },
+            {
+              'x': 'info',
+              'y': 128235
+            },
+            {
+              'x': 'security',
+              'y': 34518
+            },
+            {
+              'x': 'error',
+              'y': 10257
+            },
+            {
+              'x': 'warning',
+              'y': 17188
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    },
+    {
+      'label': 'http: headings',
+      'xAxisLabel': 'Top 5 unusual terms in @tags',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'success',
+              'y': 144000
+            },
+            {
+              'x': 'info',
+              'y': 128235
+            },
+            {
+              'x': 'security',
+              'y': 34518
+            },
+            {
+              'x': 'error',
+              'y': 10257
+            },
+            {
+              'x': 'warning',
+              'y': 17188
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    },
+    {
+      'label': 'success: headings',
+      'xAxisLabel': 'Top 5 unusual terms in @tags',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'success',
+              'y': 120689
+            },
+            {
+              'x': 'info',
+              'y': 107621
+            },
+            {
+              'x': 'security',
+              'y': 28916
+            },
+            {
+              'x': 'error',
+              'y': 8590
+            },
+            {
+              'x': 'warning',
+              'y': 14548
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    },
+    {
+      'label': 'www.slate.com: headings',
+      'xAxisLabel': 'Top 5 unusual terms in @tags',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'success',
+              'y': 62292
+            },
+            {
+              'x': 'info',
+              'y': 55646
+            },
+            {
+              'x': 'security',
+              'y': 14823
+            },
+            {
+              'x': 'error',
+              'y': 4441
+            },
+            {
+              'x': 'warning',
+              'y': 7539
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    }
+  ],
+  'hits': 171445
+};
diff --git a/src/fixtures/vislib/mock_data/significant_terms/_series.js b/src/fixtures/vislib/mock_data/significant_terms/_series.js
new file mode 100644
index 0000000000000..c4feebaef9d4d
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/significant_terms/_series.js
@@ -0,0 +1,48 @@
+var _ = require('lodash');
+
+module.exports = {
+  'label': '',
+  'xAxisLabel': 'Top 5 unusual terms in @tags',
+  'yAxisLabel': 'Count of documents',
+  'series': [
+    {
+      'values': [
+        {
+          'x': 'success',
+          'y': 143995
+        },
+        {
+          'x': 'info',
+          'y': 128233
+        },
+        {
+          'x': 'security',
+          'y': 34515
+        },
+        {
+          'x': 'error',
+          'y': 10256
+        },
+        {
+          'x': 'warning',
+          'y': 17188
+        }
+      ]
+    }
+  ],
+  'hits': 171439,
+  'xAxisFormatter': function (val) {
+    if (_.isObject(val)) {
+      return JSON.stringify(val);
+    }
+    else if (val == null) {
+      return '';
+    }
+    else {
+      return '' + val;
+    }
+  },
+  'tooltipFormatter': function (d) {
+    return d;
+  }
+};
diff --git a/src/fixtures/vislib/mock_data/stacked/_stacked.js b/src/fixtures/vislib/mock_data/stacked/_stacked.js
new file mode 100644
index 0000000000000..2df6f83a68307
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/stacked/_stacked.js
@@ -0,0 +1,1572 @@
+var moment = require('moment');
+
+module.exports = {
+  'label': '',
+  'xAxisLabel': '@timestamp per 30 sec',
+  'ordered': {
+    'date': true,
+    'interval': 30000,
+    'min': 1416850340336,
+    'max': 1416852140336
+  },
+  'yAxisLabel': 'Count of documents',
+  'series': [
+    {
+      'label': 'jpg',
+      'values': [
+        {
+          'x': 1416850320000,
+          'y': 110,
+          'y0': 0
+        },
+        {
+          'x': 1416850350000,
+          'y': 24,
+          'y0': 0
+        },
+        {
+          'x': 1416850380000,
+          'y': 34,
+          'y0': 0
+        },
+        {
+          'x': 1416850410000,
+          'y': 21,
+          'y0': 0
+        },
+        {
+          'x': 1416850440000,
+          'y': 32,
+          'y0': 0
+        },
+        {
+          'x': 1416850470000,
+          'y': 24,
+          'y0': 0
+        },
+        {
+          'x': 1416850500000,
+          'y': 16,
+          'y0': 0
+        },
+        {
+          'x': 1416850530000,
+          'y': 27,
+          'y0': 0
+        },
+        {
+          'x': 1416850560000,
+          'y': 24,
+          'y0': 0
+        },
+        {
+          'x': 1416850590000,
+          'y': 38,
+          'y0': 0
+        },
+        {
+          'x': 1416850620000,
+          'y': 33,
+          'y0': 0
+        },
+        {
+          'x': 1416850650000,
+          'y': 33,
+          'y0': 0
+        },
+        {
+          'x': 1416850680000,
+          'y': 31,
+          'y0': 0
+        },
+        {
+          'x': 1416850710000,
+          'y': 24,
+          'y0': 0
+        },
+        {
+          'x': 1416850740000,
+          'y': 24,
+          'y0': 0
+        },
+        {
+          'x': 1416850770000,
+          'y': 38,
+          'y0': 0
+        },
+        {
+          'x': 1416850800000,
+          'y': 34,
+          'y0': 0
+        },
+        {
+          'x': 1416850830000,
+          'y': 30,
+          'y0': 0
+        },
+        {
+          'x': 1416850860000,
+          'y': 38,
+          'y0': 0
+        },
+        {
+          'x': 1416850890000,
+          'y': 19,
+          'y0': 0
+        },
+        {
+          'x': 1416850920000,
+          'y': 23,
+          'y0': 0
+        },
+        {
+          'x': 1416850950000,
+          'y': 33,
+          'y0': 0
+        },
+        {
+          'x': 1416850980000,
+          'y': 28,
+          'y0': 0
+        },
+        {
+          'x': 1416851010000,
+          'y': 24,
+          'y0': 0
+        },
+        {
+          'x': 1416851040000,
+          'y': 22,
+          'y0': 0
+        },
+        {
+          'x': 1416851070000,
+          'y': 28,
+          'y0': 0
+        },
+        {
+          'x': 1416851100000,
+          'y': 27,
+          'y0': 0
+        },
+        {
+          'x': 1416851130000,
+          'y': 32,
+          'y0': 0
+        },
+        {
+          'x': 1416851160000,
+          'y': 32,
+          'y0': 0
+        },
+        {
+          'x': 1416851190000,
+          'y': 30,
+          'y0': 0
+        },
+        {
+          'x': 1416851220000,
+          'y': 32,
+          'y0': 0
+        },
+        {
+          'x': 1416851250000,
+          'y': 36,
+          'y0': 0
+        },
+        {
+          'x': 1416851280000,
+          'y': 32,
+          'y0': 0
+        },
+        {
+          'x': 1416851310000,
+          'y': 29,
+          'y0': 0
+        },
+        {
+          'x': 1416851340000,
+          'y': 22,
+          'y0': 0
+        },
+        {
+          'x': 1416851370000,
+          'y': 29,
+          'y0': 0
+        },
+        {
+          'x': 1416851400000,
+          'y': 33,
+          'y0': 0
+        },
+        {
+          'x': 1416851430000,
+          'y': 28,
+          'y0': 0
+        },
+        {
+          'x': 1416851460000,
+          'y': 39,
+          'y0': 0
+        },
+        {
+          'x': 1416851490000,
+          'y': 28,
+          'y0': 0
+        },
+        {
+          'x': 1416851520000,
+          'y': 28,
+          'y0': 0
+        },
+        {
+          'x': 1416851550000,
+          'y': 28,
+          'y0': 0
+        },
+        {
+          'x': 1416851580000,
+          'y': 30,
+          'y0': 0
+        },
+        {
+          'x': 1416851610000,
+          'y': 29,
+          'y0': 0
+        },
+        {
+          'x': 1416851640000,
+          'y': 30,
+          'y0': 0
+        },
+        {
+          'x': 1416851670000,
+          'y': 23,
+          'y0': 0
+        },
+        {
+          'x': 1416851700000,
+          'y': 23,
+          'y0': 0
+        },
+        {
+          'x': 1416851730000,
+          'y': 27,
+          'y0': 0
+        },
+        {
+          'x': 1416851760000,
+          'y': 21,
+          'y0': 0
+        },
+        {
+          'x': 1416851790000,
+          'y': 24,
+          'y0': 0
+        },
+        {
+          'x': 1416851820000,
+          'y': 26,
+          'y0': 0
+        },
+        {
+          'x': 1416851850000,
+          'y': 26,
+          'y0': 0
+        },
+        {
+          'x': 1416851880000,
+          'y': 21,
+          'y0': 0
+        },
+        {
+          'x': 1416851910000,
+          'y': 33,
+          'y0': 0
+        },
+        {
+          'x': 1416851940000,
+          'y': 23,
+          'y0': 0
+        },
+        {
+          'x': 1416851970000,
+          'y': 46,
+          'y0': 0
+        },
+        {
+          'x': 1416852000000,
+          'y': 27,
+          'y0': 0
+        },
+        {
+          'x': 1416852030000,
+          'y': 20,
+          'y0': 0
+        },
+        {
+          'x': 1416852060000,
+          'y': 34,
+          'y0': 0
+        },
+        {
+          'x': 1416852090000,
+          'y': 15,
+          'y0': 0
+        },
+        {
+          'x': 1416852120000,
+          'y': 18,
+          'y0': 0
+        }
+      ]
+    },
+    {
+      'label': 'css',
+      'values': [
+        {
+          'x': 1416850320000,
+          'y': 3,
+          'y0': 11
+        },
+        {
+          'x': 1416850350000,
+          'y': 13,
+          'y0': 24
+        },
+        {
+          'x': 1416850380000,
+          'y': 5,
+          'y0': 34
+        },
+        {
+          'x': 1416850410000,
+          'y': 12,
+          'y0': 21
+        },
+        {
+          'x': 1416850440000,
+          'y': 9,
+          'y0': 32
+        },
+        {
+          'x': 1416850470000,
+          'y': 12,
+          'y0': 24
+        },
+        {
+          'x': 1416850500000,
+          'y': 6,
+          'y0': 16
+        },
+        {
+          'x': 1416850530000,
+          'y': 6,
+          'y0': 27
+        },
+        {
+          'x': 1416850560000,
+          'y': 11,
+          'y0': 24
+        },
+        {
+          'x': 1416850590000,
+          'y': 11,
+          'y0': 38
+        },
+        {
+          'x': 1416850620000,
+          'y': 6,
+          'y0': 33
+        },
+        {
+          'x': 1416850650000,
+          'y': 8,
+          'y0': 33
+        },
+        {
+          'x': 1416850680000,
+          'y': 6,
+          'y0': 31
+        },
+        {
+          'x': 1416850710000,
+          'y': 4,
+          'y0': 24
+        },
+        {
+          'x': 1416850740000,
+          'y': 9,
+          'y0': 24
+        },
+        {
+          'x': 1416850770000,
+          'y': 3,
+          'y0': 38
+        },
+        {
+          'x': 1416850800000,
+          'y': 5,
+          'y0': 34
+        },
+        {
+          'x': 1416850830000,
+          'y': 6,
+          'y0': 30
+        },
+        {
+          'x': 1416850860000,
+          'y': 9,
+          'y0': 38
+        },
+        {
+          'x': 1416850890000,
+          'y': 5,
+          'y0': 19
+        },
+        {
+          'x': 1416850920000,
+          'y': 8,
+          'y0': 23
+        },
+        {
+          'x': 1416850950000,
+          'y': 9,
+          'y0': 33
+        },
+        {
+          'x': 1416850980000,
+          'y': 5,
+          'y0': 28
+        },
+        {
+          'x': 1416851010000,
+          'y': 6,
+          'y0': 24
+        },
+        {
+          'x': 1416851040000,
+          'y': 9,
+          'y0': 22
+        },
+        {
+          'x': 1416851070000,
+          'y': 9,
+          'y0': 28
+        },
+        {
+          'x': 1416851100000,
+          'y': 11,
+          'y0': 27
+        },
+        {
+          'x': 1416851130000,
+          'y': 5,
+          'y0': 32
+        },
+        {
+          'x': 1416851160000,
+          'y': 8,
+          'y0': 32
+        },
+        {
+          'x': 1416851190000,
+          'y': 6,
+          'y0': 30
+        },
+        {
+          'x': 1416851220000,
+          'y': 10,
+          'y0': 32
+        },
+        {
+          'x': 1416851250000,
+          'y': 5,
+          'y0': 36
+        },
+        {
+          'x': 1416851280000,
+          'y': 6,
+          'y0': 32
+        },
+        {
+          'x': 1416851310000,
+          'y': 4,
+          'y0': 29
+        },
+        {
+          'x': 1416851340000,
+          'y': 8,
+          'y0': 22
+        },
+        {
+          'x': 1416851370000,
+          'y': 3,
+          'y0': 29
+        },
+        {
+          'x': 1416851400000,
+          'y': 8,
+          'y0': 33
+        },
+        {
+          'x': 1416851430000,
+          'y': 10,
+          'y0': 28
+        },
+        {
+          'x': 1416851460000,
+          'y': 5,
+          'y0': 39
+        },
+        {
+          'x': 1416851490000,
+          'y': 7,
+          'y0': 28
+        },
+        {
+          'x': 1416851520000,
+          'y': 6,
+          'y0': 28
+        },
+        {
+          'x': 1416851550000,
+          'y': 4,
+          'y0': 28
+        },
+        {
+          'x': 1416851580000,
+          'y': 9,
+          'y0': 30
+        },
+        {
+          'x': 1416851610000,
+          'y': 3,
+          'y0': 29
+        },
+        {
+          'x': 1416851640000,
+          'y': 9,
+          'y0': 30
+        },
+        {
+          'x': 1416851670000,
+          'y': 6,
+          'y0': 23
+        },
+        {
+          'x': 1416851700000,
+          'y': 11,
+          'y0': 23
+        },
+        {
+          'x': 1416851730000,
+          'y': 4,
+          'y0': 27
+        },
+        {
+          'x': 1416851760000,
+          'y': 8,
+          'y0': 21
+        },
+        {
+          'x': 1416851790000,
+          'y': 5,
+          'y0': 24
+        },
+        {
+          'x': 1416851820000,
+          'y': 7,
+          'y0': 26
+        },
+        {
+          'x': 1416851850000,
+          'y': 7,
+          'y0': 26
+        },
+        {
+          'x': 1416851880000,
+          'y': 4,
+          'y0': 21
+        },
+        {
+          'x': 1416851910000,
+          'y': 8,
+          'y0': 33
+        },
+        {
+          'x': 1416851940000,
+          'y': 6,
+          'y0': 23
+        },
+        {
+          'x': 1416851970000,
+          'y': 6,
+          'y0': 46
+        },
+        {
+          'x': 1416852000000,
+          'y': 3,
+          'y0': 27
+        },
+        {
+          'x': 1416852030000,
+          'y': 6,
+          'y0': 20
+        },
+        {
+          'x': 1416852060000,
+          'y': 5,
+          'y0': 34
+        },
+        {
+          'x': 1416852090000,
+          'y': 5,
+          'y0': 15
+        },
+        {
+          'x': 1416852120000,
+          'y': 1,
+          'y0': 18
+        }
+      ]
+    },
+    {
+      'label': 'gif',
+      'values': [
+        {
+          'x': 1416850320000,
+          'y': 1,
+          'y0': 14
+        },
+        {
+          'x': 1416850350000,
+          'y': 2,
+          'y0': 37
+        },
+        {
+          'x': 1416850380000,
+          'y': 4,
+          'y0': 39
+        },
+        {
+          'x': 1416850410000,
+          'y': 2,
+          'y0': 33
+        },
+        {
+          'x': 1416850440000,
+          'y': 3,
+          'y0': 41
+        },
+        {
+          'x': 1416850470000,
+          'y': 1,
+          'y0': 36
+        },
+        {
+          'x': 1416850500000,
+          'y': 1,
+          'y0': 22
+        },
+        {
+          'x': 1416850530000,
+          'y': 1,
+          'y0': 33
+        },
+        {
+          'x': 1416850560000,
+          'y': 2,
+          'y0': 35
+        },
+        {
+          'x': 1416850590000,
+          'y': 5,
+          'y0': 49
+        },
+        {
+          'x': 1416850620000,
+          'y': 1,
+          'y0': 39
+        },
+        {
+          'x': 1416850650000,
+          'y': 1,
+          'y0': 41
+        },
+        {
+          'x': 1416850680000,
+          'y': 4,
+          'y0': 37
+        },
+        {
+          'x': 1416850710000,
+          'y': 1,
+          'y0': 28
+        },
+        {
+          'x': 1416850740000,
+          'y': 3,
+          'y0': 33
+        },
+        {
+          'x': 1416850770000,
+          'y': 2,
+          'y0': 41
+        },
+        {
+          'x': 1416850800000,
+          'y': 2,
+          'y0': 39
+        },
+        {
+          'x': 1416850830000,
+          'y': 5,
+          'y0': 36
+        },
+        {
+          'x': 1416850860000,
+          'y': 3,
+          'y0': 47
+        },
+        {
+          'x': 1416850890000,
+          'y': 1,
+          'y0': 24
+        },
+        {
+          'x': 1416850920000,
+          'y': 3,
+          'y0': 31
+        },
+        {
+          'x': 1416850950000,
+          'y': 4,
+          'y0': 42
+        },
+        {
+          'x': 1416850980000,
+          'y': 3,
+          'y0': 33
+        },
+        {
+          'x': 1416851010000,
+          'y': 5,
+          'y0': 30
+        },
+        {
+          'x': 1416851040000,
+          'y': 2,
+          'y0': 31
+        },
+        {
+          'x': 1416851070000,
+          'y': 3,
+          'y0': 37
+        },
+        {
+          'x': 1416851100000,
+          'y': 5,
+          'y0': 38
+        },
+        {
+          'x': 1416851130000,
+          'y': 3,
+          'y0': 37
+        },
+        {
+          'x': 1416851160000,
+          'y': 4,
+          'y0': 40
+        },
+        {
+          'x': 1416851190000,
+          'y': 9,
+          'y0': 36
+        },
+        {
+          'x': 1416851220000,
+          'y': 7,
+          'y0': 42
+        },
+        {
+          'x': 1416851250000,
+          'y': 2,
+          'y0': 41
+        },
+        {
+          'x': 1416851280000,
+          'y': 1,
+          'y0': 38
+        },
+        {
+          'x': 1416851310000,
+          'y': 2,
+          'y0': 33
+        },
+        {
+          'x': 1416851340000,
+          'y': 5,
+          'y0': 30
+        },
+        {
+          'x': 1416851370000,
+          'y': 3,
+          'y0': 32
+        },
+        {
+          'x': 1416851400000,
+          'y': 5,
+          'y0': 41
+        },
+        {
+          'x': 1416851430000,
+          'y': 4,
+          'y0': 38
+        },
+        {
+          'x': 1416851460000,
+          'y': 5,
+          'y0': 44
+        },
+        {
+          'x': 1416851490000,
+          'y': 2,
+          'y0': 35
+        },
+        {
+          'x': 1416851520000,
+          'y': 2,
+          'y0': 34
+        },
+        {
+          'x': 1416851550000,
+          'y': 4,
+          'y0': 32
+        },
+        {
+          'x': 1416851580000,
+          'y': 3,
+          'y0': 39
+        },
+        {
+          'x': 1416851610000,
+          'y': 4,
+          'y0': 32
+        },
+        {
+          'x': 1416851640000,
+          'y': 0,
+          'y0': 39
+        },
+        {
+          'x': 1416851670000,
+          'y': 2,
+          'y0': 29
+        },
+        {
+          'x': 1416851700000,
+          'y': 1,
+          'y0': 34
+        },
+        {
+          'x': 1416851730000,
+          'y': 3,
+          'y0': 31
+        },
+        {
+          'x': 1416851760000,
+          'y': 0,
+          'y0': 29
+        },
+        {
+          'x': 1416851790000,
+          'y': 4,
+          'y0': 29
+        },
+        {
+          'x': 1416851820000,
+          'y': 3,
+          'y0': 33
+        },
+        {
+          'x': 1416851850000,
+          'y': 3,
+          'y0': 33
+        },
+        {
+          'x': 1416851880000,
+          'y': 0,
+          'y0': 25
+        },
+        {
+          'x': 1416851910000,
+          'y': 0,
+          'y0': 41
+        },
+        {
+          'x': 1416851940000,
+          'y': 3,
+          'y0': 29
+        },
+        {
+          'x': 1416851970000,
+          'y': 3,
+          'y0': 52
+        },
+        {
+          'x': 1416852000000,
+          'y': 1,
+          'y0': 30
+        },
+        {
+          'x': 1416852030000,
+          'y': 5,
+          'y0': 26
+        },
+        {
+          'x': 1416852060000,
+          'y': 3,
+          'y0': 39
+        },
+        {
+          'x': 1416852090000,
+          'y': 1,
+          'y0': 20
+        },
+        {
+          'x': 1416852120000,
+          'y': 2,
+          'y0': 19
+        }
+      ]
+    },
+    {
+      'label': 'png',
+      'values': [
+        {
+          'x': 1416850320000,
+          'y': 1,
+          'y0': 15
+        },
+        {
+          'x': 1416850350000,
+          'y': 6,
+          'y0': 39
+        },
+        {
+          'x': 1416850380000,
+          'y': 6,
+          'y0': 43
+        },
+        {
+          'x': 1416850410000,
+          'y': 5,
+          'y0': 35
+        },
+        {
+          'x': 1416850440000,
+          'y': 3,
+          'y0': 44
+        },
+        {
+          'x': 1416850470000,
+          'y': 5,
+          'y0': 37
+        },
+        {
+          'x': 1416850500000,
+          'y': 6,
+          'y0': 23
+        },
+        {
+          'x': 1416850530000,
+          'y': 1,
+          'y0': 34
+        },
+        {
+          'x': 1416850560000,
+          'y': 3,
+          'y0': 37
+        },
+        {
+          'x': 1416850590000,
+          'y': 2,
+          'y0': 54
+        },
+        {
+          'x': 1416850620000,
+          'y': 1,
+          'y0': 40
+        },
+        {
+          'x': 1416850650000,
+          'y': 1,
+          'y0': 42
+        },
+        {
+          'x': 1416850680000,
+          'y': 2,
+          'y0': 41
+        },
+        {
+          'x': 1416850710000,
+          'y': 5,
+          'y0': 29
+        },
+        {
+          'x': 1416850740000,
+          'y': 7,
+          'y0': 36
+        },
+        {
+          'x': 1416850770000,
+          'y': 2,
+          'y0': 43
+        },
+        {
+          'x': 1416850800000,
+          'y': 3,
+          'y0': 41
+        },
+        {
+          'x': 1416850830000,
+          'y': 6,
+          'y0': 41
+        },
+        {
+          'x': 1416850860000,
+          'y': 2,
+          'y0': 50
+        },
+        {
+          'x': 1416850890000,
+          'y': 4,
+          'y0': 25
+        },
+        {
+          'x': 1416850920000,
+          'y': 2,
+          'y0': 34
+        },
+        {
+          'x': 1416850950000,
+          'y': 3,
+          'y0': 46
+        },
+        {
+          'x': 1416850980000,
+          'y': 8,
+          'y0': 36
+        },
+        {
+          'x': 1416851010000,
+          'y': 4,
+          'y0': 35
+        },
+        {
+          'x': 1416851040000,
+          'y': 4,
+          'y0': 33
+        },
+        {
+          'x': 1416851070000,
+          'y': 1,
+          'y0': 40
+        },
+        {
+          'x': 1416851100000,
+          'y': 2,
+          'y0': 43
+        },
+        {
+          'x': 1416851130000,
+          'y': 4,
+          'y0': 40
+        },
+        {
+          'x': 1416851160000,
+          'y': 3,
+          'y0': 44
+        },
+        {
+          'x': 1416851190000,
+          'y': 4,
+          'y0': 45
+        },
+        {
+          'x': 1416851220000,
+          'y': 2,
+          'y0': 49
+        },
+        {
+          'x': 1416851250000,
+          'y': 4,
+          'y0': 43
+        },
+        {
+          'x': 1416851280000,
+          'y': 8,
+          'y0': 39
+        },
+        {
+          'x': 1416851310000,
+          'y': 4,
+          'y0': 35
+        },
+        {
+          'x': 1416851340000,
+          'y': 4,
+          'y0': 35
+        },
+        {
+          'x': 1416851370000,
+          'y': 7,
+          'y0': 35
+        },
+        {
+          'x': 1416851400000,
+          'y': 2,
+          'y0': 46
+        },
+        {
+          'x': 1416851430000,
+          'y': 3,
+          'y0': 42
+        },
+        {
+          'x': 1416851460000,
+          'y': 3,
+          'y0': 49
+        },
+        {
+          'x': 1416851490000,
+          'y': 3,
+          'y0': 37
+        },
+        {
+          'x': 1416851520000,
+          'y': 4,
+          'y0': 36
+        },
+        {
+          'x': 1416851550000,
+          'y': 3,
+          'y0': 36
+        },
+        {
+          'x': 1416851580000,
+          'y': 4,
+          'y0': 42
+        },
+        {
+          'x': 1416851610000,
+          'y': 5,
+          'y0': 36
+        },
+        {
+          'x': 1416851640000,
+          'y': 3,
+          'y0': 39
+        },
+        {
+          'x': 1416851670000,
+          'y': 3,
+          'y0': 31
+        },
+        {
+          'x': 1416851700000,
+          'y': 2,
+          'y0': 35
+        },
+        {
+          'x': 1416851730000,
+          'y': 5,
+          'y0': 34
+        },
+        {
+          'x': 1416851760000,
+          'y': 4,
+          'y0': 29
+        },
+        {
+          'x': 1416851790000,
+          'y': 5,
+          'y0': 33
+        },
+        {
+          'x': 1416851820000,
+          'y': 1,
+          'y0': 36
+        },
+        {
+          'x': 1416851850000,
+          'y': 3,
+          'y0': 36
+        },
+        {
+          'x': 1416851880000,
+          'y': 6,
+          'y0': 25
+        },
+        {
+          'x': 1416851910000,
+          'y': 4,
+          'y0': 41
+        },
+        {
+          'x': 1416851940000,
+          'y': 7,
+          'y0': 32
+        },
+        {
+          'x': 1416851970000,
+          'y': 5,
+          'y0': 55
+        },
+        {
+          'x': 1416852000000,
+          'y': 2,
+          'y0': 31
+        },
+        {
+          'x': 1416852030000,
+          'y': 2,
+          'y0': 31
+        },
+        {
+          'x': 1416852060000,
+          'y': 4,
+          'y0': 42
+        },
+        {
+          'x': 1416852090000,
+          'y': 6,
+          'y0': 21
+        },
+        {
+          'x': 1416852120000,
+          'y': 2,
+          'y0': 21
+        }
+      ]
+    },
+    {
+      'label': 'php',
+      'values': [
+        {
+          'x': 1416850320000,
+          'y': 0,
+          'y0': 16
+        },
+        {
+          'x': 1416850350000,
+          'y': 1,
+          'y0': 45
+        },
+        {
+          'x': 1416850380000,
+          'y': 0,
+          'y0': 49
+        },
+        {
+          'x': 1416850410000,
+          'y': 2,
+          'y0': 40
+        },
+        {
+          'x': 1416850440000,
+          'y': 0,
+          'y0': 47
+        },
+        {
+          'x': 1416850470000,
+          'y': 0,
+          'y0': 42
+        },
+        {
+          'x': 1416850500000,
+          'y': 3,
+          'y0': 29
+        },
+        {
+          'x': 1416850530000,
+          'y': 1,
+          'y0': 35
+        },
+        {
+          'x': 1416850560000,
+          'y': 3,
+          'y0': 40
+        },
+        {
+          'x': 1416850590000,
+          'y': 2,
+          'y0': 56
+        },
+        {
+          'x': 1416850620000,
+          'y': 2,
+          'y0': 41
+        },
+        {
+          'x': 1416850650000,
+          'y': 5,
+          'y0': 43
+        },
+        {
+          'x': 1416850680000,
+          'y': 2,
+          'y0': 43
+        },
+        {
+          'x': 1416850710000,
+          'y': 1,
+          'y0': 34
+        },
+        {
+          'x': 1416850740000,
+          'y': 2,
+          'y0': 43
+        },
+        {
+          'x': 1416850770000,
+          'y': 2,
+          'y0': 45
+        },
+        {
+          'x': 1416850800000,
+          'y': 1,
+          'y0': 44
+        },
+        {
+          'x': 1416850830000,
+          'y': 1,
+          'y0': 47
+        },
+        {
+          'x': 1416850860000,
+          'y': 1,
+          'y0': 52
+        },
+        {
+          'x': 1416850890000,
+          'y': 1,
+          'y0': 29
+        },
+        {
+          'x': 1416850920000,
+          'y': 2,
+          'y0': 36
+        },
+        {
+          'x': 1416850950000,
+          'y': 2,
+          'y0': 49
+        },
+        {
+          'x': 1416850980000,
+          'y': 0,
+          'y0': 44
+        },
+        {
+          'x': 1416851010000,
+          'y': 3,
+          'y0': 39
+        },
+        {
+          'x': 1416851040000,
+          'y': 2,
+          'y0': 37
+        },
+        {
+          'x': 1416851070000,
+          'y': 2,
+          'y0': 41
+        },
+        {
+          'x': 1416851100000,
+          'y': 2,
+          'y0': 45
+        },
+        {
+          'x': 1416851130000,
+          'y': 0,
+          'y0': 44
+        },
+        {
+          'x': 1416851160000,
+          'y': 1,
+          'y0': 47
+        },
+        {
+          'x': 1416851190000,
+          'y': 2,
+          'y0': 49
+        },
+        {
+          'x': 1416851220000,
+          'y': 4,
+          'y0': 51
+        },
+        {
+          'x': 1416851250000,
+          'y': 0,
+          'y0': 47
+        },
+        {
+          'x': 1416851280000,
+          'y': 3,
+          'y0': 47
+        },
+        {
+          'x': 1416851310000,
+          'y': 3,
+          'y0': 39
+        },
+        {
+          'x': 1416851340000,
+          'y': 2,
+          'y0': 39
+        },
+        {
+          'x': 1416851370000,
+          'y': 2,
+          'y0': 42
+        },
+        {
+          'x': 1416851400000,
+          'y': 3,
+          'y0': 48
+        },
+        {
+          'x': 1416851430000,
+          'y': 1,
+          'y0': 45
+        },
+        {
+          'x': 1416851460000,
+          'y': 0,
+          'y0': 52
+        },
+        {
+          'x': 1416851490000,
+          'y': 2,
+          'y0': 40
+        },
+        {
+          'x': 1416851520000,
+          'y': 1,
+          'y0': 40
+        },
+        {
+          'x': 1416851550000,
+          'y': 3,
+          'y0': 39
+        },
+        {
+          'x': 1416851580000,
+          'y': 1,
+          'y0': 46
+        },
+        {
+          'x': 1416851610000,
+          'y': 2,
+          'y0': 41
+        },
+        {
+          'x': 1416851640000,
+          'y': 1,
+          'y0': 42
+        },
+        {
+          'x': 1416851670000,
+          'y': 2,
+          'y0': 34
+        },
+        {
+          'x': 1416851700000,
+          'y': 3,
+          'y0': 37
+        },
+        {
+          'x': 1416851730000,
+          'y': 1,
+          'y0': 39
+        },
+        {
+          'x': 1416851760000,
+          'y': 1,
+          'y0': 33
+        },
+        {
+          'x': 1416851790000,
+          'y': 1,
+          'y0': 38
+        },
+        {
+          'x': 1416851820000,
+          'y': 1,
+          'y0': 37
+        },
+        {
+          'x': 1416851850000,
+          'y': 1,
+          'y0': 39
+        },
+        {
+          'x': 1416851880000,
+          'y': 1,
+          'y0': 31
+        },
+        {
+          'x': 1416851910000,
+          'y': 2,
+          'y0': 45
+        },
+        {
+          'x': 1416851940000,
+          'y': 0,
+          'y0': 39
+        },
+        {
+          'x': 1416851970000,
+          'y': 0,
+          'y0': 60
+        },
+        {
+          'x': 1416852000000,
+          'y': 1,
+          'y0': 33
+        },
+        {
+          'x': 1416852030000,
+          'y': 2,
+          'y0': 33
+        },
+        {
+          'x': 1416852060000,
+          'y': 1,
+          'y0': 46
+        },
+        {
+          'x': 1416852090000,
+          'y': 1,
+          'y0': 27
+        },
+        {
+          'x': 1416852120000,
+          'y': 0,
+          'y0': 23
+        }
+      ]
+    }
+  ],
+  'hits': 2595,
+  'xAxisFormatter': function (thing) {
+    return moment(thing);
+  },
+  'tooltipFormatter': function (d) {
+    return d;
+  }
+};
diff --git a/src/fixtures/vislib/mock_data/terms/_columns.js b/src/fixtures/vislib/mock_data/terms/_columns.js
new file mode 100644
index 0000000000000..5ddb10819f5dd
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/terms/_columns.js
@@ -0,0 +1,142 @@
+var _ = require('lodash');
+
+module.exports = {
+  'columns': [
+    {
+      'label': 'logstash: index',
+      'xAxisLabel': 'Top 5 extension',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'jpg',
+              'y': 110710
+            },
+            {
+              'x': 'css',
+              'y': 27376
+            },
+            {
+              'x': 'png',
+              'y': 16664
+            },
+            {
+              'x': 'gif',
+              'y': 11264
+            },
+            {
+              'x': 'php',
+              'y': 5448
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    },
+    {
+      'label': '2014.11.12: index',
+      'xAxisLabel': 'Top 5 extension',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'jpg',
+              'y': 110643
+            },
+            {
+              'x': 'css',
+              'y': 27350
+            },
+            {
+              'x': 'png',
+              'y': 16648
+            },
+            {
+              'x': 'gif',
+              'y': 11257
+            },
+            {
+              'x': 'php',
+              'y': 5440
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    },
+    {
+      'label': '2014.11.11: index',
+      'xAxisLabel': 'Top 5 extension',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'jpg',
+              'y': 67
+            },
+            {
+              'x': 'css',
+              'y': 26
+            },
+            {
+              'x': 'png',
+              'y': 16
+            },
+            {
+              'x': 'gif',
+              'y': 7
+            },
+            {
+              'x': 'php',
+              'y': 8
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    }
+  ],
+  'hits': 171462
+};
diff --git a/src/fixtures/vislib/mock_data/terms/_rows.js b/src/fixtures/vislib/mock_data/terms/_rows.js
new file mode 100644
index 0000000000000..46e06d57f2e4c
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/terms/_rows.js
@@ -0,0 +1,97 @@
+var _ = require('lodash');
+
+module.exports = {
+  'rows': [
+    {
+      'label': '0.0-1000.0: bytes',
+      'xAxisLabel': 'Top 5 extension',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'jpg',
+              'y': 3378
+            },
+            {
+              'x': 'css',
+              'y': 762
+            },
+            {
+              'x': 'png',
+              'y': 527
+            },
+            {
+              'x': 'gif',
+              'y': 11258
+            },
+            {
+              'x': 'php',
+              'y': 653
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    },
+    {
+      'label': '1000.0-2000.0: bytes',
+      'xAxisLabel': 'Top 5 extension',
+      'yAxisLabel': 'Count of documents',
+      'series': [
+        {
+          'values': [
+            {
+              'x': 'jpg',
+              'y': 6422
+            },
+            {
+              'x': 'css',
+              'y': 1591
+            },
+            {
+              'x': 'png',
+              'y': 430
+            },
+            {
+              'x': 'gif',
+              'y': 8
+            },
+            {
+              'x': 'php',
+              'y': 561
+            }
+          ]
+        }
+      ],
+      'xAxisFormatter': function (val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        }
+        else if (val == null) {
+          return '';
+        }
+        else {
+          return '' + val;
+        }
+      },
+      'tooltipFormatter': function (d) {
+        return d;
+      }
+    }
+  ],
+  'hits': 171458
+};
diff --git a/src/fixtures/vislib/mock_data/terms/_series.js b/src/fixtures/vislib/mock_data/terms/_series.js
new file mode 100644
index 0000000000000..f3732f6061764
--- /dev/null
+++ b/src/fixtures/vislib/mock_data/terms/_series.js
@@ -0,0 +1,48 @@
+var _ = require('lodash');
+
+module.exports = {
+  'label': '',
+  'xAxisLabel': 'Top 5 extension',
+  'yAxisLabel': 'Count of documents',
+  'series': [
+    {
+      'values': [
+        {
+          'x': 'jpg',
+          'y': 110710
+        },
+        {
+          'x': 'css',
+          'y': 27389
+        },
+        {
+          'x': 'png',
+          'y': 16661
+        },
+        {
+          'x': 'gif',
+          'y': 11269
+        },
+        {
+          'x': 'php',
+          'y': 5447
+        }
+      ]
+    }
+  ],
+  'hits': 171476,
+  'xAxisFormatter': function (val) {
+    if (_.isObject(val)) {
+      return JSON.stringify(val);
+    }
+    else if (val == null) {
+      return '';
+    }
+    else {
+      return '' + val;
+    }
+  },
+  'tooltipFormatter': function (d) {
+    return d;
+  }
+};
diff --git a/src/kibana/.jshintrc b/src/kibana/.jshintrc
deleted file mode 100644
index 01e95284c83cc..0000000000000
--- a/src/kibana/.jshintrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../.jshintrc.browser"
-}
\ No newline at end of file
diff --git a/src/kibana/components/agg_response/geo_json/_tooltip_formatter.js b/src/kibana/components/agg_response/geo_json/_tooltip_formatter.js
deleted file mode 100644
index 65cc855357547..0000000000000
--- a/src/kibana/components/agg_response/geo_json/_tooltip_formatter.js
+++ /dev/null
@@ -1,41 +0,0 @@
-define(function (require) {
-  return function TileMapTooltipFormatter($compile, $rootScope, Private) {
-    var $ = require('jquery');
-    var _ = require('lodash');
-
-    var fieldFormats = Private(require('registry/field_formats'));
-    var $tooltipScope = $rootScope.$new();
-    var $el = $('<div>').html(require('text!components/agg_response/geo_json/_tooltip.html'));
-    $compile($el)($tooltipScope);
-
-    return function tooltipFormatter(feature) {
-      if (!feature) return '';
-
-      var value = feature.properties.value;
-      var acr = feature.properties.aggConfigResult;
-      var vis = acr.aggConfig.vis;
-
-      var metricAgg = acr.aggConfig;
-      var geoFormat = _.get(vis.aggs, 'byTypeName.geohash_grid[0].format');
-      if (!geoFormat) geoFormat = fieldFormats.getDefaultInstance('geo_point');
-
-      $tooltipScope.details = [
-        {
-          label: metricAgg.makeLabel(),
-          value: metricAgg.fieldFormatter()(value)
-        },
-        {
-          label: 'Center',
-          value: geoFormat.convert({
-            lat: feature.geometry.coordinates[1],
-            lon: feature.geometry.coordinates[0]
-          })
-        }
-      ];
-
-      $tooltipScope.$apply();
-
-      return $el.html();
-    };
-  };
-});
diff --git a/src/kibana/components/agg_response/geo_json/geo_json.js b/src/kibana/components/agg_response/geo_json/geo_json.js
deleted file mode 100644
index 8b95026636148..0000000000000
--- a/src/kibana/components/agg_response/geo_json/geo_json.js
+++ /dev/null
@@ -1,44 +0,0 @@
-define(function (require) {
-  return function TileMapConverterFn(Private, timefilter, $compile, $rootScope) {
-    var _ = require('lodash');
-
-    var rowsToFeatures = require('components/agg_response/geo_json/rowsToFeatures');
-    var tooltipFormatter = Private(require('components/agg_response/geo_json/_tooltip_formatter'));
-
-    return function (vis, table) {
-
-      function columnIndex(schema) {
-        return _.findIndex(table.columns, function (col) {
-          return col.aggConfig.schema.name === schema;
-        });
-      }
-
-      var geoI = columnIndex('segment');
-      var metricI = columnIndex('metric');
-      var geoAgg = _.get(table.columns, [geoI, 'aggConfig']);
-      var metricAgg = _.get(table.columns, [metricI, 'aggConfig']);
-
-      var features = rowsToFeatures(table, geoI, metricI);
-      var values = features.map(function (feature) {
-        return feature.properties.value;
-      });
-
-      return {
-        title: table.title(),
-        valueFormatter: metricAgg && metricAgg.fieldFormatter(),
-        tooltipFormatter: tooltipFormatter,
-        geohashGridAgg: geoAgg,
-        geoJson: {
-          type: 'FeatureCollection',
-          features: features,
-          properties: {
-            min: _.min(values),
-            max: _.max(values),
-            zoom: _.get(geoAgg, 'params.mapZoom'),
-            center: _.get(geoAgg, 'params.mapCenter')
-          }
-        }
-      };
-    };
-  };
-});
diff --git a/src/kibana/components/agg_response/hierarchical/_build_split.js b/src/kibana/components/agg_response/hierarchical/_build_split.js
deleted file mode 100644
index 3f4501153b4af..0000000000000
--- a/src/kibana/components/agg_response/hierarchical/_build_split.js
+++ /dev/null
@@ -1,17 +0,0 @@
-define(function (require) {
-  return function biuldSplitProvider(Private) {
-    var transformer = Private(require('components/agg_response/hierarchical/_transform_aggregation'));
-    var collectKeys = require('components/agg_response/hierarchical/_collect_keys');
-    return function (agg, metric, aggData) {
-      // Ceate the split structure
-      var split = { label: '', slices: { children: [] } };
-
-      // Transform the aggData into splits
-      split.slices.children = transformer(agg, metric, aggData);
-
-      // Collect all the keys
-      split.names = collectKeys(split.slices.children);
-      return split;
-    };
-  };
-});
diff --git a/src/kibana/components/agg_response/hierarchical/build_hierarchical_data.js b/src/kibana/components/agg_response/hierarchical/build_hierarchical_data.js
deleted file mode 100644
index e688a7cfe475e..0000000000000
--- a/src/kibana/components/agg_response/hierarchical/build_hierarchical_data.js
+++ /dev/null
@@ -1,96 +0,0 @@
-define(function (require) {
-  return function buildHierarchicalDataProvider(Private, Notifier) {
-    var _ = require('lodash');
-    var buildSplit = Private(require('components/agg_response/hierarchical/_build_split'));
-    var extractBuckets = require('components/agg_response/hierarchical/_extract_buckets');
-    var createRawData = require('components/agg_response/hierarchical/_create_raw_data');
-    var arrayToLinkedList = require('components/agg_response/hierarchical/_array_to_linked_list');
-    var tooltipFormatter = Private(require('components/agg_response/hierarchical/_hierarchical_tooltip_formatter'));
-
-    var AggConfigResult = require('components/vis/AggConfigResult');
-
-    var notify = new Notifier({
-      location: 'Pie chart response converter'
-    });
-
-    return function (vis, resp) {
-      // Create a refrenece to the buckets
-      var buckets = vis.aggs.bySchemaGroup.buckets;
-
-
-      // Find the metric so it's easier to reference.
-      // TODO: Change this to support multiple metrics.
-      var metric = vis.aggs.bySchemaGroup.metrics[0];
-
-      // Link each agg to the next agg. This will be
-      // to identify the next bucket aggregation
-      buckets = arrayToLinkedList(buckets);
-
-      // Create the raw data to be used in the spy panel
-      var raw = createRawData(vis, resp);
-
-      // If buckets is falsy then we should just return the aggs
-      if (!buckets) {
-        var value = resp.aggregations
-          && resp.aggregations[metric.id]
-          && resp.aggregations[metric.id].value
-          || resp.hits.total;
-        return {
-          hits: resp.hits.total,
-          raw: raw,
-          names: ['_all'],
-          tooltipFormatter: tooltipFormatter(raw.columns),
-          slices: {
-            children: [
-              { name: '_all', size: value }
-            ]
-          }
-        };
-      }
-
-      var firstAgg = buckets[0];
-      var aggData = resp.aggregations[firstAgg.id];
-
-      if (!firstAgg._next && firstAgg.schema.name === 'split') {
-        notify.error('Splitting charts without splitting slices is not supported. Pretending that we are just splitting slices.');
-      }
-
-      // start with splitting slices
-      if (!firstAgg._next || firstAgg.schema.name === 'segment') {
-        var split = buildSplit(firstAgg, metric, aggData);
-        split.hits = resp.hits.total;
-        split.raw = raw;
-        split.tooltipFormatter = tooltipFormatter(raw.columns);
-        return split;
-      }
-
-      // map the split aggregations into rows.
-      var rows = _.map(extractBuckets(aggData), function (bucket) {
-        var agg = firstAgg._next;
-        var split = buildSplit(agg, metric, bucket[agg.id]);
-        // Since splits display labels we need to set it.
-        split.label = firstAgg.fieldFormatter()(bucket.key);
-
-        var displayName = firstAgg.fieldDisplayName();
-        if (!_.isEmpty(displayName)) split.label += ': ' + displayName;
-
-        split.tooltipFormatter = tooltipFormatter(raw.columns);
-        var aggConfigResult = new AggConfigResult(firstAgg, null, null, firstAgg.getKey(bucket));
-        split.split = { aggConfig: firstAgg, aggConfigResult: aggConfigResult, key: bucket.key };
-        _.each(split.slices.children, function (child) {
-          child.aggConfigResult.$parent = aggConfigResult;
-        });
-        return split;
-      });
-
-      var result = { hits: resp.hits.total, raw: raw };
-      if (firstAgg.params.row) {
-        result.rows = rows;
-      } else {
-        result.columns = rows;
-      }
-
-      return result;
-    };
-  };
-});
diff --git a/src/kibana/components/agg_response/index.js b/src/kibana/components/agg_response/index.js
deleted file mode 100644
index d5fda98a15609..0000000000000
--- a/src/kibana/components/agg_response/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-define(function (require) {
-  return function NormalizeChartDataFactory(Private) {
-    return {
-      hierarchical: Private(require('components/agg_response/hierarchical/build_hierarchical_data')),
-      pointSeries: Private(require('components/agg_response/point_series/point_series')),
-      tabify: Private(require('components/agg_response/tabify/tabify')),
-      geoJson: Private(require('components/agg_response/geo_json/geo_json'))
-    };
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/agg_response/point_series/_fake_x_aspect.js b/src/kibana/components/agg_response/point_series/_fake_x_aspect.js
deleted file mode 100644
index f15390474908d..0000000000000
--- a/src/kibana/components/agg_response/point_series/_fake_x_aspect.js
+++ /dev/null
@@ -1,29 +0,0 @@
-define(function (require) {
-  return function PointSeriesFakeXAxis(Private) {
-    var AggConfig = Private(require('components/vis/AggConfig'));
-    var AggType = Private(require('components/agg_types/_agg_type'));
-
-    var allAgg = new AggType({
-      name: 'all',
-      title: 'All docs',
-      ordered: false,
-      hasNoDsl: true
-    });
-
-    return function makeFakeXAxis(vis) {
-      var fake = new AggConfig(vis, {
-        type: allAgg,
-        schema: vis.type.schemas.all.byName.segment
-      });
-
-      return {
-        i: -1,
-        agg: fake,
-        col: {
-          aggConfig: fake,
-          label: fake.makeLabel()
-        }
-      };
-    };
-  };
-});
diff --git a/src/kibana/components/agg_response/point_series/_get_aspects.js b/src/kibana/components/agg_response/point_series/_get_aspects.js
deleted file mode 100644
index fd1158e7e0062..0000000000000
--- a/src/kibana/components/agg_response/point_series/_get_aspects.js
+++ /dev/null
@@ -1,59 +0,0 @@
-define(function (require) {
-  return function PointSeriesGetAspects(Private) {
-    var _ = require('lodash');
-    var fakeXAspect = Private(require('components/agg_response/point_series/_fake_x_aspect'));
-
-    var map = {
-      segment: 'x',
-      metric: 'y',
-      radius: 'z',
-      width: 'width',
-      group: 'series'
-    };
-
-    function columnToAspect(aspects, col, i) {
-      var schema = col.aggConfig.schema.name;
-
-      var name = map[schema];
-      if (!name) throw new TypeError('unknown schema name "' + schema + '"');
-
-      var aspect = {
-        i: i,
-        col: col,
-        agg: col.aggConfig
-      };
-
-      if (!aspects[name]) aspects[name] = [];
-      aspects[name].push(aspect);
-    }
-
-    /**
-     * Identify and group the columns based on the aspect of the pointSeries
-     * they represent.
-     *
-     * @param  {array} columns - the list of columns
-     * @return {object} - an object with a key for each aspect (see map). The values
-     *                    may be undefined, a single aspect, or an array of aspects.
-     */
-    return function getAspects(vis, table) {
-      var aspects = _(table.columns)
-      // write each column into the aspects under it's group
-      .transform(columnToAspect, {})
-      // unwrap groups that only have one value, and validate groups that have more
-      .transform(function (aspects, group, name) {
-        if (name !== 'y' && group.length > 1) {
-          throw new TypeError('Only multiple metrics are supported in point series');
-        }
-
-        aspects[name] = group.length > 1 ? group : group[0];
-      })
-      .value();
-
-      if (!aspects.x) {
-        aspects.x = fakeXAspect(vis);
-      }
-
-      return aspects;
-    };
-  };
-});
diff --git a/src/kibana/components/agg_response/point_series/_get_series.js b/src/kibana/components/agg_response/point_series/_get_series.js
deleted file mode 100644
index 84c59e50d63b1..0000000000000
--- a/src/kibana/components/agg_response/point_series/_get_series.js
+++ /dev/null
@@ -1,56 +0,0 @@
-define(function (require) {
-  return function PointSeriesGetSeries(Private) {
-    var _ = require('lodash');
-    var getPoint = Private(require('components/agg_response/point_series/_get_point'));
-    var addToSiri = Private(require('components/agg_response/point_series/_add_to_siri'));
-
-    return function getSeries(rows, chart) {
-      var aspects = chart.aspects;
-      var multiY = _.isArray(aspects.y);
-      var yScale = chart.yScale;
-      var partGetPoint = _.partial(getPoint, aspects.x, aspects.series, yScale);
-
-      var series = _(rows)
-      .transform(function (series, row) {
-
-        if (!multiY) {
-          var point = partGetPoint(row, aspects.y, aspects.z);
-          if (point) addToSiri(series, point, point.series);
-          return;
-        }
-
-        aspects.y.forEach(function (y) {
-          var point = partGetPoint(row, y, aspects.z);
-          if (!point) return;
-
-          var prefix = point.series ? point.series + ': ' : '';
-          var seriesId = prefix + y.agg.id;
-          var seriesLabel = prefix + y.col.title;
-
-          addToSiri(series, point, seriesId, seriesLabel);
-        });
-
-      }, {})
-      .values()
-      .value();
-
-      if (multiY) {
-        series = _.sortBy(series, function (siri) {
-          var firstVal = siri.values[0];
-          var y;
-
-          if (firstVal) {
-            var agg = firstVal.aggConfigResult.aggConfig;
-            y = _.find(aspects.y, function (y) {
-              return y.agg === agg;
-            });
-          }
-
-          return y ? y.i : series.length;
-        });
-      }
-
-      return series;
-    };
-  };
-});
diff --git a/src/kibana/components/agg_response/point_series/_tooltip_formatter.js b/src/kibana/components/agg_response/point_series/_tooltip_formatter.js
deleted file mode 100644
index 9a9a023cc9ad1..0000000000000
--- a/src/kibana/components/agg_response/point_series/_tooltip_formatter.js
+++ /dev/null
@@ -1,45 +0,0 @@
-define(function (require) {
-  return function PointSeriesTooltipFormatter($compile, $rootScope) {
-    var $ = require('jquery');
-
-    var $tooltipScope = $rootScope.$new();
-    var $tooltip = $(require('text!components/agg_response/point_series/_tooltip.html'));
-    $compile($tooltip)($tooltipScope);
-
-    return function tooltipFormatter(event) {
-      var datum = event.datum;
-      if (!datum || !datum.aggConfigResult) return '';
-
-      var details = $tooltipScope.details = [];
-      var result = { $parent: datum.aggConfigResult };
-
-      function addDetail(result) {
-        var agg = result.aggConfig;
-        var value = result.value;
-
-        var detail = {
-          value: agg.fieldFormatter()(value),
-          label: agg.makeLabel()
-        };
-
-        if (agg === datum.aggConfigResult.aggConfig) {
-          detail.percent = event.percent;
-          if (datum.yScale != null) {
-            detail.value = agg.fieldFormatter()(value * datum.yScale);
-          }
-        }
-
-        details.push(detail);
-      }
-
-      datum.extraMetrics.forEach(addDetail);
-      while ((result = result.$parent) && result.aggConfig) {
-        addDetail(result);
-      }
-
-
-      $tooltipScope.$apply();
-      return $tooltip[0].outerHTML;
-    };
-  };
-});
diff --git a/src/kibana/components/agg_response/point_series/point_series.js b/src/kibana/components/agg_response/point_series/point_series.js
deleted file mode 100644
index eece0f4b22fab..0000000000000
--- a/src/kibana/components/agg_response/point_series/point_series.js
+++ /dev/null
@@ -1,32 +0,0 @@
-define(function (require) {
-  return function PointSeriesProvider(Private) {
-    var _ = require('lodash');
-
-    var getSeries = Private(require('components/agg_response/point_series/_get_series'));
-    var getAspects = Private(require('components/agg_response/point_series/_get_aspects'));
-    var initYAxis = Private(require('components/agg_response/point_series/_init_y_axis'));
-    var initXAxis = Private(require('components/agg_response/point_series/_init_x_axis'));
-    var setupOrderedDateXAxis = Private(require('components/agg_response/point_series/_ordered_date_axis'));
-    var tooltipFormatter = Private(require('components/agg_response/point_series/_tooltip_formatter'));
-
-    return function pointSeriesChartDataFromTable(vis, table) {
-      var chart = {};
-      var aspects = chart.aspects = getAspects(vis, table);
-
-      chart.tooltipFormatter = tooltipFormatter;
-
-      initXAxis(chart);
-      initYAxis(chart);
-
-      var datedX = aspects.x.agg.type.ordered && aspects.x.agg.type.ordered.date;
-      if (datedX) {
-        setupOrderedDateXAxis(vis, chart);
-      }
-
-      chart.series = getSeries(table.rows, chart);
-
-      delete chart.aspects;
-      return chart;
-    };
-  };
-});
diff --git a/src/kibana/components/agg_response/tabify/_get_columns.js b/src/kibana/components/agg_response/tabify/_get_columns.js
deleted file mode 100644
index be7ac725b2c8c..0000000000000
--- a/src/kibana/components/agg_response/tabify/_get_columns.js
+++ /dev/null
@@ -1,51 +0,0 @@
-define(function (require) {
-  return function GetColumnsProvider(Private) {
-    var _ = require('lodash');
-    var AggConfig = Private(require('components/vis/AggConfig'));
-
-    return function getColumns(vis, minimal) {
-      var aggs = vis.aggs.getResponseAggs();
-
-      if (minimal == null) minimal = !vis.isHierarchical();
-
-      if (!vis.aggs.bySchemaGroup.metrics) {
-        aggs.push(new AggConfig(vis, {
-          type: 'count',
-          schema: vis.type.schemas.metrics[0].name
-        }));
-      }
-
-      // pick the columns
-      if (minimal) {
-        return aggs.map(function (agg) {
-          return { aggConfig: agg };
-        });
-      }
-
-      // supposed to be bucket,...metrics,bucket,...metrics
-      var columns = [];
-
-      // seperate the metrics
-      var grouped = _.groupBy(aggs, function (agg) {
-        return agg.schema.group;
-      });
-
-      if (!grouped.buckets) {
-        // return just the metrics, in column format
-        return grouped.metrics.map(function (agg) {
-          return { aggConfig: agg };
-        });
-      }
-
-      // return the buckets, and after each place all of the metrics
-      grouped.buckets.forEach(function (agg, i) {
-        columns.push({ aggConfig: agg });
-        grouped.metrics.forEach(function (metric) {
-          columns.push({ aggConfig: metric });
-        });
-      });
-
-      return columns;
-    };
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/agg_response/tabify/_response_writer.js b/src/kibana/components/agg_response/tabify/_response_writer.js
deleted file mode 100644
index 6c1b2426c3e4f..0000000000000
--- a/src/kibana/components/agg_response/tabify/_response_writer.js
+++ /dev/null
@@ -1,282 +0,0 @@
-define(function (require) {
-  return function TabbedAggResponseWriterProvider(Private) {
-    var _ = require('lodash');
-    var Table = Private(require('components/agg_response/tabify/_table'));
-    var TableGroup = Private(require('components/agg_response/tabify/_table_group'));
-    var getColumns = Private(require('components/agg_response/tabify/_get_columns'));
-
-    var AggConfigResult = require('components/vis/AggConfigResult');
-
-    _.class(SplitAcr).inherits(AggConfigResult);
-    function SplitAcr(agg, parent, key) {
-      SplitAcr.Super.call(this, agg, parent, key, key);
-    }
-
-    /**
-     * Writer class that collects information about an aggregation response and
-     * produces a table, or a series of tables.
-     *
-     * @param {Vis} vis - the vis object to which the aggregation response correlates
-     */
-    function TabbedAggResponseWriter(vis, opts) {
-      this.vis = vis;
-      this.opts = opts || {};
-      this.rowBuffer = [];
-
-      var visIsHier = vis.isHierarchical();
-
-      // do the options allow for splitting? we will only split if true and
-      // tabify calls the split method.
-      this.canSplit = this.opts.canSplit !== false;
-
-      // should we allow partial rows to be included in the tables? if a
-      // partial row is found, it is filled with empty strings ''
-      this.partialRows = this.opts.partialRows == null ? visIsHier : this.opts.partialRows;
-
-      // if true, we will not place metric columns after every bucket
-      // even if the vis is hierarchical. if false, and the vis is
-      // hierarchical, then we will display metric columns after
-      // every bucket col
-      this.minimalColumns = visIsHier ? !!this.opts.minimalColumns : true;
-
-      // true if we can expect metrics to have been calculated
-      // for every bucket
-      this.metricsForAllBuckets = visIsHier;
-
-      // if true, values will be wrapped in aggConfigResult objects which link them
-      // to their aggConfig and enable the filterbar and tooltip formatters
-      this.asAggConfigResults = !!this.opts.asAggConfigResults;
-
-      this.columns = getColumns(vis, this.minimalColumns);
-      this.aggStack = _.pluck(this.columns, 'aggConfig');
-
-      this.root = new TableGroup();
-      this.acrStack = [];
-      this.splitStack = [this.root];
-    }
-
-    /**
-     * Create a Table of TableGroup object, link it to it's parent (if any), and determine if
-     * it's the root
-     *
-     * @param  {boolean} group - is this a TableGroup or just a normal Table
-     * @param  {AggConfig} agg - the aggregation that create this table, only applies to groups
-     * @param  {any} key - the bucketKey that this table relates to
-     * @return {Table/TableGroup} table - the created table
-     */
-    TabbedAggResponseWriter.prototype._table = function (group, agg, key) {
-      var Class = (group) ? TableGroup : Table;
-      var table = new Class();
-      var parent = this.splitStack[0];
-
-      if (group) {
-        table.aggConfig = agg;
-        table.key = key;
-        table.title =  (table.fieldFormatter()(key)) + ': ' + agg.makeLabel() ;
-      }
-
-      // link the parent and child
-      table.$parent = parent;
-      parent.tables.push(table);
-
-      return table;
-    };
-
-    /**
-     * Enter into a split table, called for each bucket of a splitting agg. The new table
-     * is either created or located using the agg and key arguments, and then the block is
-     * executed with the table as it's this context. Within this function, you should
-     * walk into the remaining branches and end up writing some rows to the table.
-     *
-     * @param  {aggConfig} agg - the aggConfig that created this split
-     * @param  {Buckets} buckets - the buckets produces by the agg
-     * @param  {function} block - a function to execute for each sub bucket
-     */
-    TabbedAggResponseWriter.prototype.split = function (agg, buckets, block) {
-      var self = this;
-
-      if (!self.canSplit) {
-        throw new Error('attempted to split when splitting is disabled');
-      }
-
-      self._removeAggFromColumns(agg);
-
-      buckets.forEach(function (bucket, key) {
-        // find the existing split that we should extend
-        var tableGroup = _.find(self.splitStack[0].tables, { aggConfig: agg, key: key });
-        // create the split if it doesn't exist yet
-        if (!tableGroup) tableGroup = self._table(true, agg, key);
-
-        var splitAcr = false;
-        if (self.asAggConfigResults) {
-          splitAcr = self._injectParentSplit(agg, key);
-        }
-
-        // push the split onto the stack so that it will receive written tables
-        self.splitStack.unshift(tableGroup);
-
-        // call the block
-        if (_.isFunction(block)) block.call(self, bucket, key);
-
-        // remove the split from the stack
-        self.splitStack.shift();
-        splitAcr && _.pull(self.acrStack, splitAcr);
-      });
-    };
-
-    TabbedAggResponseWriter.prototype._removeAggFromColumns = function (agg) {
-      var i = _.findIndex(this.columns, function (col) {
-        return col.aggConfig === agg;
-      });
-
-      // we must have already removed this column
-      if (i === -1) return;
-
-      this.columns.splice(i, 1);
-
-      if (this.minimalColumns) return;
-
-      // hierarchical vis creats additional columns for each bucket
-      // we will remove those too
-      var mCol = this.columns.splice(i, 1).pop();
-      var mI = _.findIndex(this.aggStack, function (agg) {
-        return agg === mCol.aggConfig;
-      });
-
-      if (mI > -1) this.aggStack.splice(mI, 1);
-    };
-
-    /**
-     * When a split is found while building the aggConfigResult tree, we
-     * want to push the split into the tree at another point. Since each
-     * branch in the tree is a double-linked list we need do some special
-     * shit to pull this off.
-     *
-     * @private
-     * @param {AggConfig} - The agg which produced the split bucket
-     * @param {any} - The value which identifies the bucket
-     * @return {SplitAcr} - the AggConfigResult created for the split bucket
-     */
-    TabbedAggResponseWriter.prototype._injectParentSplit = function (agg, key) {
-      var oldList = this.acrStack;
-      var newList = this.acrStack = [];
-
-      // walk from right to left through the old stack
-      // and move things to the new stack
-      var injected = false;
-
-      if (!oldList.length) {
-        injected = new SplitAcr(agg, null, key);
-        newList.unshift(injected);
-        return injected;
-      }
-
-      // walk from right to left, emptying the previous list
-      while (oldList.length) {
-        var acr = oldList.pop();
-
-        // ignore other splits
-        if (acr instanceof SplitAcr) {
-          newList.unshift(acr);
-          continue;
-        }
-
-        // inject the split
-        if (!injected) {
-          injected = new SplitAcr(agg, newList[0], key);
-          newList.unshift(injected);
-        }
-
-        var newAcr = new AggConfigResult(acr.aggConfig, newList[0], acr.value, acr.aggConfig.getKey(acr));
-        newList.unshift(newAcr);
-
-        // and replace the acr in the row buffer if its there
-        var rowI = this.rowBuffer.indexOf(acr);
-        if (rowI > -1) {
-          this.rowBuffer[rowI] = newAcr;
-        }
-      }
-
-      return injected;
-    };
-
-    /**
-     * Push a value into the row, then run a block. Once the block is
-     * complete the value is pulled from the stack.
-     *
-     * @param  {any} value - the value that should be added to the row
-     * @param  {function} block - the function to run while this value is in the row
-     * @return {any} - the value that was added
-     */
-    TabbedAggResponseWriter.prototype.cell = function (agg, value, block) {
-      if (this.asAggConfigResults) {
-        value = new AggConfigResult(agg, this.acrStack[0], value, value);
-      }
-
-      var staskResult = this.asAggConfigResults && value.type === 'bucket';
-
-      this.rowBuffer.push(value);
-      if (staskResult) this.acrStack.unshift(value);
-
-      if (_.isFunction(block)) block.call(this);
-
-      this.rowBuffer.pop(value);
-      if (staskResult) this.acrStack.shift();
-
-      return value;
-    };
-
-    /**
-     * Create a new row by reading the row buffer. This will do nothing if
-     * the row is incomplete and the vis this data came from is NOT flagged as
-     * hierarchical.
-     *
-     * @param  {array} [buffer] - optional buffer to use in place of the stored rowBuffer
-     * @return {undefined}
-     */
-    TabbedAggResponseWriter.prototype.row = function (buffer) {
-      var cells = buffer || this.rowBuffer.slice(0);
-
-      if (!this.partialRows && cells.length < this.columns.length) {
-        return;
-      }
-
-      var split = this.splitStack[0];
-      var table = split.tables[0] || this._table(false);
-
-      while (cells.length < this.columns.length) cells.push('');
-      table.rows.push(cells);
-      return table;
-    };
-
-    /**
-     * Get the actual response
-     *
-     * @return {object} - the final table-tree
-     */
-    TabbedAggResponseWriter.prototype.response = function () {
-      var columns = this.columns;
-
-      // give the columns some metadata
-      columns.map(function (col) {
-        col.title = col.aggConfig.makeLabel();
-      });
-
-      // walk the tree and write the columns to each table
-      (function step(table, group) {
-        if (table.tables) table.tables.forEach(step);
-        else table.columns = columns.slice(0);
-      }(this.root));
-
-      if (this.canSplit) return this.root;
-
-      var table = this.root.tables[0];
-      if (!table) return;
-
-      delete table.$parent;
-      return table;
-    };
-
-    return TabbedAggResponseWriter;
-  };
-});
diff --git a/src/kibana/components/agg_response/tabify/tabify.js b/src/kibana/components/agg_response/tabify/tabify.js
deleted file mode 100644
index 8946848752a1e..0000000000000
--- a/src/kibana/components/agg_response/tabify/tabify.js
+++ /dev/null
@@ -1,103 +0,0 @@
-define(function (require) {
-  return function tabifyAggResponseProvider(Private, Notifier) {
-    var _ = require('lodash');
-
-    var AggConfig = Private(require('components/vis/AggConfig'));
-    var TabbedAggResponseWriter = Private(require('components/agg_response/tabify/_response_writer'));
-    var Buckets = Private(require('components/agg_response/tabify/_buckets'));
-    var notify = new Notifier({ location: 'agg_response/tabify'});
-
-    function tabifyAggResponse(vis, esResponse, respOpts) {
-      var write = new TabbedAggResponseWriter(vis, respOpts);
-
-      var topLevelBucket = _.assign({}, esResponse.aggregations, {
-        doc_count: esResponse.hits.total
-      });
-
-      collectBucket(write, topLevelBucket);
-
-      return write.response();
-    }
-
-    /**
-     * read an aggregation from a bucket, which is *might* be found at key (if
-     * the response came in object form), and will recurse down the aggregation
-     * tree and will pass the read values to the ResponseWriter.
-     *
-     * @param {object} bucket - a bucket from the aggResponse
-     * @param {undefined|string} key - the key where the bucket was found
-     * @returns {undefined}
-     */
-    function collectBucket(write, bucket, key) {
-      var agg = write.aggStack.shift();
-
-      switch (agg.schema.group) {
-      case 'buckets':
-        var buckets = new Buckets(bucket[agg.id]);
-        if (buckets.length) {
-          var splitting = write.canSplit && agg.schema.name === 'split';
-          if (splitting) {
-            write.split(agg, buckets, function forEachBucket(subBucket, key) {
-              collectBucket(write, subBucket, agg.getKey(subBucket), key);
-            });
-          } else {
-            buckets.forEach(function (subBucket, key) {
-              write.cell(agg, agg.getKey(subBucket, key), function () {
-                collectBucket(write, subBucket, agg.getKey(subBucket, key));
-              });
-            });
-          }
-        } else if (write.partialRows && write.metricsForAllBuckets && write.minimalColumns) {
-          // we don't have any buckets, but we do have metrics at this
-          // level, then pass all the empty buckets and jump back in for
-          // the metrics.
-          write.aggStack.unshift(agg);
-          passEmptyBuckets(write, bucket, key);
-          write.aggStack.shift();
-        } else {
-          // we don't have any buckets, and we don't have isHierarchical
-          // data, so no metrics, just try to write the row
-          write.row();
-        }
-        break;
-      case 'metrics':
-        var value = agg.getValue(bucket);
-        write.cell(agg, value, function () {
-          if (!write.aggStack.length) {
-            // row complete
-            write.row();
-          } else {
-            // process the next agg at this same level
-            collectBucket(write, bucket, key);
-          }
-        });
-        break;
-      }
-
-      write.aggStack.unshift(agg);
-    }
-
-    // write empty values for each bucket agg, then write
-    // the metrics from the initial bucket using collectBucket()
-    function passEmptyBuckets(write, bucket, key) {
-      var agg = write.aggStack.shift();
-
-      switch (agg.schema.group) {
-      case 'metrics':
-        // pass control back to collectBucket()
-        write.aggStack.unshift(agg);
-        collectBucket(write, bucket, key);
-        return;
-
-      case 'buckets':
-        write.cell(agg, '', function () {
-          passEmptyBuckets(write, bucket, key);
-        });
-      }
-
-      write.aggStack.unshift(agg);
-    }
-
-    return notify.timed('tabify agg response', tabifyAggResponse);
-  };
-});
diff --git a/src/kibana/components/agg_table/agg_table.less b/src/kibana/components/agg_table/agg_table.less
deleted file mode 100644
index f90c56354f346..0000000000000
--- a/src/kibana/components/agg_table/agg_table.less
+++ /dev/null
@@ -1,43 +0,0 @@
-@import (reference) "lesshat.less";
-@import (reference) "../../styles/theme/_variables.less";
-
-kbn-agg-table,
-kbn-agg-table-group {
-  display: block;
-}
-
-.agg-table {
-  .display(flex);
-  .flex(1, 1, auto);
-  .flex-direction(column);
-
-  &-paginated {
-    .flex(1, 1, auto);
-    overflow: auto;
-
-    tr:hover td {
-      background-color: lighten(@gray-lighter, 4%);
-    }
-
-    .cell-hover:hover {
-      background-color: @gray-lighter;
-    }
-
-    th i.fa-sort {
-      color: @gray-light;
-    }
-  }
-
-  &-controls {
-    .flex(0, 0, auto);
-    .display(flex);
-    .align-items(center);
-    margin: 10px 5px;
-
-    > paginate-controls {
-      .flex(1, 0, auto);
-      margin: 0;
-      padding: 0;
-    }
-  }
-}
diff --git a/src/kibana/components/agg_types/README.md b/src/kibana/components/agg_types/README.md
deleted file mode 100644
index 35ad6465239c7..0000000000000
--- a/src/kibana/components/agg_types/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-| Private | module id |
-| --- | --- |
-| `true` | `components/agg_config/index` |
-
-```js
-var aggTypes = Private(require('components/agg_types/index'));
-```
-
-Collection of `AggType` definition objects. See the [Vis component](../vis) for an overall explaination of how `AggTypes` are used.
-
-### Included
-
-  - [`AggType`](_agg_type.js)
-  - `AggParam`
-    - [`BaseAggParam`](param_types/base.js)
-    - [`FieldAggParam`](param_types/field.js)
-    - [`OptionedAggParam`](param_types/optioned.js)
-  - [`AggParams`](_agg_params.js)
\ No newline at end of file
diff --git a/src/kibana/components/agg_types/_agg_params.js b/src/kibana/components/agg_types/_agg_params.js
deleted file mode 100644
index b4a71b4cfc963..0000000000000
--- a/src/kibana/components/agg_types/_agg_params.js
+++ /dev/null
@@ -1,72 +0,0 @@
-define(function (require) {
-  return function AggParamsFactory(Private) {
-    require('filters/label');
-    var _ = require('lodash');
-    var IndexedArray = require('utils/indexed_array/index');
-
-    var paramTypeMap = {
-      field: Private(require('components/agg_types/param_types/field')),
-      optioned: Private(require('components/agg_types/param_types/optioned')),
-      regex: Private(require('components/agg_types/param_types/regex')),
-      string: Private(require('components/agg_types/param_types/string')),
-      json: Private(require('components/agg_types/param_types/raw_json')),
-      _default: Private(require('components/agg_types/param_types/base'))
-    };
-
-    /**
-     * Wraps a list of {{#crossLink "AggParam"}}{{/crossLink}} objects; owned by an {{#crossLink "AggType"}}{{/crossLink}}
-     *
-     * used to create:
-     *   - `FieldAggParam` – When the config has `name: "field"`
-     *   - `*AggParam` – When the type matches something in the map above
-     *   - `BaseAggParam` – All other params
-     *
-     * @class AggParams
-     * @constructor
-     * @extends IndexedArray
-     * @param {object[]} params - array of params that get new-ed up as AggParam objects as descibed above
-     */
-    _.class(AggParams).inherits(IndexedArray);
-    function AggParams(params) {
-      AggParams.Super.call(this, {
-        index: ['name'],
-        initialSet: params.map(function (config) {
-          var type = config.name === 'field' ? config.name : config.type;
-          var Class = paramTypeMap[type] || paramTypeMap._default;
-          return new Class(config);
-        })
-      });
-    }
-
-    /**
-     * Reads an aggConfigs
-     *
-     * @method write
-     * @param  {AggConfig} aggConfig
-     *         the AggConfig object who's type owns these aggParams and contains the param values for our param defs
-     * @param  {object} [locals]
-     *         an array of locals that will be available to the write function (can be used to enhance
-     *         the quality of things like date_histogram's "auto" interval)
-     * @return {object} output
-     *         output of the write calls, reduced into a single object. A `params: {}` property is exposed on the
-     *         output object which is used to create the agg dsl for the search request. All other properties
-     *         are dependent on the AggParam#write methods which should be studied for each AggType.
-     */
-    AggParams.prototype.write = function (aggConfig, locals) {
-      var output = { params: {} };
-      locals = locals || {};
-
-      this.forEach(function (param) {
-        if (param.write) {
-          param.write(aggConfig, output, locals);
-        } else {
-          output.params[param.name] = aggConfig.params[param.name];
-        }
-      });
-
-      return output;
-    };
-
-    return AggParams;
-  };
-});
diff --git a/src/kibana/components/agg_types/_agg_type.js b/src/kibana/components/agg_types/_agg_type.js
deleted file mode 100644
index 09c9221153d51..0000000000000
--- a/src/kibana/components/agg_types/_agg_type.js
+++ /dev/null
@@ -1,141 +0,0 @@
-define(function (require) {
-  return function AggTypeFactory(Private) {
-    var _ = require('lodash');
-    var AggParams = Private(require('components/agg_types/_agg_params'));
-    var fieldFormats = Private(require('registry/field_formats'));
-
-    /**
-     * Generic AggType Constructor
-     *
-     * Used to create the values exposed by the agg_types module.
-     *
-     * @class AggType
-     * @private
-     * @param {object} config - used to set the properties of the AggType
-     */
-    function AggType(config) {
-
-      /**
-       * the unique, unchanging, name that we have assigned this aggType
-       *
-       * @property name
-       * @type {string}
-       */
-      this.name = config.name;
-
-      /**
-       * the name of the elasticsearch aggregation that this aggType represents. Usually just this.name
-       *
-       * @property name
-       * @type {string}
-       */
-      this.dslName = config.dslName || config.name;
-
-      /**
-       * the user friendly name that will be shown in the ui for this aggType
-       *
-       * @property title
-       * @type {string}
-       */
-      this.title = config.title;
-
-      /**
-       * a function that will be called when this aggType is assigned to
-       * an aggConfig, and that aggConfig is being rendered (in a form, chart, etc.).
-       *
-       * @method makeLabel
-       * @param {AggConfig} aggConfig - an agg config of this type
-       * @returns {string} - label that can be used in the ui to descripe the aggConfig
-       */
-      this.makeLabel = config.makeLabel || _.constant(this.name);
-
-      /**
-       * Describes if this aggType creates data that is ordered, and if that ordered data
-       * is some sort of time series.
-       *
-       * If the aggType does not create ordered data, set this to something "falsey".
-       *
-       * If this does create orderedData, then the value should be an object.
-       *
-       * If the orderdata is some sort of time series, `this.ordered` should be an object
-       * with the property `date: true`
-       *
-       * @property ordered
-       * @type {object|undefined}
-       */
-      this.ordered = config.ordered;
-
-      /**
-       * Flag that prevents this aggregation from being included in the dsl. This is only
-       * used by the count aggregation (currently) since it doesn't really exist and it's output
-       * is available on every bucket.
-       *
-       * @type {Boolean}
-       */
-      this.hasNoDsl = !!config.hasNoDsl;
-
-      /**
-       * The method to create a filter representation of the bucket
-       * @param {object} aggConfig The instance of the aggConfig
-       * @param {mixed} key The key for the bucket
-       * @returns {object} The filter
-       */
-      this.createFilter = config.createFilter;
-
-      /**
-       * An instance of {{#crossLink "AggParams"}}{{/crossLink}}.
-       *
-       * @property params
-       * @type {AggParams}
-       */
-      this.params = config.params || [];
-      if (!(this.params instanceof AggParams)) {
-        // always append the raw JSON param
-        this.params.push({
-          name: 'json',
-          type: 'json',
-          advanced: true
-        });
-
-        this.params = new AggParams(this.params);
-      }
-
-      /**
-       * Designed for multi-value metric aggs, this method can return a
-       * set of AggConfigs that should replace this aggConfig in result sets
-       * that walk the AggConfig set.
-       *
-       * @method getResponseAggs
-       * @returns {array[AggConfig]|undefined} - an array of aggConfig objects
-       *                                         that should replace this one,
-       *                                         or undefined
-       */
-      this.getResponseAggs = config.getResponseAggs || _.noop;
-
-      /**
-       * A function that will be called each time an aggConfig of this type
-       * is created, giving the agg type a chance to modify the agg config
-       */
-      this.decorateAggConfig = config.decorateAggConfig || null;
-
-      if (config.getFormat) {
-        this.getFormat = config.getFormat;
-      }
-    }
-
-    /**
-     * Pick a format for the values produced by this agg type,
-     * overriden by several metrics that always output a simple
-     * number
-     *
-     * @param  {agg} agg - the agg to pick a format for
-     * @return {FieldFromat}
-     */
-    AggType.prototype.getFormat = function (agg) {
-      var field = agg.field();
-      return field ? field.format : fieldFormats.getDefaultInstance('string');
-    };
-
-    return AggType;
-  };
-});
diff --git a/src/kibana/components/agg_types/buckets/_bucket_count_between.js b/src/kibana/components/agg_types/buckets/_bucket_count_between.js
deleted file mode 100644
index 59b5ebab12585..0000000000000
--- a/src/kibana/components/agg_types/buckets/_bucket_count_between.js
+++ /dev/null
@@ -1,44 +0,0 @@
-define(function (require) {
-  return function BucketCountBetweenUtil() {
-
-    /**
-     * Count the number of bucket aggs between two agg config objects owned
-     * by the same vis.
-     *
-     * If one of the two aggs was not found in the agg list, returns null.
-     * If a was found after b, the count will be negative
-     * If a was found first, the count will be positive.
-     *
-     * @param  {AggConfig} aggConfigA - the aggConfig that is expected first
-     * @param  {AggConfig} aggConfigB - the aggConfig that is expected second
-     * @return {null|number}
-     */
-    function bucketCountBetween(aggConfigA, aggConfigB) {
-      var aggs = aggConfigA.vis.aggs.getRequestAggs();
-
-      var aIndex = aggs.indexOf(aggConfigA);
-      var bIndex = aggs.indexOf(aggConfigB);
-
-      if (aIndex === -1 || bIndex === -1) {
-        return null;
-      }
-
-      // return a negative distance, if b is before a
-      var negative = (aIndex > bIndex);
-
-      var count = aggs
-        .slice(Math.min(aIndex, bIndex), Math.max(aIndex, bIndex))
-        .reduce(function (count, cfg) {
-          if (cfg === aggConfigA || cfg === aggConfigB || cfg.schema.group !== 'buckets') {
-            return count;
-          } else {
-            return count + 1;
-          }
-        }, 0);
-
-      return (negative ? -1 : 1) * count;
-    }
-
-    return bucketCountBetween;
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/agg_types/buckets/create_filter/date_histogram.js b/src/kibana/components/agg_types/buckets/create_filter/date_histogram.js
deleted file mode 100644
index acbecec937102..0000000000000
--- a/src/kibana/components/agg_types/buckets/create_filter/date_histogram.js
+++ /dev/null
@@ -1,17 +0,0 @@
-define(function (require) {
-  return function createDateHistogramFilterProvider(Private) {
-    var moment = require('moment');
-    var buildRangeFilter = require('components/filter_manager/lib/range');
-
-    return function (agg, key) {
-      var start = moment(key);
-      var interval = agg.buckets.getInterval();
-
-      return buildRangeFilter(agg.params.field, {
-        gte: start.valueOf(),
-        lte: start.add(interval).subtract(1, 'ms').valueOf()
-      }, agg.vis.indexPattern);
-    };
-
-  };
-});
diff --git a/src/kibana/components/agg_types/buckets/create_filter/date_range.js b/src/kibana/components/agg_types/buckets/create_filter/date_range.js
deleted file mode 100644
index f5710533ec97e..0000000000000
--- a/src/kibana/components/agg_types/buckets/create_filter/date_range.js
+++ /dev/null
@@ -1,19 +0,0 @@
-define(function (require) {
-  var dateRange = require('utils/date_range');
-
-  return function createDateRangeFilterProvider(config) {
-    var buildRangeFilter = require('components/filter_manager/lib/range');
-
-    return function (agg, key) {
-      var range = dateRange.parse(key, config.get('dateFormat'));
-
-      var filter = {};
-      if (range.from) filter.gte = +range.from;
-      if (range.to) filter.lt = +range.to;
-      if (range.to && range.from) filter.format = 'epoch_millis';
-
-      return buildRangeFilter(agg.params.field, filter, agg.vis.indexPattern);
-    };
-
-  };
-});
diff --git a/src/kibana/components/agg_types/buckets/create_filter/filters.js b/src/kibana/components/agg_types/buckets/create_filter/filters.js
deleted file mode 100644
index b8d2c1d96ec37..0000000000000
--- a/src/kibana/components/agg_types/buckets/create_filter/filters.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(function (require) {
-  var buildQueryFilter = require('components/filter_manager/lib/query');
-  var _ = require('lodash');
-  return function CreateFilterFiltersProvider(Private) {
-    return function (aggConfig, key) {
-      // have the aggConfig write agg dsl params
-      var dslFilters = _.get(aggConfig.toDsl(), 'filters.filters');
-      var filter = dslFilters[key];
-
-      if (filter) {
-        return buildQueryFilter(filter.query, aggConfig.vis.indexPattern.id);
-      }
-    };
-  };
-});
diff --git a/src/kibana/components/agg_types/buckets/create_filter/histogram.js b/src/kibana/components/agg_types/buckets/create_filter/histogram.js
deleted file mode 100644
index 302fec17e0709..0000000000000
--- a/src/kibana/components/agg_types/buckets/create_filter/histogram.js
+++ /dev/null
@@ -1,14 +0,0 @@
-define(function (require) {
-  var buildRangeFilter = require('components/filter_manager/lib/range');
-
-  return function createHistogramFitlerProvider(Private) {
-    return function (aggConfig, key) {
-      var value = parseInt(key, 10);
-
-      return buildRangeFilter(aggConfig.params.field, {
-        gte: value,
-        lt: value + aggConfig.params.interval
-      }, aggConfig.vis.indexPattern);
-    };
-  };
-});
diff --git a/src/kibana/components/agg_types/buckets/create_filter/ip_range.js b/src/kibana/components/agg_types/buckets/create_filter/ip_range.js
deleted file mode 100644
index 8ec5e1bd208b1..0000000000000
--- a/src/kibana/components/agg_types/buckets/create_filter/ip_range.js
+++ /dev/null
@@ -1,20 +0,0 @@
-define(function (require) {
-  var CidrMask = require('utils/cidr_mask');
-  var buildRangeFilter = require('components/filter_manager/lib/range');
-  return function createIpRangeFilterProvider() {
-    return function (aggConfig, key) {
-      var range;
-      if (aggConfig.params.ipRangeType === 'mask') {
-        range = new CidrMask(key).getRange();
-      } else {
-        var addresses = key.split(/\-/);
-        range = {
-          from: addresses[0],
-          to: addresses[1]
-        };
-      }
-
-      return buildRangeFilter(aggConfig.params.field, {gte: range.from, lte: range.to}, aggConfig.vis.indexPattern);
-    };
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/agg_types/buckets/create_filter/range.js b/src/kibana/components/agg_types/buckets/create_filter/range.js
deleted file mode 100644
index f3b74853d8291..0000000000000
--- a/src/kibana/components/agg_types/buckets/create_filter/range.js
+++ /dev/null
@@ -1,14 +0,0 @@
-define(function (require) {
-  var buildRangeFilter = require('components/filter_manager/lib/range');
-  return function createRangeFilterProvider(Private) {
-    return function (aggConfig, key) {
-      var splits = key.split(/\-/);
-      var gte = Number(splits[0]);
-      var lt = Number(splits[1]);
-      return buildRangeFilter(aggConfig.params.field, {
-        gte: gte,
-        lt: lt
-      }, aggConfig.vis.indexPattern);
-    };
-  };
-});
diff --git a/src/kibana/components/agg_types/buckets/create_filter/terms.js b/src/kibana/components/agg_types/buckets/create_filter/terms.js
deleted file mode 100644
index 0745be5b82890..0000000000000
--- a/src/kibana/components/agg_types/buckets/create_filter/terms.js
+++ /dev/null
@@ -1,8 +0,0 @@
-define(function (require) {
-  var buildPhraseFilter = require('components/filter_manager/lib/phrase');
-  return function createTermsFilterProvider(Private) {
-    return function (aggConfig, key) {
-      return buildPhraseFilter(aggConfig.params.field, key, aggConfig.vis.indexPattern);
-    };
-  };
-});
diff --git a/src/kibana/components/agg_types/buckets/date_histogram.js b/src/kibana/components/agg_types/buckets/date_histogram.js
deleted file mode 100644
index 33f0ea8c7b822..0000000000000
--- a/src/kibana/components/agg_types/buckets/date_histogram.js
+++ /dev/null
@@ -1,154 +0,0 @@
-define(function (require) {
-  return function DateHistogramAggType(timefilter, config, Private) {
-    var _ = require('lodash');
-    var moment = require('moment');
-    var BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
-    var TimeBuckets = Private(require('components/time_buckets/time_buckets'));
-    var createFilter = Private(require('components/agg_types/buckets/create_filter/date_histogram'));
-    var intervalOptions = Private(require('components/agg_types/buckets/_interval_options'));
-
-    var tzOffset = moment().format('Z');
-
-    function getInterval(agg) {
-      var interval = _.get(agg, ['params', 'interval']);
-      if (interval && interval.val === 'custom') interval = _.get(agg, ['params', 'customInterval']);
-      return interval;
-    }
-
-    function setBounds(agg, force) {
-      if (agg.buckets._alreadySet && !force) return;
-      agg.buckets._alreadySet = true;
-      agg.buckets.setBounds(agg.fieldIsTimeField() && timefilter.getActiveBounds());
-    }
-
-    require('filters/field_type');
-    require('components/validateDateInterval');
-
-    return new BucketAggType({
-      name: 'date_histogram',
-      title: 'Date Histogram',
-      ordered: {
-        date: true
-      },
-      makeLabel: function (agg) {
-        var output = this.params.write(agg);
-        var params = output.params;
-        return params.field + ' per ' + (output.metricScaleText || output.bucketInterval.description);
-      },
-      createFilter: createFilter,
-      decorateAggConfig: function () {
-        var buckets;
-        return {
-          buckets: {
-            configurable: true,
-            get: function () {
-              if (buckets) return buckets;
-
-              buckets = new TimeBuckets();
-              buckets.setInterval(getInterval(this));
-              setBounds(this);
-
-              return buckets;
-            }
-          }
-        };
-      },
-      params: [
-        {
-          name: 'field',
-          filterFieldTypes: 'date',
-          default: function (agg) {
-            return agg.vis.indexPattern.timeFieldName;
-          },
-          onChange: function (agg) {
-            if (_.get(agg, 'params.interval.val') === 'auto' && !agg.fieldIsTimeField()) {
-              delete agg.params.interval;
-            }
-
-            setBounds(agg, true);
-          }
-        },
-
-        {
-          name: 'interval',
-          type: 'optioned',
-          deserialize: function (state) {
-            var interval = _.find(intervalOptions, {val: state});
-            return interval || _.find(intervalOptions, function (option) {
-              // For upgrading from 4.0.x to 4.1.x - intervals are now stored as 'y' instead of 'year',
-              // but this maps the old values to the new values
-              return Number(moment.duration(1, state)) === Number(moment.duration(1, option.val));
-            });
-          },
-          default: 'auto',
-          options: intervalOptions,
-          editor: require('text!components/agg_types/controls/interval.html'),
-          onRequest: function (agg) {
-            setBounds(agg, true);
-          },
-          write: function (agg, output) {
-            setBounds(agg);
-            agg.buckets.setInterval(getInterval(agg));
-
-            var interval = agg.buckets.getInterval();
-            output.bucketInterval = interval;
-            output.params.interval = interval.expression;
-            output.params.time_zone = tzOffset;
-
-            var scaleMetrics = interval.scaled && interval.scale < 1;
-            if (scaleMetrics) {
-              scaleMetrics = _.every(agg.vis.aggs.bySchemaGroup.metrics, function (agg) {
-                return agg.type && (agg.type.name === 'count' || agg.type.name === 'sum');
-              });
-            }
-
-            if (scaleMetrics) {
-              output.metricScale = interval.scale;
-              output.metricScaleText = interval.preScaled.description;
-            }
-          }
-        },
-
-        {
-          name: 'customInterval',
-          default: '2h',
-          write: _.noop
-        },
-
-        {
-          name: 'format'
-        },
-
-        {
-          name: 'min_doc_count',
-          default: 1
-        },
-
-        {
-          name: 'extended_bounds',
-          default: {},
-          write: function (agg, output) {
-            var val = agg.params.extended_bounds;
-
-            if (val.min != null || val.max != null) {
-              output.params.extended_bounds = {
-                min: moment(val.min).valueOf(),
-                max: moment(val.max).valueOf()
-              };
-
-              return;
-            }
-
-            var bounds = timefilter.getActiveBounds();
-            if (bounds) {
-              output.params.extended_bounds = {
-                min: moment(bounds.min).valueOf(),
-                max: moment(bounds.max).valueOf()
-              };
-            }
-          }
-        }
-      ]
-    });
-  };
-});
diff --git a/src/kibana/components/agg_types/buckets/date_range.js b/src/kibana/components/agg_types/buckets/date_range.js
deleted file mode 100644
index e45024c9bf8ef..0000000000000
--- a/src/kibana/components/agg_types/buckets/date_range.js
+++ /dev/null
@@ -1,47 +0,0 @@
-define(function (require) {
-  var moment = require('moment');
-  var dateRange = require('utils/date_range');
-  require('directives/validate_date_math');
-
-  return function DateRangeAggDefinition(Private, config) {
-    var BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
-    var createFilter = Private(require('components/agg_types/buckets/create_filter/date_range'));
-    var fieldFormats = Private(require('registry/field_formats'));
-
-
-    return new BucketAggType({
-      name: 'date_range',
-      title: 'Date Range',
-      createFilter: createFilter,
-      getKey: function (bucket, key, agg) {
-        var formatter;
-        if (agg.field()) {
-          formatter = agg.field().format.getConverterFor('text');
-        } else {
-          formatter = fieldFormats.getDefaultInstance('date').getConverterFor('text');
-        }
-        return dateRange.toString(bucket, formatter);
-      },
-      getFormat: function () {
-        return fieldFormats.getDefaultInstance('string');
-      },
-      makeLabel: function (aggConfig) {
-        return aggConfig.params.field.displayName + ' date ranges';
-      },
-      params: [{
-        name: 'field',
-        filterFieldTypes: 'date',
-        default: function (agg) {
-          return agg.vis.indexPattern.timeFieldName;
-        }
-      }, {
-        name: 'ranges',
-        default: [{
-          from: 'now-1w/w',
-          to: 'now'
-        }],
-        editor: require('text!components/agg_types/controls/date_ranges.html')
-      }]
-    });
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/agg_types/buckets/filters.js b/src/kibana/components/agg_types/buckets/filters.js
deleted file mode 100644
index 5066233309c43..0000000000000
--- a/src/kibana/components/agg_types/buckets/filters.js
+++ /dev/null
@@ -1,45 +0,0 @@
-define(function (require) {
-  return function FiltersAggDefinition(Private, Notifier) {
-    var _ = require('lodash');
-    var angular = require('angular');
-    var BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
-    var createFilter = Private(require('components/agg_types/buckets/create_filter/filters'));
-    var decorateQuery = Private(require('components/courier/data_source/_decorate_query'));
-    var notif = new Notifier({ location: 'Filters Agg' });
-
-    return new BucketAggType({
-      name: 'filters',
-      title: 'Filters',
-      createFilter: createFilter,
-      params: [
-        {
-          name: 'filters',
-          editor: require('text!components/agg_types/controls/filters.html'),
-          default: [ {input: {}, label: ''} ],
-          write: function (aggConfig, output) {
-            var inFilters = aggConfig.params.filters;
-            if (!_.size(inFilters)) return;
-
-            var outFilters = _.transform(inFilters, function (filters, filter) {
-              var input = filter.input;
-              if (!input) return notif.log('malformed filter agg params, missing "input" query');
-
-              var query = input.query;
-              if (!query) return notif.log('malformed filter agg params, missing "query" on input');
-
-              decorateQuery(query);
-
-              var label = filter.label || _.get(query, 'query_string.query') || angular.toJson(query);
-              filters[label] = input;
-            }, {});
-
-            if (!_.size(outFilters)) return;
-
-            var params = output.params || (output.params = {});
-            params.filters = outFilters;
-          }
-        }
-      ]
-    });
-  };
-});
diff --git a/src/kibana/components/agg_types/buckets/histogram.js b/src/kibana/components/agg_types/buckets/histogram.js
deleted file mode 100644
index ccdf664c5ab68..0000000000000
--- a/src/kibana/components/agg_types/buckets/histogram.js
+++ /dev/null
@@ -1,72 +0,0 @@
-define(function (require) {
-  return function HistogramAggDefinition(Private) {
-    var _ = require('lodash');
-    var moment = require('moment');
-    var BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
-    var createFilter = Private(require('components/agg_types/buckets/create_filter/histogram'));
-
-    require('components/validateDateInterval');
-
-    return new BucketAggType({
-      name: 'histogram',
-      title: 'Histogram',
-      ordered: {},
-      makeLabel: function (aggConfig) {
-        return aggConfig.params.field.displayName;
-      },
-      createFilter: createFilter,
-      params: [
-        {
-          name: 'field',
-          filterFieldTypes: 'number'
-        },
-
-        {
-          name: 'interval',
-          editor: require('text!components/agg_types/controls/interval.html'),
-          write: function (aggConfig, output) {
-            output.params.interval = parseInt(aggConfig.params.interval, 10);
-          }
-        },
-
-        {
-          name: 'min_doc_count',
-          default: null,
-          editor: require('text!components/agg_types/controls/min_doc_count.html'),
-          write: function (aggConfig, output) {
-            if (aggConfig.params.min_doc_count) {
-              output.params.min_doc_count = 0;
-            }
-          }
-        },
-
-        {
-          name: 'extended_bounds',
-          default: {},
-          editor: require('text!components/agg_types/controls/extended_bounds.html'),
-          write: function (aggConfig, output) {
-            var val = aggConfig.params.extended_bounds;
-
-            if (val.min != null || val.max != null) {
-              output.params.extended_bounds = {
-                min: val.min,
-                max: val.max
-              };
-            }
-          },
-
-          // called from the editor
-          shouldShow: function (aggConfig) {
-            var field = aggConfig.params.field;
-            if (
-              field
-              && (field.type === 'number' || field.type === 'date')
-            ) {
-              return aggConfig.params.min_doc_count;
-            }
-          }
-        }
-      ]
-    });
-  };
-});
diff --git a/src/kibana/components/agg_types/buckets/ip_range.js b/src/kibana/components/agg_types/buckets/ip_range.js
deleted file mode 100644
index 80d4f5491d6a4..0000000000000
--- a/src/kibana/components/agg_types/buckets/ip_range.js
+++ /dev/null
@@ -1,46 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  require('directives/validate_ip');
-  require('directives/validate_cidr_mask');
-
-  return function RangeAggDefinition(Private) {
-    var BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
-    var createFilter = Private(require('components/agg_types/buckets/create_filter/ip_range'));
-
-    return new BucketAggType({
-      name: 'ip_range',
-      title: 'IPv4 Range',
-      createFilter: createFilter,
-      makeLabel: function (aggConfig) {
-        return aggConfig.params.field.displayName + ' IP ranges';
-      },
-      params: [
-        {
-          name: 'field',
-          filterFieldTypes: 'ip'
-        }, {
-          name: 'ipRangeType',
-          default: 'fromTo',
-          write: _.noop
-        }, {
-          name: 'ranges',
-          default: {
-            fromTo: [
-              {from: '0.0.0.0', to: '127.255.255.255'},
-              {from: '128.0.0.0', to: '191.255.255.255'}
-            ],
-            mask: [
-              {mask: '0.0.0.0/1'},
-              {mask: '128.0.0.0/2'}
-            ]
-          },
-          editor: require('text!components/agg_types/controls/ip_ranges.html'),
-          write: function (aggConfig, output) {
-            var ipRangeType = aggConfig.params.ipRangeType;
-            output.params.ranges = aggConfig.params.ranges[ipRangeType];
-          }
-        }
-      ]
-    });
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/agg_types/buckets/range.js b/src/kibana/components/agg_types/buckets/range.js
deleted file mode 100644
index a6433716602e4..0000000000000
--- a/src/kibana/components/agg_types/buckets/range.js
+++ /dev/null
@@ -1,36 +0,0 @@
-define(function (require) {
-  return function RangeAggDefinition(Private) {
-    var _ = require('lodash');
-    var moment = require('moment');
-    var angular = require('angular');
-    var BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
-    var createFilter = Private(require('components/agg_types/buckets/create_filter/range'));
-
-    return new BucketAggType({
-      name: 'range',
-      title: 'Range',
-      createFilter: createFilter,
-      makeLabel: function (aggConfig) {
-        return aggConfig.params.field.displayName + ' ranges';
-      },
-      params: [
-        {
-          name: 'field',
-          filterFieldTypes: ['number']
-        },
-        {
-          name: 'ranges',
-          default: [
-            { from: 0, to: 1000 },
-            { from: 1000, to: 2000 }
-          ],
-          editor: require('text!components/agg_types/controls/ranges.html'),
-          write: function (aggConfig, output) {
-            output.params.ranges = aggConfig.params.ranges;
-            output.params.keyed = true;
-          }
-        }
-      ]
-    });
-  };
-});
diff --git a/src/kibana/components/agg_types/buckets/significant_terms.js b/src/kibana/components/agg_types/buckets/significant_terms.js
deleted file mode 100644
index 57233333ebfd3..0000000000000
--- a/src/kibana/components/agg_types/buckets/significant_terms.js
+++ /dev/null
@@ -1,36 +0,0 @@
-define(function (require) {
-  return function SignificantTermsAggDefinition(Private) {
-    var _ = require('lodash');
-    var BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
-    var createFilter = Private(require('components/agg_types/buckets/create_filter/terms'));
-
-    return new BucketAggType({
-      name: 'significant_terms',
-      title: 'Significant Terms',
-      makeLabel: function (aggConfig) {
-        return 'Top ' + aggConfig.params.size + ' unusual terms in ' + aggConfig.params.field.displayName;
-      },
-      createFilter: createFilter,
-      params: [
-        {
-          name: 'field',
-          filterFieldTypes: 'string'
-        },
-        {
-          name: 'size',
-          editor: require('text!components/agg_types/controls/order_and_size.html'),
-        },
-        {
-          name: 'exclude',
-          type: 'regex',
-          advanced: true
-        },
-        {
-          name: 'include',
-          type: 'regex',
-          advanced: true
-        }
-      ]
-    });
-  };
-});
diff --git a/src/kibana/components/agg_types/buckets/terms.js b/src/kibana/components/agg_types/buckets/terms.js
deleted file mode 100644
index c8277ffca7b0b..0000000000000
--- a/src/kibana/components/agg_types/buckets/terms.js
+++ /dev/null
@@ -1,177 +0,0 @@
-define(function (require) {
-  return function TermsAggDefinition(Private) {
-    var _ = require('lodash');
-    var BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
-    var bucketCountBetween = Private(require('components/agg_types/buckets/_bucket_count_between'));
-    var AggConfig = Private(require('components/vis/AggConfig'));
-    var Schemas = Private(require('components/vis/Schemas'));
-    var createFilter = Private(require('components/agg_types/buckets/create_filter/terms'));
-
-    var orderAggSchema = (new Schemas([
-      {
-        group: 'none',
-        name: 'orderAgg',
-        title: 'Order Agg',
-        aggFilter: ['!percentiles', '!median', '!std_dev']
-      }
-    ])).all[0];
-
-    function isNotType(type) {
-      return function (agg) {
-        var field = agg.params.field;
-        return !field || field.type !== type;
-      };
-    }
-
-    return new BucketAggType({
-      name: 'terms',
-      title: 'Terms',
-      makeLabel: function (agg) {
-        var params = agg.params;
-        return params.field.displayName + ': ' + params.order.display;
-      },
-      createFilter: createFilter,
-      params: [
-        {
-          name: 'field',
-          scriptable: true,
-          filterFieldTypes: ['number', 'boolean', 'date', 'ip',  'string']
-        },
-        {
-          name: 'exclude',
-          type: 'regex',
-          advanced: true,
-          disabled: isNotType('string')
-        },
-        {
-          name: 'include',
-          type: 'regex',
-          advanced: true,
-          disabled: isNotType('string')
-        },
-        {
-          name: 'size',
-          default: 5
-        },
-        {
-          name: 'orderAgg',
-          type: AggConfig,
-          default: null,
-          editor: require('text!components/agg_types/controls/order_agg.html'),
-          serialize: function (orderAgg) {
-            return orderAgg.toJSON();
-          },
-          deserialize: function (state, agg) {
-            return this.makeOrderAgg(agg, state);
-          },
-          makeOrderAgg: function (termsAgg, state) {
-            state = state || {};
-            state.schema = orderAggSchema;
-            var orderAgg = new AggConfig(termsAgg.vis, state);
-            orderAgg.id = termsAgg.id + '-orderAgg';
-            return orderAgg;
-          },
-          controller: function ($scope) {
-            $scope.safeMakeLabel = function (agg) {
-              try {
-                return agg.makeLabel();
-              } catch (e) {
-                return '- agg not valid -';
-              }
-            };
-
-            var INIT = {}; // flag to know when prevOrderBy has changed
-            var prevOrderBy = INIT;
-
-            $scope.$watch('responseValueAggs', updateOrderAgg);
-            $scope.$watch('agg.params.orderBy', updateOrderAgg);
-
-            function updateOrderAgg() {
-              var agg = $scope.agg;
-              var aggs = agg.vis.aggs;
-              var params = agg.params;
-              var orderBy = params.orderBy;
-              var paramDef = agg.type.params.byName.orderAgg;
-
-              // setup the initial value of orderBy
-              if (!orderBy && prevOrderBy === INIT) {
-                // abort until we get the responseValueAggs
-                if (!$scope.responseValueAggs) return;
-                params.orderBy = (_.first($scope.responseValueAggs) || { id: 'custom' }).id;
-                return;
-              }
-
-              // track the previous value
-              prevOrderBy = orderBy;
-
-              // we aren't creating a custom aggConfig
-              if (!orderBy || orderBy !== 'custom') {
-                params.orderAgg = null;
-
-                if (orderBy === '_term') {
-                  params.orderBy = '_term';
-                  return;
-                }
-
-                // ensure that orderBy is set to a valid agg
-                if (!_.find($scope.responseValueAggs, { id: orderBy })) {
-                  params.orderBy = null;
-                }
-                return;
-              }
-
-              params.orderAgg = params.orderAgg || paramDef.makeOrderAgg(agg);
-            }
-          },
-          write: function (agg, output) {
-            var vis = agg.vis;
-            var dir = agg.params.order.val;
-            var order = output.params.order = {};
-
-            var orderAgg = agg.params.orderAgg || vis.aggs.getResponseAggById(agg.params.orderBy);
-
-            // TODO: This works around an Elasticsearch bug the always casts terms agg scripts to strings
-            // thus causing issues with filtering. This probably causes other issues since float might not
-            // be able to contain the number on the elasticsearch side
-            if (output.params.script) {
-              output.params.valueType = agg.field().type === 'number' ? 'float' : agg.field().type;
-            }
-
-            if (!orderAgg) {
-              order[agg.params.orderBy || '_count'] = dir;
-              return;
-            }
-
-            if (orderAgg.type.name === 'count') {
-              order._count = dir;
-              return;
-            }
-
-            var orderAggId = orderAgg.id;
-            if (orderAgg.parentId) {
-              orderAgg = vis.aggs.byId[orderAgg.parentId];
-            }
-
-            output.subAggs = (output.subAggs || []).concat(orderAgg);
-            order[orderAggId] = dir;
-          }
-        },
-        {
-          name: 'order',
-          type: 'optioned',
-          default: 'desc',
-          editor: require('text!components/agg_types/controls/order_and_size.html'),
-          options: [
-            { display: 'Descending', val: 'desc' },
-            { display: 'Ascending', val: 'asc' }
-          ],
-          write: _.noop // prevent default write, it's handled by orderAgg
-        },
-        {
-          name: 'orderBy',
-          write: _.noop // prevent default write, it's handled by orderAgg
-        }
-      ]
-    });
-  };
-});
diff --git a/src/kibana/components/agg_types/index.js b/src/kibana/components/agg_types/index.js
deleted file mode 100644
index 69ce391f0ca0d..0000000000000
--- a/src/kibana/components/agg_types/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-define(function (require) {
-  return function AggTypeService(Private) {
-    var IndexedArray = require('utils/indexed_array/index');
-
-    var aggs = {
-      metrics: [
-        Private(require('components/agg_types/metrics/count')),
-        Private(require('components/agg_types/metrics/avg')),
-        Private(require('components/agg_types/metrics/sum')),
-        Private(require('components/agg_types/metrics/median')),
-        Private(require('components/agg_types/metrics/min')),
-        Private(require('components/agg_types/metrics/max')),
-        Private(require('components/agg_types/metrics/std_deviation')),
-        Private(require('components/agg_types/metrics/cardinality')),
-        Private(require('components/agg_types/metrics/percentiles')),
-        Private(require('components/agg_types/metrics/percentile_ranks'))
-      ],
-      buckets: [
-        Private(require('components/agg_types/buckets/date_histogram')),
-        Private(require('components/agg_types/buckets/histogram')),
-        Private(require('components/agg_types/buckets/range')),
-        Private(require('components/agg_types/buckets/date_range')),
-        Private(require('components/agg_types/buckets/ip_range')),
-        Private(require('components/agg_types/buckets/terms')),
-        Private(require('components/agg_types/buckets/filters')),
-        Private(require('components/agg_types/buckets/significant_terms')),
-        Private(require('components/agg_types/buckets/geo_hash'))
-      ]
-    };
-
-    Object.keys(aggs).forEach(function (type) {
-      aggs[type].forEach(function (agg) {
-        agg.type = type;
-      });
-    });
-
-
-    /**
-     * IndexedArray of Aggregation Types.
-     *
-     * These types form two groups, metric and buckets.
-     *
-     * @module agg_types
-     * @type {IndexedArray}
-     */
-    return new IndexedArray({
-
-      /**
-       * @type {Array}
-       */
-      index: ['name'],
-
-      /**
-       * [group description]
-       * @type {Array}
-       */
-      group: ['type'],
-      initialSet: aggs.metrics.concat(aggs.buckets)
-    });
-  };
-});
diff --git a/src/kibana/components/agg_types/metrics/_metric_agg_type.js b/src/kibana/components/agg_types/metrics/_metric_agg_type.js
deleted file mode 100644
index e7808ec3f0642..0000000000000
--- a/src/kibana/components/agg_types/metrics/_metric_agg_type.js
+++ /dev/null
@@ -1,43 +0,0 @@
-define(function (require) {
-  return function MetricAggTypeProvider(Private) {
-    var _ = require('lodash');
-    var AggType = Private(require('components/agg_types/_agg_type'));
-    var fieldFormats = Private(require('registry/field_formats'));
-
-    _.class(MetricAggType).inherits(AggType);
-    function MetricAggType(config) {
-      MetricAggType.Super.call(this, config);
-
-      // allow overriding any value on the prototype
-      _.forOwn(config, function (val, key) {
-        if (_.has(MetricAggType.prototype, key)) {
-          this[key] = val;
-        }
-      }, this);
-    }
-
-    /**
-     * Read the values for this metric from the
-     * @param  {[type]} bucket [description]
-     * @return {[type]}        [description]
-     */
-    MetricAggType.prototype.getValue = function (agg, bucket) {
-      return bucket[agg.id].value;
-    };
-
-    /**
-     * Pick a format for the values produced by this agg type,
-     * overriden by several metrics that always output a simple
-     * number
-     *
-     * @param  {agg} agg - the agg to pick a format for
-     * @return {FieldFromat}
-     */
-    MetricAggType.prototype.getFormat = function (agg) {
-      var field = agg.field();
-      return field ? field.format : fieldFormats.getDefaultInstance('number');
-    };
-
-    return MetricAggType;
-  };
-});
diff --git a/src/kibana/components/agg_types/metrics/count.js b/src/kibana/components/agg_types/metrics/count.js
deleted file mode 100644
index 8b6de55ff0c4d..0000000000000
--- a/src/kibana/components/agg_types/metrics/count.js
+++ /dev/null
@@ -1,21 +0,0 @@
-define(function (require) {
-  return function AggTypeMetricCountProvider(Private) {
-    var MetricAggType = Private(require('components/agg_types/metrics/_metric_agg_type'));
-    var fieldFormats = Private(require('registry/field_formats'));
-
-    return new MetricAggType({
-      name: 'count',
-      title: 'Count',
-      hasNoDsl: true,
-      makeLabel: function () {
-        return 'Count';
-      },
-      getFormat: function () {
-        return fieldFormats.getDefaultInstance('number');
-      },
-      getValue: function (agg, bucket) {
-        return bucket.doc_count;
-      }
-    });
-  };
-});
diff --git a/src/kibana/components/agg_types/metrics/median.js b/src/kibana/components/agg_types/metrics/median.js
deleted file mode 100644
index 8efdd2e93c20d..0000000000000
--- a/src/kibana/components/agg_types/metrics/median.js
+++ /dev/null
@@ -1,29 +0,0 @@
-define(function (require) {
-  return function AggTypeMetricMaxProvider(Private) {
-    var _ = require('lodash');
-    var MetricAggType = Private(require('components/agg_types/metrics/_metric_agg_type'));
-    var getResponseAggConfig = Private(require('components/agg_types/metrics/_get_response_agg_config'));
-    var percentiles = Private(require('components/agg_types/metrics/percentiles'));
-
-    return new MetricAggType({
-      name: 'median',
-      dslName: 'percentiles',
-      title: 'Median',
-      makeLabel: function (aggConfig) {
-        return 'Median ' + aggConfig.params.field.displayName;
-      },
-      params: [
-        {
-          name: 'field',
-          filterFieldTypes: 'number'
-        },
-        {
-          name: 'percents',
-          default: [50]
-        }
-      ],
-      getResponseAggs: percentiles.getResponseAggs,
-      getValue: percentiles.getValue
-    });
-  };
-});
diff --git a/src/kibana/components/agg_types/metrics/percentiles.js b/src/kibana/components/agg_types/metrics/percentiles.js
deleted file mode 100644
index a79352ae21a49..0000000000000
--- a/src/kibana/components/agg_types/metrics/percentiles.js
+++ /dev/null
@@ -1,53 +0,0 @@
-define(function (require) {
-  return function AggTypeMetricPercentilesProvider(Private) {
-    var _ = require('lodash');
-
-    var MetricAggType = Private(require('components/agg_types/metrics/_metric_agg_type'));
-    var getResponseAggConfig = Private(require('components/agg_types/metrics/_get_response_agg_config'));
-    var ordinalSuffix = require('utils/ordinal_suffix');
-    var fieldFormats = Private(require('registry/field_formats'));
-
-    var percentsEditor = require('text!components/agg_types/controls/percentiles.html');
-    // required by the percentiles editor
-    require('components/number_list/number_list');
-
-    var valueProps = {
-      makeLabel: function () {
-        return ordinalSuffix(this.key) + ' percentile of ' + this.fieldDisplayName();
-      }
-    };
-
-    return new MetricAggType({
-      name: 'percentiles',
-      title: 'Percentiles',
-      makeLabel: function (agg) {
-        return 'Percentiles of ' + agg.fieldDisplayName();
-      },
-      params: [
-        {
-          name: 'field',
-          filterFieldTypes: 'number'
-        },
-        {
-          name: 'percents',
-          editor: percentsEditor,
-          default: [1, 5, 25, 50, 75, 95, 99]
-        }
-      ],
-      getResponseAggs: function (agg) {
-        var ValueAggConfig = getResponseAggConfig(agg, valueProps);
-
-        return agg.params.percents.map(function (percent) {
-          return new ValueAggConfig(percent);
-        });
-      },
-      getValue: function (agg, bucket) {
-        // percentiles for 1, 5, and 10 will come back as 1.0, 5.0, and 10.0 so we
-        // parse the keys and respond with the value that matches
-        return _.find(bucket[agg.parentId].values, function (value, key) {
-          return agg.key === parseFloat(key);
-        });
-      }
-    });
-  };
-});
diff --git a/src/kibana/components/agg_types/metrics/std_deviation.js b/src/kibana/components/agg_types/metrics/std_deviation.js
deleted file mode 100644
index 65d35c452c937..0000000000000
--- a/src/kibana/components/agg_types/metrics/std_deviation.js
+++ /dev/null
@@ -1,61 +0,0 @@
-define(function (require) {
-  return function AggTypeMetricStandardDeviationProvider(Private) {
-    var _ = require('lodash');
-    var MetricAggType = Private(require('components/agg_types/metrics/_metric_agg_type'));
-    var getResponseAggConfig = Private(require('components/agg_types/metrics/_get_response_agg_config'));
-
-    var responseAggConfigProps = {
-      valProp: function () {
-        var details = this.keyedDetails[this.key];
-        return details.valProp;
-      },
-      makeLabel: function () {
-        var details = this.keyedDetails[this.key];
-        return details.title + ' of ' + this.fieldDisplayName();
-      },
-      keyedDetails: {
-        std_lower: {
-          valProp: ['std_deviation_bounds', 'lower'],
-          title: 'Lower Standard Deviation'
-        },
-        avg: {
-          valProp: 'avg',
-          title: 'Average'
-        },
-        std_upper: {
-          valProp: ['std_deviation_bounds', 'upper'],
-          title: 'Upper Standard Deviation'
-        }
-      }
-    };
-
-    return new MetricAggType({
-      name: 'std_dev',
-      dslName: 'extended_stats',
-      title: 'Standard Deviation',
-      makeLabel: function (agg) {
-        return 'Standard Deviation of ' + agg.fieldDisplayName();
-      },
-      params: [
-        {
-          name: 'field',
-          filterFieldTypes: 'number'
-        }
-      ],
-
-      getResponseAggs: function (agg) {
-        var ValueAggConfig = getResponseAggConfig(agg, responseAggConfigProps);
-
-        return [
-          new ValueAggConfig('std_lower'),
-          new ValueAggConfig('avg'),
-          new ValueAggConfig('std_upper')
-        ];
-      },
-
-      getValue: function (agg, bucket) {
-        return _.get(bucket[agg.parentId], agg.valProp());
-      }
-    });
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/bind.js b/src/kibana/components/bind.js
deleted file mode 100644
index bb136d569d262..0000000000000
--- a/src/kibana/components/bind.js
+++ /dev/null
@@ -1,80 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
-
-  require('modules').get('kibana')
-  .config(function ($provide) {
-
-    function strictEquality(a, b) {
-      // are the values equal? or, are they both NaN?
-      return a === b || (a !== a && b !== b);
-    }
-
-    function errorNotAssignable(source, target) {
-      throw Error('Unable to accept change to bound $scope property "' + source + '"' +
-        ' because source expression "' + target + '" is not assignable!');
-    }
-
-    $provide.decorator('$rootScope', function ($delegate, $parse) {
-      /**
-       * Two-way bind a value from scope to another property on scope. This
-       * allow values on scope that work like they do in an isolate scope, but
-       * without requiring one.
-       *
-       * @param  {expression} to - the location on scope to bind to
-       * @param  {expression} from - the location on scope to bind from
-       * @param  {Scope} $sourceScope - the scope to read "from" expression from
-       * @return {undefined}
-       */
-      $delegate.constructor.prototype.$bind = function (to, from, $sourceScope) {
-        var $source = $sourceScope || this.$parent;
-        var $target = this;
-
-        // parse expressions
-        var $to = $parse(to);
-        if (!$to.assign) errorNotAssignable(to, from);
-        var $from = $parse(from);
-        $from.assignOrFail = $from.assign || function () {
-          // revert the change and throw an error, child writes aren't supported
-          $to($target, lastSourceVal = $from($source));
-          errorNotAssignable(from, to);
-        };
-
-        // bind scopes to expressions
-        var getTarget = function () { return $to($target); };
-        var setTarget = function (v) { return $to.assign($target, v); };
-        var getSource = function () { return $from($source); };
-        var setSource = function (v) { return $from.assignOrFail($source, v); };
-
-        // if we are syncing down a literal, then we use loose equality check
-        var strict = !$from.literal;
-        var compare = strict ? strictEquality : angular.equals;
-
-        // to support writing from the child to the parent we need to know
-        // which source has changed. Track the source value and anytime it
-        // changes (even if the target value changed too) push from source
-        // to target. If the source hasn't changed then the change is from
-        // the target and push accordingly
-        var lastSourceVal = getSource();
-
-        // push the initial value down, start off in sync
-        setTarget(lastSourceVal);
-
-        $target.$watch(function () {
-          var sourceVal = getSource();
-          var targetVal = getTarget();
-
-          var outOfSync = !compare(sourceVal, targetVal);
-          var sourceChanged = outOfSync && !compare(sourceVal, lastSourceVal);
-
-          if (sourceChanged) setTarget(sourceVal);
-          else if (outOfSync) setSource(targetVal);
-
-          return lastSourceVal = sourceVal;
-        }, null, !strict);
-      };
-
-      return $delegate;
-    });
-  });
-});
diff --git a/src/kibana/components/clipboard/clipboard.js b/src/kibana/components/clipboard/clipboard.js
deleted file mode 100644
index 46f99320153d0..0000000000000
--- a/src/kibana/components/clipboard/clipboard.js
+++ /dev/null
@@ -1,49 +0,0 @@
-define(function (require) {
-  // ng-clip expects ZeroClipboard to be global, but it's AMD, so it never is
-  var ZeroClipboard = window.ZeroClipboard = require('zeroclipboard');
-  require('ng-clip');
-
-  var $ = require('jquery');
-  var html = require('text!components/clipboard/clipboard.html');
-  var module = require('modules').get('kibana');
-
-  module.directive('kbnClipboard', function ($compile, $timeout) {
-    return {
-      restrict: 'E',
-      template: html,
-      replace: true,
-      scope: {
-        copyText: '=copy'
-      },
-      transclude: true,
-      link: function ($scope, $el, attr) {
-        if (ZeroClipboard.isFlashUnusable()) {
-          $scope.disabled = true;
-          return;
-        }
-
-        $scope.tipPlacement = attr.tipPlacement || 'top';
-        $scope.tipText = attr.tipText || 'Copy to clipboard';
-        $scope.tipConfirm = attr.tipConfirm = 'Copied!';
-        $scope.icon = attr.icon || 'fa-clipboard';
-
-        $scope.shownText = $scope.tipText;
-
-        $el.on('click', function () {
-          $scope.shownText = $scope.tipConfirm;
-          // Reposition tooltip to account for text length change
-          $('a', $el).mouseenter();
-        });
-
-        $el.on('mouseleave', function () {
-          $scope.shownText = $scope.tipText;
-        });
-
-        $scope.$on('$destroy', function () {
-          $el.off('click');
-          $el.off('mouseleave');
-        });
-      }
-    };
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/components/comma_list_filter.js b/src/kibana/components/comma_list_filter.js
deleted file mode 100644
index 7af78739743c1..0000000000000
--- a/src/kibana/components/comma_list_filter.js
+++ /dev/null
@@ -1,26 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  require('modules')
-  .get('kibana')
-  .filter('commaList', function () {
-    /**
-     * Angular filter that accepts either an array or a comma-seperated string
-     * and outputs either an array, or a comma-seperated string for presentation.
-     *
-     * @param {String|Array} input - The comma-seperated list or array
-     * @param {Boolean} inclusive - Should the list be joined with an "and"?
-     * @return {String}
-     */
-    return function (input, inclusive) {
-      var list = _.commaSeperatedList(input);
-      if (list.length < 2) {
-        return list.join('');
-      }
-
-      var conj = inclusive ? ' and ' : ' or ';
-      return list.slice(0, -1).join(', ') + conj + _.last(list);
-
-    };
-  });
-});
diff --git a/src/kibana/components/config/config.js b/src/kibana/components/config/config.js
deleted file mode 100644
index b47a05e7f87e1..0000000000000
--- a/src/kibana/components/config/config.js
+++ /dev/null
@@ -1,166 +0,0 @@
-define(function (require) {
-  var module = require('modules').get('kibana/config', [
-    'kibana/notify'
-  ]);
-
-  var configFile = JSON.parse(require('text!config'));
-  configFile.elasticsearch = (function () {
-    var a = document.createElement('a');
-    a.href = 'elasticsearch';
-    return a.href;
-  }());
-
-  // allow the rest of the app to get the configFile easily
-  module.constant('configFile', configFile);
-
-  // service for delivering config variables to everywhere else
-  module.service('config', function (Private, Notifier, kbnVersion, kbnSetup, $rootScope, buildNum) {
-    var config = this;
-
-    var angular = require('angular');
-    var _ = require('lodash');
-    var defaults = Private(require('components/config/defaults'));
-    var DelayedUpdater = Private(require('components/config/_delayed_updater'));
-    var vals = Private(require('components/config/_vals'));
-
-    var notify = new Notifier({
-      location: 'Config'
-    });
-
-    // active or previous instance of DelayedUpdater. This will log and then process an
-    // update once it is requested by calling #set() or #clear().
-    var updater;
-
-    var DocSource = Private(require('components/courier/data_source/doc_source'));
-    var doc = (new DocSource())
-      .index(configFile.kibana_index)
-      .type('config')
-      .id(kbnVersion);
-
-    /******
-     * PUBLIC API
-     ******/
-
-    config.file = configFile;
-
-    /**
-     * Executes once and returns a promise that is resolved once the
-     * config has loaded for the first time.
-     *
-     * @return {Promise} - Resolved when the config loads initially
-     */
-    config.init = _.once(function () {
-      var complete = notify.lifecycle('config init');
-      return kbnSetup()
-      .then(function getDoc() {
-
-        // used to apply an entire es response to the vals, silentAndLocal will prevent
-        // event/notifications/writes from occuring.
-        var applyMassUpdate = function (resp, silentAndLocal) {
-          _.union(_.keys(resp._source), _.keys(vals)).forEach(function (key) {
-            change(key, resp._source[key], silentAndLocal);
-          });
-        };
-
-        return doc.fetch().then(function initDoc(resp) {
-          if (!resp.found) {
-            return doc.doIndex({
-              buildNum: buildNum
-            }).then(getDoc);
-          } else {
-            // apply update, and keep it quiet the first time
-            applyMassUpdate(resp, true);
-
-            // don't keep it quiet other times
-            doc.onUpdate(function (resp) {
-              applyMassUpdate(resp, false);
-            });
-          }
-        });
-      })
-      .then(function () {
-        $rootScope.$broadcast('init:config');
-      })
-      .then(complete, complete.failure);
-    });
-
-    config.get = function (key, defaultVal) {
-      var keyVal;
-
-      if (vals[key] == null) {
-        if (defaultVal == null) {
-          keyVal = defaults[key].value;
-        } else {
-          keyVal = _.cloneDeep(defaultVal);
-        }
-      } else {
-        keyVal = vals[key];
-      }
-
-      if (defaults[key] && defaults[key].type === 'json') {
-        return JSON.parse(keyVal);
-      }
-      return keyVal;
-    };
-
-    // sets a value in the config
-    config.set = function (key, val) {
-      if (_.isPlainObject(val)) {
-        return change(key, angular.toJson(val));
-      } else {
-        return change(key, val);
-      }
-    };
-
-    // clears a value from the config
-    config.clear = function (key) {
-      return change(key);
-    };
-    // alias for clear
-    config.delete = config.clear;
-
-    config.close = function () {
-      if (updater) updater.fire();
-    };
-
-    /**
-     * A little helper for binding config variables to $scopes
-     *
-     * @param  {Scope} $scope - an angular $scope object
-     * @param  {string} key - the config key to bind to
-     * @param  {string} [property] - optional property name where the value should
-     *                             be stored. Defaults to the config key
-     * @return {function} - an unbind function
-     */
-    config.$bind = function ($scope, key, property) {
-      if (!property) property = key;
-
-      var update = function () {
-        $scope[property] = config.get(key);
-      };
-
-      update();
-      return _.partial(_.invoke, [
-        $scope.$on('change:config.' + key, update),
-        $scope.$on('init:config', update)
-      ], 'call');
-    };
-
-    /*****
-     * PRIVATE API
-     *****/
-    var change = function (key, val, silentAndLocal) {
-      // if the previous updater has already fired, then start over with null
-      if (updater && updater.fired) updater = null;
-      // create a new updater
-      if (!updater) updater = new DelayedUpdater(doc);
-      // return a promise that will be resolved once the action is eventually done
-      return updater.update(key, val, silentAndLocal);
-    };
-
-    config._vals = function () {
-      return _.cloneDeep(vals);
-    };
-
-  });
-});
diff --git a/src/kibana/components/courier/courier.js b/src/kibana/components/courier/courier.js
deleted file mode 100644
index 5c073815ed7fc..0000000000000
--- a/src/kibana/components/courier/courier.js
+++ /dev/null
@@ -1,139 +0,0 @@
-define(function (require) {
-  var errors = require('errors');
-  var _ = require('lodash');
-
-  require('services/es');
-  require('services/promises');
-  require('components/index_patterns/index_patterns');
-
-  require('modules').get('kibana/courier')
-  .service('courier', function ($rootScope, Private, Promise, indexPatterns, Notifier) {
-    function Courier() {
-      var self = this;
-
-      var DocSource = Private(require('components/courier/data_source/doc_source'));
-      var SearchSource = Private(require('components/courier/data_source/search_source'));
-      var searchStrategy = Private(require('components/courier/fetch/strategy/search'));
-
-      var requestQueue = Private(require('components/courier/_request_queue'));
-      var errorHandlers = Private(require('components/courier/_error_handlers'));
-
-      var fetch = Private(require('components/courier/fetch/fetch'));
-      var docLooper = self.docLooper = Private(require('components/courier/looper/doc'));
-      var searchLooper = self.searchLooper = Private(require('components/courier/looper/search'));
-
-      // expose some internal modules
-      self.setRootSearchSource = Private(require('components/courier/data_source/_root_search_source')).set;
-
-      self.SavedObject = Private(require('components/courier/saved_object/saved_object'));
-      self.indexPatterns = indexPatterns;
-      self.redirectWhenMissing = Private(require('components/courier/_redirect_when_missing'));
-
-      self.DocSource = DocSource;
-      self.SearchSource = SearchSource;
-
-      var HastyRefresh = errors.HastyRefresh;
-
-      /**
-       * update the time between automatic search requests
-       *
-       * @chainable
-       */
-      self.fetchInterval = function (ms) {
-        searchLooper.ms(ms);
-        return this;
-      };
-
-      /**
-       * Start fetching search requests on an interval
-       * @chainable
-       */
-      self.start = function () {
-        searchLooper.start();
-        docLooper.start();
-        return this;
-      };
-
-      /**
-       * Process the pending request queue right now, returns
-       * a promise that resembles the success of the fetch completing,
-       * individual errors are routed to their respective requests.
-       */
-      self.fetch = function () {
-        fetch.fetchQueued(searchStrategy).then(function () {
-          searchLooper.restart();
-        });
-      };
-
-
-      /**
-       * is the currior currently fetching search
-       * results automatically?
-       *
-       * @return {boolean}
-       */
-      self.started = function () {
-        return searchLooper.started();
-      };
-
-
-      /**
-       * stop the courier from fetching more search
-       * results, does not stop vaidating docs.
-       *
-       * @chainable
-       */
-      self.stop = function () {
-        searchLooper.stop();
-        return this;
-      };
-
-
-      /**
-       * create a source object that is a child of this courier
-       *
-       * @param {string} type - the type of Source to create
-       */
-      self.createSource = function (type) {
-        switch (type) {
-        case 'doc':
-          return new DocSource();
-        case 'search':
-          return new SearchSource();
-        }
-      };
-
-      /**
-       * Abort all pending requests
-       * @return {[type]} [description]
-       */
-      self.close = function () {
-        searchLooper.stop();
-        docLooper.stop();
-
-        _.invoke(requestQueue, 'abort');
-
-        if (requestQueue.length) {
-          throw new Error('Aborting all pending requests failed.');
-        }
-      };
-
-      // Listen for refreshInterval changes
-      $rootScope.$watchCollection('timefilter.refreshInterval', function () {
-        var refreshValue = _.get($rootScope, 'timefilter.refreshInterval.value');
-        var refreshPause = _.get($rootScope, 'timefilter.refreshInterval.pause');
-        if (_.isNumber(refreshValue) && !refreshPause) {
-          self.fetchInterval(refreshValue);
-        } else {
-          self.fetchInterval(0);
-        }
-      });
-
-      var onFatalDefer = Promise.defer();
-      onFatalDefer.promise.then(self.close);
-      Notifier.fatalCallbacks.push(onFatalDefer.resolve);
-    }
-
-    return new Courier();
-  });
-});
diff --git a/src/kibana/components/courier/fetch/_call_response_handlers.js b/src/kibana/components/courier/fetch/_call_response_handlers.js
deleted file mode 100644
index c1cf0e117f349..0000000000000
--- a/src/kibana/components/courier/fetch/_call_response_handlers.js
+++ /dev/null
@@ -1,57 +0,0 @@
-define(function (require) {
-  return function CourierFetchCallResponseHandlers(Private, Promise) {
-    var ABORTED = Private(require('components/courier/fetch/_req_status')).ABORTED;
-    var INCOMPLETE = Private(require('components/courier/fetch/_req_status')).INCOMPLETE;
-    var notify = Private(require('components/courier/fetch/_notifier'));
-
-    var SearchTimeout = require('errors').SearchTimeout;
-    var RequestFailure = require('errors').RequestFailure;
-    var ShardFailure = require('errors').ShardFailure;
-
-    function callResponseHandlers(requests, responses) {
-      return Promise.map(requests, function (req, i) {
-        if (req === ABORTED || req.aborted) {
-          return ABORTED;
-        }
-
-        var resp = responses[i];
-
-        if (resp.timed_out) {
-          notify.warning(new SearchTimeout());
-        }
-
-        if (resp._shards && resp._shards.failed) {
-          notify.warning(new ShardFailure(resp));
-        }
-
-        function progress() {
-          if (req.isIncomplete()) {
-            return INCOMPLETE;
-          }
-
-          req.complete();
-          return resp;
-        }
-
-        if (resp.error) {
-          if (req.filterError(resp)) {
-            return progress();
-          } else {
-            return req.handleFailure(new RequestFailure(null, resp));
-          }
-        }
-
-        return Promise.try(function () {
-          return req.transformResponse(resp);
-        })
-        .then(function () {
-          resp = arguments[0];
-          return req.handleResponse(resp);
-        })
-        .then(progress);
-      });
-    }
-
-    return callResponseHandlers;
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/_fetch_these.js b/src/kibana/components/courier/fetch/_fetch_these.js
deleted file mode 100644
index 125d2bef2465d..0000000000000
--- a/src/kibana/components/courier/fetch/_fetch_these.js
+++ /dev/null
@@ -1,68 +0,0 @@
-define(function (require) {
-  return function FetchTheseProvider(Private, Promise) {
-    var notify = Private(require('components/courier/fetch/_notifier'));
-    var forEachStrategy = Private(require('components/courier/fetch/_for_each_strategy'));
-
-    // core tasks
-    var callClient = Private(require('components/courier/fetch/_call_client'));
-    var callResponseHandlers = Private(require('components/courier/fetch/_call_response_handlers'));
-    var continueIncomplete = Private(require('components/courier/fetch/_continue_incomplete'));
-
-    var ABORTED = Private(require('components/courier/fetch/_req_status')).ABORTED;
-    var DUPLICATE = Private(require('components/courier/fetch/_req_status')).DUPLICATE;
-    var INCOMPLETE = Private(require('components/courier/fetch/_req_status')).INCOMPLETE;
-
-    function fetchThese(requests) {
-      return forEachStrategy(requests, function (strategy, requests) {
-        return fetchWithStrategy(strategy, requests.map(function (req) {
-          if (!req.started) return req;
-          return req.retry();
-        }));
-      })
-      .catch(notify.fatal);
-    }
-
-    function fetchWithStrategy(strategy, requests) {
-
-      requests = requests.map(function (req) {
-        if (req.aborted) {
-          return ABORTED;
-        }
-
-        if (req.started) {
-          req.continue();
-        } else {
-          req.start();
-        }
-
-        return req;
-      });
-
-      return Promise.resolve()
-      .then(function () {
-        return callClient(strategy, requests);
-      })
-      .then(function (responses) {
-        return callResponseHandlers(requests, responses);
-      })
-      .then(function (responses) {
-        return continueIncomplete(strategy, requests, responses, fetchWithStrategy);
-      })
-      .then(function (responses) {
-        return responses.map(function (resp) {
-          switch (resp) {
-          case ABORTED:
-            return null;
-          case DUPLICATE:
-          case INCOMPLETE:
-            throw new Error('Failed to clear incomplete or duplicate request from responses.');
-          default:
-            return resp;
-          }
-        });
-      });
-    }
-
-    return fetchThese;
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/_is_request.js b/src/kibana/components/courier/fetch/_is_request.js
deleted file mode 100644
index 51d022e856866..0000000000000
--- a/src/kibana/components/courier/fetch/_is_request.js
+++ /dev/null
@@ -1,9 +0,0 @@
-define(function (require) {
-  return function CourierFetchIsRequestProvider(Private) {
-    var AbstractRequest = Private(require('components/courier/fetch/request/request'));
-
-    return function isRequest(obj) {
-      return obj instanceof AbstractRequest;
-    };
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/request/_error_handler.js b/src/kibana/components/courier/fetch/request/_error_handler.js
deleted file mode 100644
index 6e4be03abda6e..0000000000000
--- a/src/kibana/components/courier/fetch/request/_error_handler.js
+++ /dev/null
@@ -1,27 +0,0 @@
-define(function (require) {
-  return function RequestErrorHandlerFactory(Private, Notifier) {
-    var errHandlers = Private(require('components/courier/_error_handlers'));
-
-    var notify = new Notifier({
-      location: 'Courier Fetch Error'
-    });
-
-    function handleError(req, error) {
-      var myHandlers = [];
-
-      errHandlers.splice(0).forEach(function (handler) {
-        (handler.source === req.source ? myHandlers : errHandlers).push(handler);
-      });
-
-      if (!myHandlers.length) {
-        notify.fatal(new Error('unhandled error ' + (error.stack || error.message)));
-      } else {
-        myHandlers.forEach(function (handler) {
-          handler.defer.resolve(error);
-        });
-      }
-    }
-
-    return handleError;
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/request/doc.js b/src/kibana/components/courier/fetch/request/doc.js
deleted file mode 100644
index bf27485bd8d93..0000000000000
--- a/src/kibana/components/courier/fetch/request/doc.js
+++ /dev/null
@@ -1,42 +0,0 @@
-define(function (require) {
-  return function DocRequestProvider(Private) {
-    var _ = require('lodash');
-
-    var docStrategy = Private(require('components/courier/fetch/strategy/doc'));
-    var AbstractRequest = Private(require('components/courier/fetch/request/request'));
-
-    _.class(DocRequest).inherits(AbstractRequest);
-    function DocRequest(source, defer) {
-      DocRequest.Super.call(this, source, defer);
-
-      this.type = 'doc';
-      this.strategy = docStrategy;
-    }
-
-    DocRequest.prototype.canStart = function () {
-      var parent = DocRequest.Super.prototype.canStart.call(this);
-      if (!parent) return false;
-
-      var version = this.source._version;
-      var storedVersion = this.source._getStoredVersion();
-
-      // conditions that equal "fetch This DOC!"
-      var unkown = !version && !storedVersion;
-      var mismatch = version !== storedVersion;
-
-      return Boolean(mismatch || (unkown && !this.started));
-    };
-
-    DocRequest.prototype.handleResponse = function (resp) {
-      if (resp.found) {
-        this.source._storeVersion(resp._version);
-      } else {
-        this.source._clearVersion();
-      }
-
-      return DocRequest.Super.prototype.handleResponse.call(this, resp);
-    };
-
-    return DocRequest;
-  };
-});
diff --git a/src/kibana/components/courier/fetch/request/search.js b/src/kibana/components/courier/fetch/request/search.js
deleted file mode 100644
index 6b6846595395b..0000000000000
--- a/src/kibana/components/courier/fetch/request/search.js
+++ /dev/null
@@ -1,19 +0,0 @@
-define(function (require) {
-  return function SearchReqProvider(Private) {
-    var _ = require('lodash');
-
-    var searchStrategy = Private(require('components/courier/fetch/strategy/search'));
-    var AbstractRequest = Private(require('components/courier/fetch/request/request'));
-
-    _.class(SearchReq).inherits(AbstractRequest);
-    var Super = SearchReq.Super;
-    function SearchReq(source, defer) {
-      Super.call(this, source, defer);
-
-      this.type = 'search';
-      this.strategy = searchStrategy;
-    }
-
-    return SearchReq;
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/strategy/search.js b/src/kibana/components/courier/fetch/strategy/search.js
deleted file mode 100644
index f8aa674f928eb..0000000000000
--- a/src/kibana/components/courier/fetch/strategy/search.js
+++ /dev/null
@@ -1,45 +0,0 @@
-define(function (require) {
-  return function FetchStrategyForSearch(Private, Promise, timefilter, configFile) {
-    var _ = require('lodash');
-    var angular = require('angular');
-
-    return {
-      clientMethod: 'msearch',
-
-      /**
-       * Flatten a series of requests into as ES request body
-       *
-       * @param  {array} requests - the requests to serialize
-       * @return {string} - the request body
-       */
-      reqsFetchParamsToBody: function (reqsFetchParams) {
-        return reqsFetchParams.map(function (fetchParams) {
-          var indexList = fetchParams.index;
-
-          if (_.isFunction(_.get(indexList, 'toIndexList'))) {
-            var timeBounds = timefilter.getBounds();
-            indexList = indexList.toIndexList(timeBounds.min, timeBounds.max);
-          }
-
-          return angular.toJson({
-            index: indexList,
-            type: fetchParams.type,
-            search_type: fetchParams.search_type,
-            ignore_unavailable: true
-          })
-          + '\n'
-          + angular.toJson(fetchParams.body || {});
-        }).join('\n') + '\n';
-      },
-
-      /**
-       * Fetch the multiple responses from the ES Response
-       * @param  {object} resp - The response sent from Elasticsearch
-       * @return {array} - the list of responses
-       */
-      getResponses: function (resp) {
-        return resp.responses;
-      }
-    };
-  };
-});
diff --git a/src/kibana/components/courier/looper/doc.js b/src/kibana/components/courier/looper/doc.js
deleted file mode 100644
index 57bcbbcf74bdd..0000000000000
--- a/src/kibana/components/courier/looper/doc.js
+++ /dev/null
@@ -1,17 +0,0 @@
-define(function (require) {
-  return function DocLooperService(Private) {
-    var fetch = Private(require('components/courier/fetch/fetch'));
-    var Looper = Private(require('components/courier/looper/_looper'));
-    var docStrategy = Private(require('components/courier/fetch/strategy/doc'));
-
-    /**
-     * The Looper which will manage the doc fetch interval
-     * @type {Looper}
-     */
-    var docLooper = new Looper(1500, function () {
-      fetch.fetchQueued(docStrategy);
-    });
-
-    return docLooper;
-  };
-});
diff --git a/src/kibana/components/courier/looper/search.js b/src/kibana/components/courier/looper/search.js
deleted file mode 100644
index c8191e9beb6ef..0000000000000
--- a/src/kibana/components/courier/looper/search.js
+++ /dev/null
@@ -1,27 +0,0 @@
-define(function (require) {
-  return function SearchLooperService(Private, Promise, Notifier, $rootScope) {
-    var fetch = Private(require('components/courier/fetch/fetch'));
-    var searchStrategy = Private(require('components/courier/fetch/strategy/search'));
-    var requestQueue = Private(require('components/courier/_request_queue'));
-
-    var Looper = Private(require('components/courier/looper/_looper'));
-    var notif = new Notifier({ location: 'Search Looper' });
-
-    /**
-     * The Looper which will manage the doc fetch interval
-     * @type {Looper}
-     */
-    var searchLooper = new Looper(null, function () {
-      $rootScope.$broadcast('courier:searchRefresh');
-      return fetch.these(
-        requestQueue.getInactive(searchStrategy)
-      );
-    });
-
-    searchLooper.onHastyLoop = function () {
-      notif.warning('Skipping search attempt because previous search request has not completed');
-    };
-
-    return searchLooper;
-  };
-});
diff --git a/src/kibana/components/doc_table/doc_table.js b/src/kibana/components/doc_table/doc_table.js
deleted file mode 100644
index d2c04a69d24fc..0000000000000
--- a/src/kibana/components/doc_table/doc_table.js
+++ /dev/null
@@ -1,115 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  var html = require('text!components/doc_table/doc_table.html');
-  var getSort = require('components/doc_table/lib/get_sort');
-
-  require('css!components/doc_table/doc_table.css');
-  require('directives/truncated');
-  require('directives/infinite_scroll');
-  require('components/doc_table/components/table_header');
-  require('components/doc_table/components/table_row');
-
-  require('modules').get('kibana')
-  .directive('docTable', function (config, Notifier, getAppState) {
-    return {
-      restrict: 'E',
-      template: html,
-      scope: {
-        sorting: '=',
-        columns: '=',
-        hits: '=?', // You really want either hits & indexPattern, OR searchSource
-        indexPattern: '=?',
-        searchSource: '=?',
-        infiniteScroll: '=?',
-        filter: '=?',
-      },
-      link: function ($scope) {
-        var notify = new Notifier();
-        $scope.limit = 50;
-        $scope.persist = {
-          sorting: $scope.sorting,
-          columns: $scope.columns
-        };
-
-        var prereq = (function () {
-          var fns = [];
-
-          return function register(fn) {
-            fns.push(fn);
-
-            return function () {
-              fn.apply(this, arguments);
-
-              if (fns.length) {
-                _.pull(fns, fn);
-                if (!fns.length) {
-                  $scope.$root.$broadcast('ready:vis');
-                }
-              }
-            };
-          };
-        }());
-
-        $scope.addRows = function () {
-          $scope.limit += 50;
-        };
-
-        // This exists to fix the problem of an empty initial column list not playing nice with watchCollection.
-        $scope.$watch('columns', function (columns) {
-          if (columns.length !== 0) return;
-
-          var $state = getAppState();
-          $scope.columns.push('_source');
-          if ($state) $state.replace();
-        });
-
-        $scope.$watchCollection('columns', function (columns, oldColumns) {
-          if (oldColumns.length === 1 && oldColumns[0] === '_source' && $scope.columns.length > 1) {
-            _.pull($scope.columns, '_source');
-          }
-
-          if ($scope.columns.length === 0) $scope.columns.push('_source');
-        });
-
-
-        $scope.$watch('searchSource', prereq(function (searchSource) {
-          if (!$scope.searchSource) return;
-
-          $scope.indexPattern = $scope.searchSource.get('index');
-
-          $scope.searchSource.size(config.get('discover:sampleSize'));
-          $scope.searchSource.sort(getSort($scope.sorting, $scope.indexPattern));
-
-          // Set the watcher after initialization
-          $scope.$watchCollection('sorting', function (newSort, oldSort) {
-            // Don't react if sort values didn't really change
-            if (newSort === oldSort) return;
-            $scope.searchSource.sort(getSort(newSort, $scope.indexPattern));
-            $scope.searchSource.fetchQueued();
-          });
-
-          $scope.$on('$destroy', function () {
-            if ($scope.searchSource) $scope.searchSource.destroy();
-          });
-
-          // TODO: we need to have some way to clean up result requests
-          $scope.searchSource.onResults().then(function onResults(resp) {
-            // Reset infinite scroll limit
-            $scope.limit = 50;
-
-            // Abort if something changed
-            if ($scope.searchSource !== $scope.searchSource) return;
-
-            $scope.hits = resp.hits.hits;
-
-            return $scope.searchSource.onResults().then(onResults);
-          }).catch(notify.fatal);
-
-          $scope.searchSource.onError(notify.error).catch(notify.fatal);
-        }));
-
-      }
-    };
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/components/doc_table/doc_table.less b/src/kibana/components/doc_table/doc_table.less
deleted file mode 100644
index 29a0b9d76b4f2..0000000000000
--- a/src/kibana/components/doc_table/doc_table.less
+++ /dev/null
@@ -1,26 +0,0 @@
-@import (reference) "../../styles/_bootstrap.less";
-@import (reference) "../../styles/theme/_theme.less";
-@import (reference) "lesshat.less";
-
-doc-table {
-  overflow: auto;
-  margin: 5px;
-  .flex(1, 1, 100%);
-
-  .discover-table-datafield {
-    white-space: pre-wrap;
-  }
-
-  .loading {
-    opacity: @loading-opacity;
-  }
-
-  .spinner {
-    position: absolute;
-    top: 40%;
-    left: 0;
-    right: 0;
-    z-index: 20;
-    opacity: @loading-opacity;
-  }
-}
diff --git a/src/kibana/components/doc_title/doc_title.js b/src/kibana/components/doc_title/doc_title.js
deleted file mode 100644
index d479bee1c1eac..0000000000000
--- a/src/kibana/components/doc_title/doc_title.js
+++ /dev/null
@@ -1,52 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  require('modules').get('kibana')
-  .run(function ($rootScope, docTitle) {
-    // always bind to the route events
-    $rootScope.$on('$routeChangeStart', docTitle.reset);
-    $rootScope.$on('$routeChangeError', docTitle.update);
-    $rootScope.$on('$routeChangeSuccess', docTitle.update);
-    $rootScope.$watch('activeApp', docTitle.update);
-  })
-  .service('docTitle', function ($rootScope) {
-    var baseTitle = document.title;
-    var self = this;
-
-    var lastChange;
-
-    function render() {
-      lastChange = lastChange || [];
-
-      var parts = [lastChange[0]];
-
-      if ($rootScope.activeApp) {
-        parts.push($rootScope.activeApp.name);
-      }
-
-      if (!lastChange[1]) {
-        parts.push(baseTitle);
-      }
-
-      return _(parts).flattenDeep().compact().join(' - ');
-    }
-
-    self.change = function (title, complete) {
-      lastChange = [title, complete];
-      self.update();
-    };
-
-    self.reset = function () {
-      lastChange = null;
-    };
-
-    self.update = function () {
-      document.title = render();
-    };
-  });
-
-  // return a "private module" so that it can be used both ways
-  return function DoctitleProvider(docTitle) {
-    return docTitle;
-  };
-});
diff --git a/src/kibana/components/doc_viewer/doc_viewer.js b/src/kibana/components/doc_viewer/doc_viewer.js
deleted file mode 100644
index f06837f45f145..0000000000000
--- a/src/kibana/components/doc_viewer/doc_viewer.js
+++ /dev/null
@@ -1,41 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
-  require('angular-ui-ace');
-
-  var html = require('text!components/doc_viewer/doc_viewer.html');
-  require('css!components/doc_viewer/doc_viewer.css');
-
-  require('modules').get('kibana')
-  .directive('docViewer', function (config, Private) {
-    return {
-      restrict: 'E',
-      template: html,
-      scope: {
-        hit: '=',
-        indexPattern: '=',
-        filter: '=?',
-        columns: '=?'
-      },
-      link: function ($scope, $el, attr) {
-        // If a field isn't in the mapping, use this
-        $scope.mode = 'table';
-        $scope.mapping = $scope.indexPattern.fields.byName;
-        $scope.flattened = $scope.indexPattern.flattenHit($scope.hit);
-        $scope.hitJson = angular.toJson($scope.hit, true);
-        $scope.formatted = $scope.indexPattern.formatHit($scope.hit);
-        $scope.fields = _.keys($scope.flattened).sort();
-
-        $scope.toggleColumn = function (fieldName) {
-          _.toggleInOut($scope.columns, fieldName);
-        };
-
-        $scope.showArrayInObjectsWarning = function (row, field) {
-          var value = $scope.flattened[field];
-          return _.isArray(value) && typeof value[0] === 'object';
-        };
-
-      }
-    };
-  });
-});
diff --git a/src/kibana/components/doc_viewer/doc_viewer.less b/src/kibana/components/doc_viewer/doc_viewer.less
deleted file mode 100644
index e70ccea239628..0000000000000
--- a/src/kibana/components/doc_viewer/doc_viewer.less
+++ /dev/null
@@ -1,25 +0,0 @@
-@import (reference) "../../styles/_bootstrap.less";
-@import (reference) "../../styles/theme/_theme.less";
-@import (reference) "lesshat.less";
-
-doc-viewer .doc-viewer {
-
-  &-buttons, &-field {
-    white-space: nowrap;
-  }
-
-  &-value, pre {
-    display: inline-block;
-    word-break: break-all;
-    word-wrap: break-word;
-    white-space: pre-wrap;
-  }
-
-  td, pre {
-    font-family: "Lucida Console", Monaco, monospace;
-  }
-
-  &-content {
-    margin-top: @padding-base-vertical;
-  }
-}
diff --git a/src/kibana/components/errors.js b/src/kibana/components/errors.js
deleted file mode 100644
index 0231b534fddf3..0000000000000
--- a/src/kibana/components/errors.js
+++ /dev/null
@@ -1,268 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
-
-  var canStack = (function () {
-    var err = new Error();
-    return !!err.stack;
-  }());
-
-  var errors = {};
-
-  // abstract error class
-  function KbnError(msg, constructor) {
-    this.message = msg;
-
-    Error.call(this, this.message);
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, constructor || KbnError);
-    } else if (canStack) {
-      this.stack = (new Error()).stack;
-    } else {
-      this.stack = '';
-    }
-  }
-  errors.KbnError = KbnError;
-  _.class(KbnError).inherits(Error);
-
-  /**
-   * HastyRefresh error class
-   * @param {String} [msg] - An error message that will probably end up in a log.
-   */
-  errors.HastyRefresh = function HastyRefresh() {
-    KbnError.call(this,
-      'Courier attempted to start a query before the previous had finished.',
-      errors.HastyRefresh);
-  };
-  _.class(errors.HastyRefresh).inherits(KbnError);
-
-  /**
-   * SearchTimeout error class
-   */
-  errors.SearchTimeout = function SearchTimeout() {
-    KbnError.call(this,
-      'All or part of your request has timed out. The data shown may be incomplete.',
-      errors.SearchTimeout);
-  };
-  _.class(errors.SearchTimeout).inherits(KbnError);
-
-  /**
-   * Request Failure - When an entire mutli request fails
-   * @param {Error} err - the Error that came back
-   * @param {Object} resp - optional HTTP response
-   */
-  errors.RequestFailure = function RequestFailure(err, resp) {
-    err = err || false;
-
-    KbnError.call(this,
-      'Request to Elasticsearch failed: ' + angular.toJson(resp || err.message),
-      errors.RequestFailure);
-
-    this.origError = err;
-    this.resp = resp;
-  };
-  _.class(errors.RequestFailure).inherits(KbnError);
-
-  /**
-   * FetchFailure Error - when there is an error getting a doc or search within
-   *  a multi-response response body
-   * @param {String} [msg] - An error message that will probably end up in a log.
-   */
-  errors.FetchFailure = function FetchFailure(resp) {
-    KbnError.call(this,
-      'Failed to get the doc: ' + angular.toJson(resp),
-      errors.FetchFailure);
-
-    this.resp = resp;
-  };
-  _.class(errors.FetchFailure).inherits(KbnError);
-
-  /**
-   * ShardFailure Error - when one or more shards fail
-   * @param {String} [msg] - An error message that will probably end up in a log.
-   */
-  errors.ShardFailure = function ShardFailure(resp) {
-    KbnError.call(this, resp._shards.failed + ' of ' + resp._shards.total + ' shards failed.',
-      errors.ShardFailure);
-
-    this.resp = resp;
-  };
-  _.class(errors.ShardFailure).inherits(KbnError);
-
-
-  /**
-   * A doc was re-indexed but it was out of date.
-   * @param {Object} resp - The response from es (one of the multi-response responses).
-   */
-  errors.VersionConflict = function VersionConflict(resp) {
-    KbnError.call(this,
-      'Failed to store document changes do to a version conflict.',
-      errors.VersionConflict);
-
-    this.resp = resp;
-  };
-  _.class(errors.VersionConflict).inherits(KbnError);
-
-
-  /**
-   * there was a conflict storing a doc
-   * @param {String} field - the fields which contains the conflict
-   */
-  errors.MappingConflict = function MappingConflict(field) {
-    KbnError.call(this,
-      'Field "' + field + '" is defined with at least two different types in indices matching the pattern',
-      errors.MappingConflict);
-  };
-  _.class(errors.MappingConflict).inherits(KbnError);
-
-  /**
-   * a field mapping was using a restricted fields name
-   * @param {String} field - the fields which contains the conflict
-   */
-  errors.RestrictedMapping = function RestrictedMapping(field, index) {
-    var msg = field + ' is a restricted field name';
-    if (index) msg += ', found it while attempting to fetch mapping for index pattern: ' + index;
-
-    KbnError.call(this, msg, errors.RestrictedMapping);
-  };
-  _.class(errors.RestrictedMapping).inherits(KbnError);
-
-  /**
-   * a non-critical cache write to elasticseach failed
-   */
-  errors.CacheWriteFailure = function CacheWriteFailure() {
-    KbnError.call(this,
-      'A Elasticsearch cache write has failed.',
-      errors.CacheWriteFailure);
-  };
-  _.class(errors.CacheWriteFailure).inherits(KbnError);
-
-  /**
-   * when a field mapping is requested for an unknown field
-   * @param {String} name - the field name
-   */
-  errors.FieldNotFoundInCache = function FieldNotFoundInCache(name) {
-    KbnError.call(this,
-      'The ' + name + ' field was not found in the cached mappings',
-      errors.FieldNotFoundInCache);
-  };
-  _.class(errors.FieldNotFoundInCache).inherits(KbnError);
-
-  /**
-   * when a mapping already exists for a field the user is attempting to add
-   * @param {String} name - the field name
-   */
-  errors.DuplicateField = function DuplicateField(name) {
-    KbnError.call(this,
-      'The "' + name + '" field already exists in this mapping',
-      errors.DuplicateField);
-  };
-  _.class(errors.DuplicateField).inherits(KbnError);
-
-  /**
-   * A saved object was not found
-   * @param {String} field - the fields which contains the conflict
-   */
-  errors.SavedObjectNotFound = function SavedObjectNotFound(type, id) {
-    this.savedObjectType = type;
-    this.savedObjectId = id;
-    var idMsg = id ? ' (id: ' + id + ')' : '';
-    KbnError.call(this,
-      'Could not locate that ' + type + idMsg,
-      errors.SavedObjectNotFound);
-  };
-  _.class(errors.SavedObjectNotFound).inherits(KbnError);
-
-  /**
-   * Tried to call a method that relies on SearchSource having an indexPattern assigned
-   */
-  errors.IndexPatternMissingIndices = function IndexPatternMissingIndices(type) {
-    KbnError.call(this,
-      'IndexPattern\'s configured pattern does not match any indices',
-      errors.IndexPatternMissingIndices);
-  };
-  _.class(errors.IndexPatternMissingIndices).inherits(KbnError);
-
-  /**
-   * Tried to call a method that relies on SearchSource having an indexPattern assigned
-   */
-  errors.NoDefinedIndexPatterns = function NoDefinedIndexPatterns(type) {
-    KbnError.call(this,
-      'Define at least one index pattern to continue',
-      errors.NoDefinedIndexPatterns);
-  };
-  _.class(errors.NoDefinedIndexPatterns).inherits(KbnError);
-
-
-  /**
-   * Tried to load a route besides settings/indices but you don't have a default index pattern!
-   */
-  errors.NoDefaultIndexPattern = function NoDefaultIndexPattern(type) {
-    KbnError.call(this,
-      'Please specify a default index pattern',
-      errors.NoDefaultIndexPattern);
-  };
-  _.class(errors.NoDefaultIndexPattern).inherits(KbnError);
-
-
-  /**
-   * user with the vislib, when the container is too small
-   * @param {String} message - the message to provide with the error
-   */
-  errors.ContainerTooSmall = function ContainerTooSmall() {
-    KbnError.call(this,
-    'This container is too small to render the visualization',
-    errors.ContainerTooSmall);
-  };
-  _.class(errors.ContainerTooSmall).inherits(KbnError);
-
-  /**
-   * error thrown when user tries to render an chart with less
-   * than the required number of data points
-   * @param {String} message - the message to provide with the error
-   */
-  errors.NotEnoughData = function NotEnoughData(message) {
-    KbnError.call(this, message, errors.NotEnoughData);
-  };
-  _.class(errors.NotEnoughData).inherits(KbnError);
-
-  /**
-   * error thrown when no results are returned from an elasticsearch query
-   */
-  errors.NoResults = function NoResults() {
-    KbnError.call(this,
-    'No results found',
-    errors.NoResults);
-  };
-  _.class(errors.NoResults).inherits(KbnError);
-
-  /**
-   * error thrown when no results are returned from an elasticsearch query
-   */
-  errors.PieContainsAllZeros = function PieContainsAllZeros() {
-    KbnError.call(this,
-      'No results displayed because all values equal 0',
-      errors.PieContainsAllZeros);
-  };
-  _.class(errors.PieContainsAllZeros).inherits(KbnError);
-
-  /**
-   * error thrown when no results are returned from an elasticsearch query
-   */
-  errors.InvalidLogScaleValues = function InvalidLogScaleValues() {
-    KbnError.call(this,
-      'Values less than 1 cannot be displayed on a log scale',
-      errors.InvalidLogScaleValues);
-  };
-  _.class(errors.InvalidLogScaleValues).inherits(KbnError);
-
-  /** error thrown when wiggle chart is selected for non linear data */
-  errors.InvalidWiggleSelection = function InvalidWiggleSelection() {
-    KbnError.call(this,
-      'In wiggle mode the area chart requires ordered values on the x-axis. Try using a Histogram or Date Histogram aggregation.',
-      errors.InvalidWiggleSelection);
-  };
-  _.class(errors.InvalidWiggleSelection).inherits(KbnError);
-
-  return errors;
-});
diff --git a/src/kibana/components/fancy_forms/fancy_forms.js b/src/kibana/components/fancy_forms/fancy_forms.js
deleted file mode 100644
index aa095e2937430..0000000000000
--- a/src/kibana/components/fancy_forms/fancy_forms.js
+++ /dev/null
@@ -1,45 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-
-  var KbnFormController = require('components/fancy_forms/kbn_form');
-  var KbnModelController = require('components/fancy_forms/kbn_model');
-
-  require('modules')
-  .get('kibana')
-  .config(function ($provide) {
-    function decorateDirectiveController(DecorativeController) {
-      return function ($delegate, $injector) {
-        // directive providers are arrays
-        $delegate.forEach(function (directive) {
-          // get metadata about all init fns
-          var chain = [directive.controller, DecorativeController].map(function (fn) {
-            var deps = $injector.annotate(fn);
-            return { deps: deps, fn: _.isArray(fn) ? _.last(fn) : fn };
-          });
-
-          // replace the controller with one that will setup the actual controller
-          directive.controller = function stub() {
-            var allDeps = _.toArray(arguments);
-            return chain.reduce(function (controller, link, i) {
-              var deps = allDeps.splice(0, link.deps.length);
-              return link.fn.apply(controller, deps) || controller;
-            }, this);
-          };
-
-          // set the deps of our new controller to be the merged deps of every fn
-          directive.controller.$inject = chain.reduce(function (deps, link) {
-            return deps.concat(link.deps);
-          }, []);
-        });
-
-        return $delegate;
-      };
-    }
-
-
-    $provide.decorator('formDirective', decorateDirectiveController(KbnFormController));
-    $provide.decorator('ngFormDirective', decorateDirectiveController(KbnFormController));
-    $provide.decorator('ngModelDirective', decorateDirectiveController(KbnModelController));
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/components/field_editor/field_editor.js b/src/kibana/components/field_editor/field_editor.js
deleted file mode 100644
index 667940ad9aa76..0000000000000
--- a/src/kibana/components/field_editor/field_editor.js
+++ /dev/null
@@ -1,141 +0,0 @@
-define(function (require) {
-
-  require('components/field_format_editor/field_format_editor');
-
-  require('modules')
-  .get('kibana')
-  .directive('fieldEditor', function (Private, $sce) {
-    var _ = require('lodash');
-    var fieldFormats = Private(require('registry/field_formats'));
-    var Field = Private(require('components/index_patterns/_field'));
-    var scriptingInfo = $sce.trustAsHtml(require('text!components/field_editor/scripting_info.html'));
-    var scriptingWarning = $sce.trustAsHtml(require('text!components/field_editor/scripting_warning.html'));
-
-    return {
-      restrict: 'E',
-      template: require('text!components/field_editor/field_editor.html'),
-      scope: {
-        getIndexPattern: '&indexPattern',
-        getField: '&field'
-      },
-      controllerAs: 'editor',
-      controller: function ($scope, Notifier, kbnUrl) {
-        var self = this;
-        var notify = new Notifier({ location: 'Field Editor' });
-
-        self.scriptingInfo = scriptingInfo;
-        self.scriptingWarning = scriptingWarning;
-
-        self.indexPattern = $scope.getIndexPattern();
-        self.field = shadowCopy($scope.getField());
-        self.formatParams = self.field.format.params();
-
-        // only init on first create
-        self.creating = !self.indexPattern.fields.byName[self.field.name];
-        self.selectedFormatId = _.get(self.indexPattern, ['fieldFormatMap', self.field.name, 'type', 'id']);
-        self.defFormatType = initDefaultFormat();
-        self.fieldFormatTypes = [self.defFormatType].concat(fieldFormats.byFieldType[self.field.type] || []);
-
-        self.cancel = redirectAway;
-        self.save = function () {
-          var indexPattern = self.indexPattern;
-          var fields = indexPattern.fields;
-          var field = self.field.toActualField();
-
-          fields.remove({ name: field.name });
-          fields.push(field);
-
-          if (!self.selectedFormatId) {
-            delete indexPattern.fieldFormatMap[field.name];
-          } else {
-            indexPattern.fieldFormatMap[field.name] = self.field.format;
-          }
-
-          return indexPattern.save()
-          .then(function () {
-            notify.info('Saved Field "' + self.field.name + '"');
-            redirectAway();
-          });
-        };
-
-        self.delete = function () {
-          var indexPattern = self.indexPattern;
-          var field = self.field;
-
-          indexPattern.fields.remove({ name: field.name });
-          return indexPattern.save()
-          .then(function () {
-            notify.info('Deleted Field "' + field.name + '"');
-            redirectAway();
-          });
-        };
-
-        $scope.$watch('editor.selectedFormatId', function (cur, prev) {
-          var format = self.field.format;
-          var changedFormat = cur !== prev;
-          var missingFormat = cur && (!format || format.type.id !== cur);
-
-          if (!changedFormat || !missingFormat) return;
-
-          // reset to the defaults, but make sure it's an object
-          self.formatParams = _.assign({}, getFieldFormatType().paramDefaults);
-        });
-
-        $scope.$watch('editor.formatParams', function () {
-          var FieldFormat = getFieldFormatType();
-          self.field.format = new FieldFormat(self.formatParams);
-        }, true);
-
-        // copy the defined properties of the field to a plain object
-        // which is mutable, and capture the changed seperately.
-        function shadowCopy(field) {
-          var changes = {};
-          var shadowProps = {
-            toActualField: {
-              // bring the shadow copy out of the shadows
-              value: function toActualField() {
-                return new Field(self.indexPattern, _.defaults({}, changes, field.$$spec));
-              }
-            }
-          };
-
-          Object.getOwnPropertyNames(field).forEach(function (prop) {
-            var desc = Object.getOwnPropertyDescriptor(field, prop);
-            shadowProps[prop] = {
-              enumerable: desc.enumerable,
-              get: function () {
-                return _.has(changes, prop) ? changes[prop] : field[prop];
-              },
-              set: function (v) {
-                changes[prop] = v;
-              }
-            };
-          });
-
-          return Object.create(null, shadowProps);
-        }
-
-        function redirectAway() {
-          kbnUrl.changeToRoute(self.indexPattern, self.field.scripted ? 'scriptedFields' : 'indexedFields');
-        }
-
-        function getFieldFormatType() {
-          if (self.selectedFormatId) return fieldFormats.getType(self.selectedFormatId);
-          else return fieldFormats.getDefaultType(self.field.type);
-        }
-
-        function initDefaultFormat() {
-          var def = Object.create(fieldFormats.getDefaultType(self.field.type));
-
-          // explicitly set to undefined to prevent inheritting the prototypes id
-          def.id = undefined;
-          def.resolvedTitle = def.title;
-          def.title = '- default - ';
-
-          return def;
-        }
-      }
-    };
-  });
-
-});
diff --git a/src/kibana/components/field_format_editor/numeral/numeral.js b/src/kibana/components/field_format_editor/numeral/numeral.js
deleted file mode 100644
index 23cf21acc1ebc..0000000000000
--- a/src/kibana/components/field_format_editor/numeral/numeral.js
+++ /dev/null
@@ -1,12 +0,0 @@
-define(function (require) {
-  require('components/field_format_editor/pattern/pattern');
-
-  require('modules')
-  .get('kibana')
-  .directive('fieldEditorNumeral', function () {
-    return {
-      restrict: 'E',
-      template: require('text!components/field_format_editor/numeral/numeral.html')
-    };
-  });
-});
diff --git a/src/kibana/components/filter_bar/filter_bar.js b/src/kibana/components/filter_bar/filter_bar.js
deleted file mode 100644
index 42ecd2dac8b86..0000000000000
--- a/src/kibana/components/filter_bar/filter_bar.js
+++ /dev/null
@@ -1,113 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var module = require('modules').get('kibana');
-  var template = require('text!components/filter_bar/filter_bar.html');
-  var moment = require('moment');
-
-  module.directive('filterBar', function (Private, Promise, getAppState) {
-    var mapAndFlattenFilters = Private(require('components/filter_bar/lib/mapAndFlattenFilters'));
-    var mapFlattenAndWrapFilters = Private(require('components/filter_bar/lib/mapFlattenAndWrapFilters'));
-    var extractTimeFilter = Private(require('components/filter_bar/lib/extractTimeFilter'));
-    var filterOutTimeBasedFilter = Private(require('components/filter_bar/lib/filterOutTimeBasedFilter'));
-    var filterAppliedAndUnwrap = require('components/filter_bar/lib/filterAppliedAndUnwrap');
-    var changeTimeFilter = Private(require('components/filter_bar/lib/changeTimeFilter'));
-    var queryFilter = Private(require('components/filter_bar/query_filter'));
-
-    return {
-      restrict: 'E',
-      template: template,
-      scope: {},
-      link: function ($scope, $el, attrs) {
-        // bind query filter actions to the scope
-        [
-          'addFilters',
-          'toggleFilter',
-          'toggleAll',
-          'pinFilter',
-          'pinAll',
-          'invertFilter',
-          'invertAll',
-          'removeFilter',
-          'removeAll'
-        ].forEach(function (method) {
-          $scope[method] = queryFilter[method];
-        });
-
-        $scope.state = getAppState();
-
-        $scope.applyFilters = function (filters) {
-          // add new filters
-          $scope.addFilters(filterAppliedAndUnwrap(filters));
-          $scope.newFilters = [];
-
-          // change time filter
-          if ($scope.changeTimeFilter && $scope.changeTimeFilter.meta && $scope.changeTimeFilter.meta.apply) {
-            changeTimeFilter($scope.changeTimeFilter);
-          }
-        };
-
-        $scope.clearFilterBar = function () {
-          $scope.newFilters = [];
-          $scope.changeTimeFilter = null;
-        };
-
-        // update the scope filter list on filter changes
-        $scope.$listen(queryFilter, 'update', function () {
-          updateFilters();
-        });
-
-        // when appState changes, update scope's state
-        $scope.$watch(getAppState, function (appState) {
-          $scope.state = appState;
-        });
-
-        $scope.$watch('state.$newFilters', function (filters) {
-          if (!filters) return;
-
-          // If filters is not undefined and the length is greater than
-          // one we need to set the newFilters attribute and allow the
-          // users to decide what they want to apply.
-          if (filters.length > 1) {
-            return mapFlattenAndWrapFilters(filters)
-            .then(function (results) {
-              extractTimeFilter(results).then(function (filter) {
-                $scope.changeTimeFilter = filter;
-              });
-              return results;
-            })
-            .then(filterOutTimeBasedFilter)
-            .then(function (results) {
-              $scope.newFilters = results;
-            });
-          }
-
-          // Just add single filters to the state.
-          if (filters.length === 1) {
-            Promise.resolve(filters).then(function (filters) {
-              extractTimeFilter(filters)
-              .then(function (timeFilter) {
-                if (timeFilter) changeTimeFilter(timeFilter);
-              });
-              return filters;
-            })
-            .then(filterOutTimeBasedFilter)
-            .then($scope.addFilters);
-          }
-        });
-
-        function updateFilters() {
-          var filters = queryFilter.getFilters();
-          mapAndFlattenFilters(filters).then(function (results) {
-            // used to display the current filters in the state
-            $scope.filters = _.sortBy(results, function (filter) {
-              return !filter.meta.pinned;
-            });
-            $scope.$emit('filterbar:updated');
-          });
-        }
-
-        updateFilters();
-      }
-    };
-  });
-});
diff --git a/src/kibana/components/filter_bar/lib/dedupFilters.js b/src/kibana/components/filter_bar/lib/dedupFilters.js
deleted file mode 100644
index a325b7e71219d..0000000000000
--- a/src/kibana/components/filter_bar/lib/dedupFilters.js
+++ /dev/null
@@ -1,22 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
-  var compareFilters = require('components/filter_bar/lib/compareFilters');
-
-  /**
-   * Combine 2 filter collections, removing duplicates
-   * @param {object} existing The filters to compare to
-   * @param {object} filters The filters being added
-   * @param {object} comparatorOptions Parameters to use for comparison
-   * @returns {object} An array of filters that were not in existing
-   */
-  return function (existingFilters, filters, comparatorOptions) {
-    if (!_.isArray(filters)) filters = [filters];
-
-    return _.filter(filters, function (filter) {
-      return !_.find(existingFilters, function (existingFilter) {
-        return compareFilters(existingFilter, filter, comparatorOptions);
-      });
-    });
-  };
-});
diff --git a/src/kibana/components/filter_bar/lib/mapAndFlattenFilters.js b/src/kibana/components/filter_bar/lib/mapAndFlattenFilters.js
deleted file mode 100644
index ae99fb1edbecf..0000000000000
--- a/src/kibana/components/filter_bar/lib/mapAndFlattenFilters.js
+++ /dev/null
@@ -1,14 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  return function mapAndFlattenFiltersProvider(Private, Promise) {
-    var mapFilter = Private(require('components/filter_bar/lib/mapFilter'));
-    return function (filters) {
-      return _(filters)
-      .flatten()
-      .compact()
-      .map(mapFilter)
-      .thru(Promise.all)
-      .value();
-    };
-  };
-});
diff --git a/src/kibana/components/filter_bar/lib/mapFlattenAndWrapFilters.js b/src/kibana/components/filter_bar/lib/mapFlattenAndWrapFilters.js
deleted file mode 100644
index 8cc079568976e..0000000000000
--- a/src/kibana/components/filter_bar/lib/mapFlattenAndWrapFilters.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  return function mapFlattenAndWrapFilters(Private) {
-    var mapAndFlattenFilters = Private(require('components/filter_bar/lib/mapAndFlattenFilters'));
-    return function (filters) {
-      return mapAndFlattenFilters(filters).then(function (filters) {
-        return _.map(filters, function (filter) {
-          filter.meta = filter.meta || {};
-          filter.meta.apply = true;
-          return filter;
-        });
-      });
-    };
-  };
-});
diff --git a/src/kibana/components/filter_bar/lib/uniqFilters.js b/src/kibana/components/filter_bar/lib/uniqFilters.js
deleted file mode 100644
index d7c363759800c..0000000000000
--- a/src/kibana/components/filter_bar/lib/uniqFilters.js
+++ /dev/null
@@ -1,17 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var dedupFilters = require('components/filter_bar/lib/dedupFilters');
-
-  /**
-   * Remove duplicate filters from an array of filters
-   * @param {array} filters The filters to remove duplicates from
-   * @returns {object} The original filters array with duplicates removed
-   */
-  return function (filters, comparatorOptions) {
-    var results = [];
-    _.each(filters, function (filter) {
-      results = _.union(results, dedupFilters(results, [filter], comparatorOptions));
-    });
-    return results;
-  };
-});
diff --git a/src/kibana/components/filter_bar/query_filter.js b/src/kibana/components/filter_bar/query_filter.js
deleted file mode 100644
index ce92b3ac95b8e..0000000000000
--- a/src/kibana/components/filter_bar/query_filter.js
+++ /dev/null
@@ -1,335 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return function (Private, $rootScope, getAppState, globalState) {
-    var EventEmitter = Private(require('factories/events'));
-    var onlyDisabled = require('components/filter_bar/lib/onlyDisabled');
-    var onlyStateChanged = require('components/filter_bar/lib/onlyStateChanged');
-    var uniqFilters = require('components/filter_bar/lib/uniqFilters');
-    var compareFilters = require('components/filter_bar/lib/compareFilters');
-    var mapAndFlattenFilters = Private(require('components/filter_bar/lib/mapAndFlattenFilters'));
-
-    var queryFilter = new EventEmitter();
-
-    queryFilter.getFilters = function () {
-      var compareOptions = { disabled: true, negate: true };
-      var appFilters = queryFilter.getAppFilters();
-      var globalFilters = queryFilter.getGlobalFilters();
-
-      return uniqFilters(globalFilters.concat(appFilters), compareOptions);
-    };
-
-    queryFilter.getAppFilters = function () {
-      var appState = getAppState();
-      if (!appState || !appState.filters) return [];
-      return (appState.filters) ? _.map(appState.filters, appendStoreType('appState')) : [];
-    };
-
-    queryFilter.getGlobalFilters = function () {
-      if (!globalState.filters) return [];
-      return _.map(globalState.filters, appendStoreType('globalState'));
-    };
-
-    /**
-     * Adds new filters to the scope and state
-     * @param {object|array} fitlers Filter(s) to add
-     * @param {bool} global Should be added to global state
-     * @retuns {Promise} filter map promise
-     */
-    queryFilter.addFilters = function (filters, global) {
-      var appState = getAppState();
-      var state = (global) ? globalState : appState;
-
-      if (!_.isArray(filters)) {
-        filters = [filters];
-      }
-
-      return mapAndFlattenFilters(filters)
-      .then(function (filters) {
-        if (global) {
-          // simply concat global filters, they will be deduped
-          globalState.filters = globalState.filters.concat(filters);
-        } else if (appState) {
-          if (!appState.filters) appState.filters = [];
-          appState.filters = appState.filters.concat(filters);
-        }
-      });
-    };
-
-    /**
-     * Removes the filter from the proper state
-     * @param {object} matchFilter The filter to remove
-     */
-    queryFilter.removeFilter = function (matchFilter) {
-      var appState = getAppState();
-      var filter = _.omit(matchFilter, ['$$hashKey']);
-      var state;
-      var index;
-
-      // check for filter in appState
-      if (appState) {
-        index = _.findIndex(appState.filters, filter);
-        if (index !== -1) state = appState;
-      }
-
-      // if not found, check for filter in globalState
-      if (!state) {
-        index = _.findIndex(globalState.filters, filter);
-        if (index !== -1) state = globalState;
-        else return; // not found in either state, do nothing
-      }
-
-      state.filters.splice(index, 1);
-    };
-
-    /**
-     * Removes all filters
-     */
-    queryFilter.removeAll = function () {
-      var appState = getAppState();
-      appState.filters = [];
-      globalState.filters = [];
-    };
-
-    /**
-     * Toggles the filter between enabled/disabled.
-     * @param {object} filter The filter to toggle
-     & @param {boolean} force Disabled true/false
-     * @returns {object} updated filter
-     */
-    queryFilter.toggleFilter = function (filter, force) {
-      // Toggle the disabled flag
-      var disabled = _.isUndefined(force) ? !filter.meta.disabled : !!force;
-      filter.meta.disabled = disabled;
-      return filter;
-    };
-
-    /**
-     * Disables all filters
-     * @params {boolean} force Disable/enable all filters
-     */
-    queryFilter.toggleAll = function (force) {
-      function doToggle(filter) {
-        queryFilter.toggleFilter(filter, force);
-      }
-
-      executeOnFilters(doToggle);
-    };
-
-
-    /**
-     * Inverts the nagate value on the filter
-     * @param {object} filter The filter to toggle
-     * @returns {object} updated filter
-     */
-    queryFilter.invertFilter = function (filter) {
-      // Toggle the negate meta state
-      filter.meta.negate = !filter.meta.negate;
-      return filter;
-    };
-
-    /**
-     * Inverts all filters
-     * @returns {object} Resulting updated filter list
-     */
-    queryFilter.invertAll = function () {
-      executeOnFilters(queryFilter.invertFilter);
-    };
-
-
-    /**
-     * Pins the filter to the global state
-     * @param {object} filter The filter to pin
-     * @param {boolean} force pinned state
-     * @returns {object} updated filter
-     */
-    queryFilter.pinFilter = function (filter, force) {
-      var appState = getAppState();
-      if (!appState) return filter;
-
-      // ensure that both states have a filters property
-      if (!_.isArray(globalState.filters)) globalState.filters = [];
-      if (!_.isArray(appState.filters)) appState.filters = [];
-
-      var appIndex = _.indexOf(appState.filters, filter);
-
-      if (appIndex !== -1 && force !== false) {
-        appState.filters.splice(appIndex, 1);
-        globalState.filters.push(filter);
-      } else {
-        var globalIndex = _.indexOf(globalState.filters, filter);
-
-        if (globalIndex === -1 || force === true) return filter;
-
-        globalState.filters.splice(globalIndex, 1);
-        appState.filters.push(filter);
-      }
-
-      return filter;
-    };
-
-    /**
-     * Pins all filters
-     * @params {boolean} force Pin/Unpin all filters
-     */
-    queryFilter.pinAll = function (force) {
-      function pin(filter) {
-        queryFilter.pinFilter(filter, force);
-      }
-
-      executeOnFilters(pin);
-    };
-
-    initWatchers();
-
-    return queryFilter;
-
-    /**
-     * Saves both app and global states, ensuring filters are persisted
-     * @returns {object} Resulting filter list, app and global combined
-     */
-    function saveState() {
-      var appState = getAppState();
-      if (appState) appState.save();
-      globalState.save();
-    }
-
-    function appendStoreType(type) {
-      return function (filter) {
-        filter.$state = {
-          store: type
-        };
-        return filter;
-      };
-    }
-
-    // helper to run a function on all filters in all states
-    function executeOnFilters(fn) {
-      var appState = getAppState();
-      var globalFilters = [];
-      var appFilters = [];
-
-      if (globalState.filters) globalFilters = globalState.filters;
-      if (appState && appState.filters) appFilters = appState.filters;
-
-      globalFilters.concat(appFilters).forEach(fn);
-    }
-
-    function mergeStateFilters(gFilters, aFilters, compareOptions) {
-      // ensure we don't mutate the filters passed in
-      var globalFilters = gFilters ? _.cloneDeep(gFilters) : [];
-      var appFilters = aFilters ? _.cloneDeep(aFilters) : [];
-      compareOptions = _.defaults(compareOptions || {}, { disabled: true });
-
-      // existing globalFilters should be mutated by appFilters
-      _.each(appFilters, function (filter, i) {
-        var match = _.find(globalFilters, function (globalFilter) {
-          return compareFilters(globalFilter, filter, compareOptions);
-        });
-
-        // no match, do nothing
-        if (!match) return;
-
-        // matching filter in globalState, update global and remove from appState
-        _.assign(match.meta, filter.meta);
-        appFilters.splice(i, 1);
-      });
-
-      return [
-        uniqFilters(globalFilters, { disabled: true }),
-        uniqFilters(appFilters, { disabled: true })
-      ];
-    }
-
-    /**
-     * Initializes state watchers that use the event emitter
-     * @returns {void}
-     */
-    function initWatchers() {
-      var removeAppStateWatchers;
-
-      $rootScope.$watch(getAppState, function () {
-        removeAppStateWatchers && removeAppStateWatchers();
-        removeAppStateWatchers = initAppStateWatchers();
-      });
-
-      function initAppStateWatchers() {
-        // multi watch on the app and global states
-        var stateWatchers = [{
-          fn: $rootScope.$watch,
-          deep: true,
-          get: queryFilter.getGlobalFilters
-        }, {
-          fn: $rootScope.$watch,
-          deep: true,
-          get: queryFilter.getAppFilters
-        }];
-
-        // when states change, use event emitter to trigger updates and fetches
-        return $rootScope.$watchMulti(stateWatchers, function (next, prev) {
-          // prevent execution on watcher instantiation
-          if (_.isEqual(next, prev)) return;
-
-          var doUpdate = false;
-          var doFetch = false;
-
-          // reconcile filter in global and app states
-          var filters = mergeStateFilters(next[0], next[1]);
-          var globalFilters = filters[0];
-          var appFilters = filters[1];
-          var appState = getAppState();
-
-          // save the state, as it may have updated
-          var globalChanged = !_.isEqual(next[0], globalFilters);
-          var appChanged = !_.isEqual(next[1], appFilters);
-
-          // the filters were changed, apply to state (re-triggers this watcher)
-          if (globalChanged || appChanged) {
-            globalState.filters = globalFilters;
-            if (appState) appState.filters = appFilters;
-            return;
-          }
-
-          // check for actions, bail if we're done
-          getActions();
-          if (!doUpdate) return;
-
-          // save states and emit the required events
-          saveState();
-          queryFilter.emit('update')
-          .then(function () {
-            if (!doFetch) return;
-            queryFilter.emit('fetch');
-          });
-
-          // iterate over each state type, checking for changes
-          function getActions() {
-            var newFilters = [];
-            var oldFilters = [];
-
-            stateWatchers.forEach(function (watcher, i) {
-              var nextVal = next[i];
-              var prevVal = prev[i];
-              newFilters = newFilters.concat(nextVal);
-              oldFilters = oldFilters.concat(prevVal);
-
-              // no update or fetch if there was no change
-              if (nextVal === prevVal) return;
-
-              if (nextVal) doUpdate = true;
-
-              // don't trigger fetch when only disabled filters
-              if (!onlyDisabled(nextVal, prevVal)) doFetch = true;
-            });
-
-            // make sure change wasn't only a state move
-            // checking length first is an optimization
-            if (doFetch && newFilters.length === oldFilters.length) {
-              if (onlyStateChanged(newFilters, oldFilters)) doFetch = false;
-            }
-          }
-        });
-      }
-    }
-  };
-});
diff --git a/src/kibana/components/filter_manager/filter_manager.js b/src/kibana/components/filter_manager/filter_manager.js
deleted file mode 100644
index 3b137af9da856..0000000000000
--- a/src/kibana/components/filter_manager/filter_manager.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// Adds a filter to a passed state
-define(function (require) {
-  return function (Private) {
-    var _ = require('lodash');
-    var queryFilter = Private(require('components/filter_bar/query_filter'));
-    var filterManager = {};
-
-    filterManager.add = function (field, values, operation, index) {
-      values = _.isArray(values) ? values : [values];
-      var fieldName = _.isObject(field) ? field.name : field;
-      var filters = _.flatten([queryFilter.getAppFilters()]);
-      var newFilters = [];
-
-      var negate = (operation === '-');
-
-      // TODO: On array fields, negating does not negate the combination, rather all terms
-      _.each(values, function (value) {
-        var filter;
-        var existing = _.find(filters, function (filter) {
-          if (!filter) return;
-
-          if (fieldName === '_exists_' && filter.exists) {
-            return filter.exists.field === value;
-          }
-
-          if (filter.query) {
-            return filter.query.match[fieldName] && filter.query.match[fieldName].query === value;
-          }
-        });
-
-        if (existing) {
-          existing.meta.disabled = false;
-          if (existing.meta.negate !== negate) {
-            queryFilter.invertFilter(existing);
-          }
-          return;
-        }
-
-        switch (fieldName) {
-        case '_exists_':
-          filter = {
-            meta: {
-              negate: negate,
-              index: index
-            },
-            exists: {
-              field: value
-            }
-          };
-          break;
-        default:
-          if (field.scripted) {
-            filter = {
-              meta: { negate: negate, index: index, field: fieldName },
-              script: {
-                script: '(' + field.script + ') == value',
-                lang: field.lang,
-                params: {
-                  value: value
-                }
-              }
-            };
-          } else {
-            filter = { meta: { negate: negate, index: index }, query: { match: {} } };
-            filter.query.match[fieldName] = { query: value, type: 'phrase' };
-          }
-
-          break;
-        }
-
-        newFilters.push(filter);
-      });
-
-      return queryFilter.addFilters(newFilters);
-    };
-
-    return filterManager;
-  };
-});
diff --git a/src/kibana/components/fixedScroll.js b/src/kibana/components/fixedScroll.js
deleted file mode 100644
index 15d885f2ff4f8..0000000000000
--- a/src/kibana/components/fixedScroll.js
+++ /dev/null
@@ -1,114 +0,0 @@
-define(function (require) {
-  var $ = require('jquery');
-  var _ = require('lodash');
-
-  var SCROLLER_HEIGHT = 20;
-
-  require('modules')
-  .get('kibana')
-  .directive('fixedScroll', function ($timeout) {
-    return {
-      restrict: 'A',
-      link: function ($scope, $el) {
-        var $window = $(window);
-        var $scroller = $('<div class="fixed-scroll-scroller">').height(SCROLLER_HEIGHT);
-
-        /**
-         * Listen for scroll events on the $scroller and the $el, sets unlisten()
-         *
-         * unlisten must be called before calling or listen() will throw an Error
-         *
-         * Since the browser emits "scroll" events after setting scrollLeft
-         * the listeners also prevent tug-of-war
-         *
-         * @throws {Error} If unlisten was not called first
-         * @return {undefined}
-         */
-        function listen() {
-          if (unlisten !== _.noop) {
-            throw new Error('fixedScroll listeners were not cleaned up properly before re-listening!');
-          }
-
-          var blockTo;
-          function bind($from, $to) {
-            function handler() {
-              if (blockTo === $to) return (blockTo = null);
-              $to.scrollLeft((blockTo = $from).scrollLeft());
-            }
-
-            $from.on('scroll', handler);
-            return function () {
-              $from.off('scroll', handler);
-            };
-          }
-
-          unlisten = _.flow(
-            bind($el, $scroller),
-            bind($scroller, $el),
-            function () { unlisten = _.noop; }
-          );
-        }
-
-        /**
-         * Remove the listeners bound in listen()
-         * @type {function}
-         */
-        var unlisten = _.noop;
-
-        /**
-         * Revert DOM changes and event listeners
-         * @return {undefined}
-         */
-        function cleanUp() {
-          unlisten();
-          $scroller.detach();
-          $el.css('padding-bottom', 0);
-        }
-
-        /**
-         * Modify the DOM and attach event listeners based on need.
-         * Is called many times to re-setup, must be idempotent
-         * @return {undefined}
-         */
-        function setup() {
-          cleanUp();
-
-          var containerWidth = $el.width();
-          var contentWidth = $el.prop('scrollWidth');
-          var containerHorizOverflow = contentWidth - containerWidth;
-
-          var elTop = $el.offset().top - $window.scrollTop();
-          var elBottom = elTop + $el.height();
-          var windowVertOverflow = elBottom - $window.height();
-
-          var requireScroller = containerHorizOverflow > 0 && windowVertOverflow > 0;
-          if (!requireScroller) return;
-
-          // push the content away from the scroller
-          $el.css('padding-bottom', SCROLLER_HEIGHT);
-
-          // fill the scroller with a dummy element that mimics the content
-          $scroller
-          .width(containerWidth)
-          .html($('<div>').css({ width: contentWidth, height: SCROLLER_HEIGHT }))
-          .insertAfter($el);
-
-          // listen for scroll events
-          listen();
-        }
-
-        // reset when the width or scrollWidth of the $el changes
-        $scope.$watchMulti([
-          function () { return $el.prop('scrollWidth'); },
-          function () { return $el.width(); }
-        ], setup);
-
-        // cleanup when the scope is destroyed
-        $scope.$on('$destroy', function () {
-          cleanUp();
-          $scroller = $window = null;
-        });
-      }
-    };
-  });
-});
diff --git a/src/kibana/components/highlight/highlight.js b/src/kibana/components/highlight/highlight.js
deleted file mode 100644
index cfe92e704be6b..0000000000000
--- a/src/kibana/components/highlight/highlight.js
+++ /dev/null
@@ -1,32 +0,0 @@
-define(function (require) {
-  require('components/highlight/highlight_tags');
-
-  var _ = require('lodash');
-  var angular = require('angular');
-  var module = require('modules').get('kibana');
-
-  module.filter('highlight', function (highlightTags) {
-    return function (formatted, highlight) {
-      if (typeof formatted === 'object') formatted = angular.toJson(formatted);
-
-      _.each(highlight, function (section) {
-        section = _.escape(section);
-
-        // Strip out the highlight tags to compare against the formatted string
-        var untagged = section
-          .split(highlightTags.pre).join('')
-          .split(highlightTags.post).join('');
-
-        // Replace all highlight tags with proper html tags
-        var tagged = section
-          .split(highlightTags.pre).join('<mark>')
-          .split(highlightTags.post).join('</mark>');
-
-        // Replace all instances of the untagged string with the properly tagged string
-        formatted = formatted.split(untagged).join(tagged);
-      });
-
-      return formatted;
-    };
-  });
-});
diff --git a/src/kibana/components/index_patterns/_cast_mapping_type.js b/src/kibana/components/index_patterns/_cast_mapping_type.js
deleted file mode 100644
index 524c2f191bcb5..0000000000000
--- a/src/kibana/components/index_patterns/_cast_mapping_type.js
+++ /dev/null
@@ -1,42 +0,0 @@
-define(function (require) {
-  return function CastMappingTypeFn() {
-    var IndexedArray = require('utils/indexed_array/index');
-
-    castMappingType.types = new IndexedArray({
-      index: ['name'],
-      group: ['type'],
-      immutable: true,
-      initialSet: [
-        { name: 'string',       type: 'string',     group: 'base'   },
-        { name: 'date',         type: 'date',       group: 'base'   },
-        { name: 'boolean',      type: 'boolean',    group: 'base'   },
-        { name: 'float',        type: 'number',     group: 'number' },
-        { name: 'double',       type: 'number',     group: 'number' },
-        { name: 'integer',      type: 'number',     group: 'number' },
-        { name: 'long',         type: 'number',     group: 'number' },
-        { name: 'short',        type: 'number',     group: 'number' },
-        { name: 'byte',         type: 'number',     group: 'number' },
-        { name: 'token_count',  type: 'number',     group: 'number' },
-        { name: 'geo_point',    type: 'geo_point',  group: 'geo'    },
-        { name: 'geo_shape',    type: 'geo_shape',  group: 'geo'    },
-        { name: 'ip',           type: 'ip',         group: 'other'  },
-        { name: 'attachment',   type: 'attachment', group: 'other'  },
-        { name: 'murmur3',      type: 'murmur3',    group: 'hash'   }
-      ]
-    });
-
-    /**
-     * Accepts a mapping type, and converts it into it's js equivilent
-     * @param  {String} type - the type from the mapping's 'type' field
-     * @return {String} - the most specific type that we care for
-     */
-    function castMappingType(name) {
-      if (!name) return 'unknown';
-
-      var match = castMappingType.types.byName[name];
-      return match ? match.type : 'string';
-    }
-
-    return castMappingType;
-  };
-});
diff --git a/src/kibana/components/index_patterns/_field.js b/src/kibana/components/index_patterns/_field.js
deleted file mode 100644
index fd0c1dab40485..0000000000000
--- a/src/kibana/components/index_patterns/_field.js
+++ /dev/null
@@ -1,79 +0,0 @@
-define(function (require) {
-  return function FieldObjectProvider(Private, shortDotsFilter, $rootScope, Notifier) {
-    var notify = new Notifier({ location: 'IndexPattern Field' });
-    var FieldFormat = Private(require('components/index_patterns/_field_format/FieldFormat'));
-    var fieldTypes = Private(require('components/index_patterns/_field_types'));
-    var fieldFormats = Private(require('registry/field_formats'));
-    var ObjDefine = require('utils/obj_define');
-
-    function Field(indexPattern, spec) {
-      // unwrap old instances of Field
-      if (spec instanceof Field) spec = spec.$$spec;
-
-      // constuct this object using ObjDefine class, which
-      // extends the Field.prototype but gets it's properties
-      // defined using the logic below
-      var obj = new ObjDefine(spec, Field.prototype);
-
-      if (spec.name === '_source') {
-        spec.type = '_source';
-      }
-
-      // find the type for this field, fallback to unkown type
-      var type = fieldTypes.byName[spec.type];
-      if (spec.type && !type) {
-        notify.error(
-          'Unkown field type "' + spec.type + '"' +
-          ' for field "' + spec.name + '"' +
-          ' in indexPattern "' + indexPattern.id + '"'
-        );
-      }
-
-      if (!type) type = fieldTypes.byName.unknown;
-
-      var format = spec.format;
-      if (!format || !(format instanceof FieldFormat)) {
-        format = indexPattern.fieldFormatMap[spec.name] || fieldFormats.getDefaultInstance(spec.type);
-      }
-
-      var indexed = !!spec.indexed;
-      var scripted = !!spec.scripted;
-      var sortable = spec.name === '_score' || ((indexed || scripted) && type.sortable);
-      var bucketable = indexed || scripted;
-      var filterable = spec.name === '_id' || scripted || (indexed && type.filterable);
-
-      obj.fact('name');
-      obj.fact('type');
-      obj.writ('count', spec.count || 0);
-
-      // scripted objs
-      obj.fact('scripted', scripted);
-      obj.writ('script', scripted ? spec.script : null);
-      obj.writ('lang', scripted ? (spec.lang || 'expression') : null);
-
-      // mapping info
-      obj.fact('indexed', indexed);
-      obj.fact('analyzed', !!spec.analyzed);
-      obj.fact('doc_values', !!spec.doc_values);
-
-      // usage flags, read-only and won't be saved
-      obj.comp('format', format);
-      obj.comp('sortable', sortable);
-      obj.comp('bucketable', bucketable);
-      obj.comp('filterable', filterable);
-
-      // computed values
-      obj.comp('indexPattern', indexPattern);
-      obj.comp('displayName', shortDotsFilter(spec.name));
-      obj.comp('$$spec', spec);
-
-      return obj.create();
-    }
-
-    Field.prototype.routes = {
-      edit: '/settings/indices/{{indexPattern.id}}/field/{{name}}'
-    };
-
-    return Field;
-  };
-});
diff --git a/src/kibana/components/index_patterns/_index_pattern.js b/src/kibana/components/index_patterns/_index_pattern.js
deleted file mode 100644
index 3654a96b43618..0000000000000
--- a/src/kibana/components/index_patterns/_index_pattern.js
+++ /dev/null
@@ -1,271 +0,0 @@
-define(function (require) {
-  return function IndexPatternFactory(Private, timefilter, Notifier, config, Promise, $rootScope) {
-    var _ = require('lodash');
-    var errors = require('errors');
-    var angular = require('angular');
-
-    var fieldformats = Private(require('registry/field_formats'));
-    var getIds = Private(require('components/index_patterns/_get_ids'));
-    var mapper = Private(require('components/index_patterns/_mapper'));
-    var intervals = Private(require('components/index_patterns/_intervals'));
-    var getComputedFields = require('components/index_patterns/_get_computed_fields');
-    var DocSource = Private(require('components/courier/data_source/doc_source'));
-    var mappingSetup = Private(require('utils/mapping_setup'));
-    var FieldList = Private(require('components/index_patterns/_field_list'));
-
-    var flattenHit = Private(require('components/index_patterns/_flatten_hit'));
-    var formatHit = require('components/index_patterns/_format_hit');
-
-    var type = 'index-pattern';
-
-    var notify = new Notifier();
-
-    var mapping = mappingSetup.expandShorthand({
-      title: 'string',
-      timeFieldName: 'string',
-      intervalName: 'string',
-      fields: 'json',
-      fieldFormatMap: {
-        type: 'string',
-        _serialize: function (map) {
-          if (map == null) return;
-
-          var count = 0;
-          var serialized = _.transform(map, function (flat, format, field) {
-            if (!format) return;
-            count++;
-            flat[field] = format;
-          });
-
-          if (count) return angular.toJson(serialized);
-        },
-        _deserialize: function (map) {
-          if (map == null) return {};
-          return _.mapValues(angular.fromJson(map), function (mapping) {
-            var FieldFormat = fieldformats.byId[mapping.id];
-            return FieldFormat && new FieldFormat(mapping.params);
-          });
-        }
-      }
-    });
-
-    function IndexPattern(id) {
-      var self = this;
-
-      setId(id);
-
-      var docSource = new DocSource();
-
-      self.init = function () {
-        // tell the docSource where to find the doc
-        docSource
-        .index(config.file.kibana_index)
-        .type(type)
-        .id(self.id);
-
-        // listen for config changes and update field list
-        $rootScope.$on('change:config', function () {
-          initFields();
-        });
-
-        return mappingSetup.isDefined(type)
-        .then(function (defined) {
-          // create mapping for this type if one does not exist
-          if (defined) return true;
-          return mappingSetup.setup(type, mapping);
-        })
-        .then(function () {
-          // If there is no id, then there is no document to fetch from elasticsearch
-          if (!self.id) return;
-
-          // fetch the object from ES
-          return docSource.fetch()
-          .then(function applyESResp(resp) {
-            if (!resp.found) throw new errors.SavedObjectNotFound(type, self.id);
-
-            // deserialize any json fields
-            _.forOwn(mapping, function ittr(fieldMapping, name) {
-              if (fieldMapping._deserialize) {
-                resp._source[name] = fieldMapping._deserialize(resp._source[name], resp, name, fieldMapping);
-              }
-            });
-
-            // Give obj all of the values in _source
-            _.assign(self, resp._source);
-
-            self._indexFields();
-
-            // Any time obj is updated, re-call applyESResp
-            docSource.onUpdate().then(applyESResp, notify.fatal);
-          });
-        })
-        .then(function () {
-          // return our obj as the result of init()
-          return self;
-        });
-      };
-
-      function initFields(fields) {
-        self.fields = new FieldList(self, fields || self.fields || []);
-      }
-
-      self._indexFields = function () {
-        if (self.id) {
-          if (!self.fields) {
-            return self.refreshFields();
-          } else {
-            initFields();
-          }
-        }
-      };
-
-      self.addScriptedField = function (name, script, type, lang) {
-        type = type || 'string';
-
-        var scriptFields = _.pluck(self.getScriptedFields(), 'name');
-
-        if (_.contains(scriptFields, name)) {
-          throw new errors.DuplicateField(name);
-        }
-
-        self.fields.push({
-          name: name,
-          script: script,
-          type: type,
-          scripted: true,
-          lang: lang
-        });
-
-        self.save();
-      };
-
-      self.removeScriptedField = function (name) {
-        var fieldIndex = _.findIndex(self.fields, {
-          name: name,
-          scripted: true
-        });
-
-        self.fields.splice(fieldIndex, 1);
-
-        self.save();
-      };
-
-      self.popularizeField = function (fieldName, unit) {
-        if (unit == null) unit = 1;
-
-        var field = _.get(self, ['fields', 'byName', fieldName]);
-        if (!field) return;
-
-        var count = Math.max((field.count || 0) + unit, 0);
-        if (field.count !== count) {
-          field.count = count;
-          self.save();
-        }
-      };
-
-      self.getNonScriptedFields = function () {
-        return _.where(self.fields, { scripted: false });
-      };
-
-      self.getScriptedFields = function () {
-        return _.where(self.fields, { scripted: true });
-      };
-
-      self.getInterval = function () {
-        return this.intervalName && _.find(intervals, { name: this.intervalName });
-      };
-
-      self.toIndexList = function (start, stop) {
-        var interval = this.getInterval();
-        if (interval) {
-          return intervals.toIndexList(self.id, interval, start, stop);
-        } else {
-          return self.id;
-        }
-      };
-
-      self.prepBody = function () {
-        var body = {};
-
-        // serialize json fields
-        _.forOwn(mapping, function (fieldMapping, fieldName) {
-          if (self[fieldName] != null) {
-            body[fieldName] = (fieldMapping._serialize)
-              ? fieldMapping._serialize(self[fieldName])
-              : self[fieldName];
-          }
-        });
-
-        // ensure that the docSource has the current self.id
-        docSource.id(self.id);
-
-        // clear the indexPattern list cache
-        getIds.clearCache();
-        return body;
-      };
-
-      function setId(id) {
-        return self.id = id;
-      }
-
-      self.create = function () {
-        var body = self.prepBody();
-        return docSource.doCreate(body)
-        .then(setId)
-        .catch(function (err) {
-          var confirmMessage = 'Are you sure you want to overwrite this?';
-          if (_.get(err, 'origError.status') === 409 && window.confirm(confirmMessage)) {
-            return docSource.doIndex(body).then(setId);
-          }
-          return Promise.resolve(false);
-        });
-      };
-
-      self.save = function () {
-        var body = self.prepBody();
-        return docSource.doIndex(body).then(setId);
-      };
-
-      self.refreshFields = function () {
-        return mapper.clearCache(self)
-        .then(self._fetchFields)
-        .then(self.save);
-      };
-
-      self._fetchFields = function () {
-        return mapper.getFieldsForIndexPattern(self, true)
-        .then(function (fields) {
-          // append existing scripted fields
-          fields = fields.concat(self.getScriptedFields());
-
-          // initialize self.field with this field list
-          initFields(fields);
-        });
-      };
-
-      self.toJSON = function () {
-        return self.id;
-      };
-
-      self.toString = function () {
-        return '' + self.toJSON();
-      };
-
-      self.metaFields = config.get('metaFields');
-      self.getComputedFields = getComputedFields.bind(self);
-
-      self.flattenHit = flattenHit(self);
-      self.formatHit = formatHit(self, fieldformats.getDefaultInstance('string'));
-      self.formatField = self.formatHit.formatField;
-    }
-
-    IndexPattern.prototype.routes = {
-      edit: '/settings/indices/{{id}}',
-      addField: '/settings/indices/{{id}}/create-field',
-      indexedFields: '/settings/indices/{{id}}?_a=(tab:indexedFields)',
-      scriptedFields: '/settings/indices/{{id}}?_a=(tab:scriptedFields)'
-    };
-
-    return IndexPattern;
-  };
-});
diff --git a/src/kibana/components/index_patterns/_map_field.js b/src/kibana/components/index_patterns/_map_field.js
deleted file mode 100644
index d9a3b661f8915..0000000000000
--- a/src/kibana/components/index_patterns/_map_field.js
+++ /dev/null
@@ -1,51 +0,0 @@
-define(function (require) {
-  return function MapFieldFn(Private, config) {
-    var _ = require('lodash');
-    var castMappingType = Private(require('components/index_patterns/_cast_mapping_type'));
-
-    /**
-     * Accepts a field object and its name, and tries to give it a mapping
-     * @param  {Object} field - the field mapping returned by elasticsearch
-     * @param  {String} type - name of the field
-     * @return {Object} - the resulting field after overrides and tweaking
-     */
-    return function mapField(field, name) {
-      var keys = Object.keys(field.mapping);
-      if (keys.length === 0 || (name[0] === '_') && !_.contains(config.get('metaFields'), name)) return;
-
-      var mapping = _.cloneDeep(field.mapping[keys.shift()]);
-      mapping.type = castMappingType(mapping.type);
-
-      // Override the mapping, even if elasticsearch says otherwise
-      var mappingOverrides = {
-        _source: { type: '_source' },
-        _index: { type: 'string' },
-        _type: { type: 'string' },
-        _id: { type: 'string' },
-        _timestamp: {
-          type: 'date',
-          indexed: true
-        },
-        _score: {
-          type: 'number',
-          indexed: false
-        }
-      };
-
-      if (!mapping.index || mapping.index === 'no') {
-        // elasticsearch responds with false sometimes and 'no' others
-        mapping.indexed = false;
-      } else {
-        mapping.indexed = true;
-      }
-
-      mapping.analyzed = mapping.index === 'analyzed' ? true : false;
-
-      if (mappingOverrides[name]) {
-        _.merge(mapping, mappingOverrides[name]);
-      }
-
-      return mapping;
-    };
-  };
-});
diff --git a/src/kibana/components/index_patterns/index_patterns.js b/src/kibana/components/index_patterns/index_patterns.js
deleted file mode 100644
index ee48459cc57a4..0000000000000
--- a/src/kibana/components/index_patterns/index_patterns.js
+++ /dev/null
@@ -1,48 +0,0 @@
-define(function (require) {
-  var module = require('modules').get('kibana/index_patterns');
-  require('filters/short_dots');
-
-  module.service('indexPatterns', function (configFile, es, Notifier, Private, Promise) {
-    var self = this;
-    var _ = require('lodash');
-    var errors = require('errors');
-
-    var IndexPattern = Private(require('components/index_patterns/_index_pattern'));
-    var patternCache = Private(require('components/index_patterns/_pattern_cache'));
-
-    var notify = new Notifier({ location: 'IndexPatterns Service'});
-
-    self.get = function (id) {
-      if (!id) return self.make();
-
-      var cache = patternCache.get(id);
-      return cache || patternCache.set(id, self.make(id));
-    };
-
-    self.make = function (id) {
-      return (new IndexPattern(id)).init();
-    };
-
-    self.delete = function (pattern) {
-      self.getIds.clearCache();
-      patternCache.delete(pattern.id);
-      return es.delete({
-        index: configFile.kibana_index,
-        type: 'index-pattern',
-        id: pattern.id
-      });
-    };
-
-    self.errors = {
-      MissingIndices: errors.IndexPatternMissingIndices
-    };
-
-    self.cache = patternCache;
-    self.getIds = Private(require('components/index_patterns/_get_ids'));
-    self.intervals = Private(require('components/index_patterns/_intervals'));
-    self.mapper = Private(require('components/index_patterns/_mapper'));
-    self.patternToWildcard = Private(require('components/index_patterns/_pattern_to_wildcard'));
-    self.fieldFormats = Private(require('registry/field_formats'));
-    self.IndexPattern = IndexPattern;
-  });
-});
diff --git a/src/kibana/components/listen.js b/src/kibana/components/listen.js
deleted file mode 100644
index 4954ec770c25e..0000000000000
--- a/src/kibana/components/listen.js
+++ /dev/null
@@ -1,24 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  require('modules').get('kibana')
-  .run(function ($rootScope) {
-
-    /**
-     * Helper that registers an event listener, and removes that listener when
-     * the $scope is destroyed.
-     *
-     * @param  {EventEmitter} emitter - the event emitter to listen to
-     * @param  {string} eventName - the event name
-     * @param  {Function} handler - the event handler
-     * @return {undefined}
-     */
-    $rootScope.constructor.prototype.$listen = function (emitter, eventName, handler) {
-      emitter.on(eventName, handler);
-      this.$on('$destroy', function () {
-        emitter.off(eventName, handler);
-      });
-    };
-
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/components/notify/_errors.js b/src/kibana/components/notify/_errors.js
deleted file mode 100644
index 995b55ae51eb0..0000000000000
--- a/src/kibana/components/notify/_errors.js
+++ /dev/null
@@ -1,71 +0,0 @@
-define(function (require) {
-  var errors = {};
-  var _ = require('lodash');
-
-  var canStack = (function () {
-    var err = new Error();
-    return !!err.stack;
-  }());
-
-  // abstract error class
-  _.class(KibanaError).inherits(Error);
-  function KibanaError(msg, constructor) {
-    this.message = msg;
-
-    Error.call(this, this.message);
-    if (!this.stack) {
-      if (Error.captureStackTrace) {
-        Error.captureStackTrace(this, constructor || KibanaError);
-      } else if (canStack) {
-        this.stack = (new Error()).stack;
-      } else {
-        this.stack = '';
-      }
-    }
-  }
-  errors.KibanaError = KibanaError;
-
-  /**
-   * Map of error text for different error types
-   * @type {Object}
-   */
-  var requireTypeText = {
-    timeout: 'a network timeout',
-    nodefine: 'an invalid module definition',
-    scripterror: 'a generic script error'
-  };
-
-  /**
-   * ScriptLoadFailure error class for handling requirejs load failures
-   * @param {String} [msg] -
-   */
-  errors.ScriptLoadFailure = function ScriptLoadFailure(err) {
-    var explain = requireTypeText[err.requireType] || err.requireType || 'an unknown error';
-
-    this.stack = err.stack;
-    var modules = err.requireModules;
-    if (_.isArray(modules) && modules.length > 0) {
-      modules = modules.map(JSON.stringify);
-
-      if (modules.length > 1) {
-        modules = modules.slice(0, -1).join(', ') + ' and ' + modules.slice(-1)[0];
-      } else {
-        modules = modules[0];
-      }
-
-      modules += ' modules';
-    }
-
-    if (!modules || !modules.length) {
-      modules = 'unknown modules';
-    }
-
-
-    KibanaError.call(this,
-      'Unable to load ' + modules + ' because of ' + explain + '.',
-      errors.ScriptLoadFailure);
-  };
-  _.class(errors.ScriptLoadFailure).inherits(KibanaError);
-
-  return errors;
-});
\ No newline at end of file
diff --git a/src/kibana/components/notify/_notifier.js b/src/kibana/components/notify/_notifier.js
deleted file mode 100644
index e8c7ed00658ad..0000000000000
--- a/src/kibana/components/notify/_notifier.js
+++ /dev/null
@@ -1,355 +0,0 @@
-
-define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-
-  var notifs = [];
-  var setTO = setTimeout;
-  var clearTO = clearTimeout;
-  var consoleGroups = ('group' in window.console) && ('groupCollapsed' in window.console) && ('groupEnd' in window.console);
-
-  var fatalSplashScreen = require('text!components/notify/partials/fatal_splash_screen.html');
-
-  var log = _.noop;
-  if (typeof KIBANA_DIST === 'undefined') {
-    log = function () {
-      console.log.apply(console, arguments);
-    };
-  }
-
-  // used to identify the first call to fatal, set to false there
-  var firstFatal = true;
-
-  var fatalToastTemplate = (function lazyTemplate(tmpl) {
-    var compiled;
-    return function (vars) {
-      return (compiled || (compiled = _.template(tmpl)))(vars);
-    };
-  }(require('text!components/notify/partials/fatal.html')));
-
-  function now() {
-    if (window.performance && window.performance.now) {
-      return window.performance.now();
-    }
-    return Date.now();
-  }
-
-  function closeNotif(cb, key) {
-    return function () {
-      // this === notif
-      var i = notifs.indexOf(this);
-      if (i !== -1) notifs.splice(i, 1);
-      if (this.timerId) this.timerId = clearTO(this.timerId);
-      if (typeof cb === 'function') cb(key);
-    };
-  }
-
-  function add(notif, cb) {
-    if (notif.lifetime !== Infinity) {
-      notif.timerId = setTO(function () {
-        closeNotif(cb, 'ignore').call(notif);
-      }, notif.lifetime);
-    }
-
-    if (notif.actions) {
-      notif.actions.forEach(function (action) {
-        notif[action] = closeNotif(cb, action);
-      });
-    }
-
-    notif.count = (notif.count || 0) + 1;
-
-    var dup = _.find(notifs, function (item) {
-      return item.content === notif.content && item.lifetime === notif.lifetime;
-    });
-
-    if (dup) {
-      dup.count += 1;
-      dup.stacks = _.union(dup.stacks, [notif.stack]);
-    } else {
-      notif.stacks = [notif.stack];
-      notifs.push(notif);
-    }
-  }
-
-  function formatMsg(msg, from) {
-    var rtn = '';
-    if (from) {
-      rtn += from + ': ';
-    }
-
-    if (typeof msg === 'string') {
-      rtn += msg;
-    } else if (msg instanceof Error) {
-      rtn += msg.message;
-    }
-
-    return rtn;
-  }
-
-  // browsers format Error.stack differently; always include message
-  function formatStack(err) {
-    if (err.stack && !~err.stack.indexOf(err.message)) {
-      return 'Error: ' + err.message + '\n' + err.stack;
-    }
-    return err.stack;
-  }
-
-  /**
-   * Functionality to check that
-   */
-  function Notifier(opts) {
-    var self = this;
-    opts = opts || {};
-
-    // label type thing to say where notifications came from
-    self.from = opts.location;
-
-    'event lifecycle timed fatal error warning info'.split(' ').forEach(function (m) {
-      self[m] = _.bind(self[m], self);
-    });
-  }
-
-  // to be notified when the first fatal error occurs, push a function into this array.
-  Notifier.fatalCallbacks = [];
-
-  // set the timer functions that all notification managers will use
-  Notifier.setTimerFns = function (set, clear) {
-    setTO = set;
-    clearTO = clear;
-  };
-
-  // simply a pointer to the global notif list
-  Notifier.prototype._notifs = notifs;
-
-  /**
-   * Log a sometimes redundant event
-   * @param {string} name - The name of the group
-   * @param {boolean} success - Simple flag stating whether the event succeeded
-   */
-  Notifier.prototype.event = createGroupLogger('event', {
-    open: true
-  });
-
-  /**
-   * Log a major, important, event in the lifecycle of the application
-   * @param {string} name - The name of the lifecycle event
-   * @param {boolean} success - Simple flag stating whether the lifecycle event succeeded
-   */
-  Notifier.prototype.lifecycle = createGroupLogger('lifecycle', {
-    open: true
-  });
-
-  /**
-   * Wrap a function so that it's execution time gets logged.
-   *
-   * @param {function} fn - the function to wrap, it's .name property is
-   *                      read so make sure to set it
-   * @return {function} - the wrapped function
-   */
-  Notifier.prototype.timed = function (name, fn) {
-    var self = this;
-
-    if (typeof name === 'function') {
-      fn = name;
-      name = fn.name;
-    }
-
-    return function WrappedNotifierFunction() {
-      var cntx = this;
-      var args = arguments;
-
-      return self.event(name, function () {
-        return fn.apply(cntx, args);
-      });
-    };
-  };
-
-  /**
-   * Kill the page, display an error, then throw the error.
-   * Used as a last-resort error back in many promise chains
-   * so it rethrows the error that's displayed on the page.
-   *
-   * @param  {Error} err - The error that occured
-   */
-  Notifier.prototype.fatal = function (err) {
-    this._showFatal(err);
-    throw err;
-  };
-
-  /**
-   * Display an error that destroys the entire app. Broken out so that
-   * global error handlers can display fatal errors without throwing another
-   * error like in #fatal()
-   *
-   * @param  {Error} err - The fatal error that occured
-   */
-  Notifier.prototype._showFatal = function (err) {
-    if (firstFatal) {
-      _.callEach(Notifier.fatalCallbacks);
-      firstFatal = false;
-      window.addEventListener('hashchange', function () {
-        window.location.reload();
-      });
-    }
-
-    var html = fatalToastTemplate({
-      msg: formatMsg(err, this.from),
-      stack: formatStack(err)
-    });
-
-    var $container = $('#fatal-splash-screen');
-
-    if (!$container.size()) {
-      $(document.body)
-        // in case the app has not completed boot
-      .removeAttr('ng-cloak')
-      .html(fatalSplashScreen);
-
-      $container = $('#fatal-splash-screen');
-    }
-
-    $container.append(html);
-    console.error(err.stack);
-  };
-
-  /**
-   * Alert the user of an error that occured
-   * @param  {Error|String} err
-   */
-  Notifier.prototype.error = function (err, cb) {
-    add({
-      type: 'danger',
-      content: formatMsg(err, this.from),
-      icon: 'warning',
-      title: 'Error',
-      lifetime: Infinity,
-      actions: ['report', 'accept'],
-      stack: formatStack(err)
-    }, cb);
-  };
-
-  /**
-   * Warn the user abort something
-   * @param  {[type]} msg [description]
-   * @return {[type]}     [description]
-   */
-  Notifier.prototype.warning = function (msg, cb) {
-    add({
-      type: 'warning',
-      content: formatMsg(msg, this.from),
-      icon: 'warning',
-      title: 'Warning',
-      lifetime: 10000,
-      actions: ['accept']
-    }, cb);
-  };
-
-  /**
-   * Display a debug message
-   * @param  {String} msg [description]
-   * @return {[type]}     [description]
-   */
-  Notifier.prototype.info = function (msg, cb) {
-    add({
-      type: 'info',
-      content: formatMsg(msg, this.from),
-      icon: 'info-circle',
-      title: 'Debug',
-      lifetime: 5000,
-      actions: ['accept']
-    }, cb);
-  };
-
-  if (log === _.noop) {
-    Notifier.prototype.log = _.noop;
-  } else {
-    Notifier.prototype.log = function () {
-      var args = [].slice.apply(arguments);
-      if (this.from) args.unshift(this.from + ':');
-      log.apply(null, args);
-    };
-  }
-
-  // general functionality used by .event() and .lifecycle()
-  function createGroupLogger(type, opts) {
-    // Track the groups managed by this logger
-    var groups = window[type + 'Groups'] = {};
-
-    return function logger(name, success) {
-      var status; // status of the timer
-      var exec; // function to execute and wrap
-      var ret; // return value
-
-      var complete = function (val) { logger(name, true); return val; };
-      var failure = function (err) { logger(name, false); throw err; };
-
-      if (typeof success === 'function' || success === void 0) {
-        // start
-        groups[name] = now();
-        if (success) {
-          // success === the function to time
-          exec = success;
-        } else {
-          // function that can report on the success or failure of an op, and pass their value along
-          ret = complete;
-          ret.failure = failure;
-        }
-      }
-      else {
-        groups[name] = now() - (groups[name] || 0);
-        var time = ' in ' + groups[name].toFixed(2) + 'ms';
-
-        // end
-        if (success) {
-          status = 'complete' + time;
-        } else {
-          groups[name] = false;
-          status = 'failure' + time;
-        }
-      }
-
-      if (consoleGroups) {
-        if (status) {
-          console.log(status);
-          console.groupEnd();
-        } else {
-          if (opts.open) {
-            console.group(name);
-          } else {
-            console.groupCollapsed(name);
-          }
-        }
-      } else {
-        log('KBN: ' + name + (status ? ' - ' + status : ''));
-      }
-
-      if (exec) {
-        try {
-          ret = exec();
-        } catch (e) {
-          return failure(e);
-        }
-
-        if (ret && typeof ret.then === 'function') {
-          // return a new promise that proxies the value
-          // and logs about the promise outcome
-          return ret.then(function (val) {
-            complete();
-            return val;
-          }, function (err) {
-            failure(err);
-            throw err;
-          });
-        }
-
-        // the function executed fine, and didn't return a promise, move along
-        complete();
-      }
-
-      return ret;
-    };
-  }
-
-  return Notifier;
-});
diff --git a/src/kibana/components/notify/directives.js b/src/kibana/components/notify/directives.js
deleted file mode 100644
index 4c9d9a59d0d65..0000000000000
--- a/src/kibana/components/notify/directives.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(function (require) {
-  var notify = require('modules').get('kibana/notify');
-  var _ = require('lodash');
-
-  notify.directive('kbnNotifications', function () {
-    return {
-      restrict: 'E',
-      scope: {
-        list: '=list'
-      },
-      replace: true,
-      template: require('text!components/notify/partials/toaster.html')
-    };
-  });
-});
diff --git a/src/kibana/components/notify/notify.js b/src/kibana/components/notify/notify.js
deleted file mode 100644
index 201adf7bcafbf..0000000000000
--- a/src/kibana/components/notify/notify.js
+++ /dev/null
@@ -1,52 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var modules = require('modules');
-  var module = modules.get('kibana/notify');
-  var errors = require('components/notify/_errors');
-  var Notifier = require('components/notify/_notifier');
-  var rootNotifier = new Notifier();
-
-  require('components/notify/directives');
-
-  module.factory('createNotifier', function () {
-    return function (opts) {
-      return new Notifier(opts);
-    };
-  });
-
-  module.factory('Notifier', function () {
-    return Notifier;
-  });
-
-  module.run(function ($timeout) {
-    // provide alternate methods for setting timeouts, which will properly trigger digest cycles
-    Notifier.setTimerFns($timeout, $timeout.cancel);
-  });
-
-  /**
-   * Global Angular exception handler (NOT JUST UNCAUGHT EXCEPTIONS)
-   */
-  // modules
-  //   .get('exceptionOverride')
-  //   .factory('$exceptionHandler', function () {
-  //     return function (exception, cause) {
-  //       rootNotifier.fatal(exception, cause);
-  //     };
-  //   });
-
-  /**
-   * Global Require.js exception handler
-   */
-  window.requirejs.onError = function (err) {
-    rootNotifier.fatal(new errors.ScriptLoadFailure(err));
-  };
-
-  window.onerror = function (err, url, line) {
-    rootNotifier.fatal(new Error(err + ' (' + url + ':' + line + ')'));
-    return true;
-  };
-
-  return rootNotifier;
-
-});
diff --git a/src/kibana/components/number_list/number_list.js b/src/kibana/components/number_list/number_list.js
deleted file mode 100644
index e9d779926fb05..0000000000000
--- a/src/kibana/components/number_list/number_list.js
+++ /dev/null
@@ -1,108 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var parseRange = require('utils/range');
-
-  require('components/number_list/number_list_input');
-  require('modules')
-  .get('kibana')
-  .directive('kbnNumberList', function () {
-    return {
-      restrict: 'E',
-      template: require('text!components/number_list/number_list.html'),
-      controllerAs: 'numberListCntr',
-      require: 'ngModel',
-      controller: function ($scope, $attrs, $parse) {
-        var self = this;
-
-        // Called from the pre-link function once we have the controllers
-        self.init = function (modelCntr) {
-          self.modelCntr = modelCntr;
-
-          self.getList = function () {
-            return self.modelCntr.$modelValue;
-          };
-
-          self.getUnitName = _.partial($parse($attrs.unit), $scope);
-
-          var defaultRange = self.range = parseRange('[0,Infinity)');
-
-          $scope.$watch(function () {
-            return $attrs.range;
-          }, function (range, prev) {
-            if (!range) {
-              self.range = defaultRange;
-              return;
-            }
-
-            try {
-              self.range = parseRange(range);
-            } catch (e) {
-              throw new TypeError('Unable to parse range: ' + e.message);
-            }
-          });
-
-          /**
-           * Remove an item from list by index
-           * @param  {number} index
-           * @return {undefined}
-           */
-          self.remove = function (index) {
-            var list = self.getList();
-            if (!list) return;
-
-            list.splice(index, 1);
-          };
-
-          /**
-           * Add an item to the end of the list
-           * @return {undefined}
-           */
-          self.add = function () {
-            var list = self.getList();
-            if (!list) return;
-
-            list.push(_.last(list) + 1);
-          };
-
-          /**
-           * Check to see if the list is too short.
-           *
-           * @return {Boolean}
-           */
-          self.tooShort = function () {
-            return _.size(self.getList()) < 1;
-          };
-
-          /**
-           * Check to see if the list is too short, but simply
-           * because the user hasn't interacted with it yet
-           *
-           * @return {Boolean}
-           */
-          self.undefinedLength = function () {
-            return self.tooShort() && (self.modelCntr.$untouched && self.modelCntr.$pristine);
-          };
-
-          /**
-           * Check to see if the list is too short
-           *
-           * @return {Boolean}
-           */
-          self.invalidLength = function () {
-            return self.tooShort() && !self.undefinedLength();
-          };
-
-          $scope.$watchCollection(self.getList, function () {
-            self.modelCntr.$setValidity('numberListLength', !self.tooShort());
-          });
-        };
-      },
-      link: {
-        pre: function ($scope, $el, attrs, ngModelCntr) {
-          $scope.numberListCntr.init(ngModelCntr);
-        }
-      },
-    };
-  });
-
-});
diff --git a/src/kibana/components/persisted_log/persisted_log.js b/src/kibana/components/persisted_log/persisted_log.js
deleted file mode 100644
index 1e7427b6f1524..0000000000000
--- a/src/kibana/components/persisted_log/persisted_log.js
+++ /dev/null
@@ -1,48 +0,0 @@
-define(function (require) {
-  var modules = require('modules');
-  var _ = require('lodash');
-
-  modules.get('kibana/persisted_log')
-  .factory('PersistedLog', function ($window, localStorage) {
-    function PersistedLog(name, options) {
-      options = options || {};
-      this.name = name;
-      this.maxLength = options.maxLength || 0;
-      this.filterDuplicates = options.filterDuplicates || false;
-      this.items = localStorage.get(this.name) || [];
-    }
-
-    PersistedLog.prototype.add = function (val) {
-      if (val == null) {
-        return this.items;
-      }
-
-      var stack = this.items;
-
-      // remove any matching items from the stack if option is set
-      if (this.filterDuplicates) {
-        stack = _.pull(this.items, val);
-        stack = _.filter(stack, function (item) {
-          return !_.isEqual(item, val);
-        });
-      }
-
-      stack.unshift(val);
-
-      // if maxLength is set, truncate the stack
-      if (this.maxLength > 0) {
-        stack = stack.slice(0, this.maxLength);
-      }
-
-      // persist the stack
-      localStorage.set(this.name, stack);
-      return this.items = stack;
-    };
-
-    PersistedLog.prototype.get = function () {
-      return this.items;
-    };
-
-    return PersistedLog;
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/components/reflow_watcher.js b/src/kibana/components/reflow_watcher.js
deleted file mode 100644
index bc9e8a441e224..0000000000000
--- a/src/kibana/components/reflow_watcher.js
+++ /dev/null
@@ -1,68 +0,0 @@
-define(function (require) {
-  return function ReflowWatcherService(Private, $rootScope, $http) {
-    var angular = require('angular');
-    var $ = require('jquery');
-    var _ = require('lodash');
-
-    var EventEmitter = Private(require('factories/events'));
-    var $body = $(document.body);
-    var $window = $(window);
-
-    var MOUSE_EVENTS = 'mouseup';
-    var WINDOW_EVENTS = 'resize';
-
-    _.class(ReflowWatcher).inherits(EventEmitter);
-    /**
-     * Watches global activity which might hint at a change in the content, which
-     * in turn provides a hint to resizers that they should check their size
-     */
-    function ReflowWatcher() {
-      ReflowWatcher.Super.call(this);
-
-      // bound version of trigger that can be used as a handler
-      this.trigger = _.bind(this.trigger, this);
-      this._emitReflow = _.bind(this._emitReflow, this);
-
-      // list of functions to call that will unbind our watchers
-      this._unwatchers = [
-        $rootScope.$watchCollection(function () {
-          return $http.pendingRequests;
-        }, this.trigger)
-      ];
-
-      $body.on(MOUSE_EVENTS, this.trigger);
-      $window.on(WINDOW_EVENTS, this.trigger);
-    }
-
-    /**
-     * Simply emit reflow, but in a way that can be bound and passed to
-     * other functions. Using _.bind caused extra arguments to be added, and
-     * then emitted to other places. No Bueno
-     *
-     * @return {void}
-     */
-    ReflowWatcher.prototype._emitReflow = function () {
-      this.emit('reflow');
-    };
-
-    /**
-     * Emit the "reflow" event in the next tick of the digest cycle
-     * @return {void}
-     */
-    ReflowWatcher.prototype.trigger = function () {
-      $rootScope.$evalAsync(this._emitReflow);
-    };
-
-    /**
-     * Signal to the ReflowWatcher that it should clean up it's listeners
-     * @return {void}
-     */
-    ReflowWatcher.prototype.destroy = function () {
-      $body.off(MOUSE_EVENTS, this.trigger);
-      $window.off(WINDOW_EVENTS, this.trigger);
-      _.callEach(this._unwatchers);
-    };
-
-    return new ReflowWatcher();
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/setup/_setup_error.js b/src/kibana/components/setup/_setup_error.js
deleted file mode 100644
index 0c30cb6b64391..0000000000000
--- a/src/kibana/components/setup/_setup_error.js
+++ /dev/null
@@ -1,18 +0,0 @@
-define(function (require) {
-  return function SetupErrorFactory(configFile) {
-    var _ = require('lodash');
-
-    function SetupError(template, err) {
-      // don't override other setup errors
-      if (err && err instanceof SetupError) return err;
-
-      var err2 = new Error(_.template(template)({ configFile: configFile }));
-      if (err) {
-        err2.origError = err;
-        if (err.stack) err2.stack = err.stack;
-      }
-      return err2;
-    }
-    return SetupError;
-  };
-});
diff --git a/src/kibana/components/setup/setup.js b/src/kibana/components/setup/setup.js
deleted file mode 100644
index af5e88beb5b35..0000000000000
--- a/src/kibana/components/setup/setup.js
+++ /dev/null
@@ -1,29 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-
-  require('components/notify/notify');
-
-  require('modules').get('components/setup', ['kibana', 'kibana/notify', 'kibana/config'])
-  .service('kbnSetup', function (Private, Promise, Notifier, es, configFile) {
-    // setup steps
-    var checkForEs = Private(require('components/setup/steps/check_for_es'));
-    var checkEsVersion = Private(require('components/setup/steps/check_es_version'));
-    var checkForKibanaIndex = Private(require('components/setup/steps/check_for_kibana_index'));
-    var createKibanaIndex = Private(require('components/setup/steps/create_kibana_index'));
-
-    var notify = new Notifier({ location: 'Setup' });
-
-    return _.once(function () {
-      var complete = notify.lifecycle('bootstrap');
-
-      return checkForEs()
-      .then(checkEsVersion)
-      .then(checkForKibanaIndex)
-      .then(function (exists) {
-        if (!exists) return createKibanaIndex();
-      })
-      .then(complete, complete.failure);
-    });
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/components/setup/steps/check_es_version.js b/src/kibana/components/setup/steps/check_es_version.js
deleted file mode 100644
index 54534043d4c69..0000000000000
--- a/src/kibana/components/setup/steps/check_es_version.js
+++ /dev/null
@@ -1,43 +0,0 @@
-define(function (require) {
-  return function CheckEsVersionFn(Private, es, configFile, Notifier, minimumElasticsearchVersion) {
-
-    var _ = require('lodash');
-    var versionmath = require('utils/versionmath');
-    var esBool = require('utils/esBool');
-    var notify = new Notifier({
-      location: 'Setup: Elasticsearch version check'
-    });
-
-    return notify.timed(function checkEsVersion() {
-      var SetupError = Private(require('components/setup/_setup_error'));
-
-      return es.nodes.info()
-      .then(function (info) {
-        var badNodes = _.filter(info.nodes, function (node) {
-          // remove client nodes (Logstash)
-          var isClient = _.get(node, 'attributes.client');
-          if (isClient != null && esBool(isClient) === true) {
-            return false;
-          }
-
-          // remove nodes that are gte the min version
-          var v = node.version.split('-')[0];
-          return !versionmath.gte(minimumElasticsearchVersion, v);
-        });
-
-        if (!badNodes.length) return true;
-
-        var badNodeNames = badNodes.map(function (node) {
-          return 'Elasticsearch v' + node.version + ' @ ' + node.http_address + ' (' + node.ip + ')';
-        });
-
-        throw SetupError(
-          'This version of Kibana requires Elasticsearch ' +
-          minimumElasticsearchVersion + ' or higher on all nodes. ' +
-          'I found the following incompatible nodes in your cluster: \n\n' +
-          badNodeNames.join('\n')
-        );
-      });
-    });
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/setup/steps/check_for_es.js b/src/kibana/components/setup/steps/check_for_es.js
deleted file mode 100644
index 951f52543281e..0000000000000
--- a/src/kibana/components/setup/steps/check_for_es.js
+++ /dev/null
@@ -1,21 +0,0 @@
-define(function (require) {
-  return function checkForEsFunction(Private, Notifier, es, configFile) {
-    var SetupError = Private(require('components/setup/_setup_error'));
-    var notify = new Notifier({ location: 'Setup: Elasticsearch check' });
-
-    return function checkForES() {
-      var complete = notify.lifecycle('es check');
-      return es.info({
-        method: 'GET'
-      })
-      .catch(function (err) {
-        if (err.body && err.body.message) {
-          throw new SetupError(err.body.message, err);
-        } else {
-          throw new SetupError('Unknown error while connecting to Elasticsearch', err);
-        }
-      })
-      .then(complete, complete.failure);
-    };
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/setup/steps/check_for_kibana_index.js b/src/kibana/components/setup/steps/check_for_kibana_index.js
deleted file mode 100644
index ca962e372cd59..0000000000000
--- a/src/kibana/components/setup/steps/check_for_kibana_index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-define(function (require) {
-  return function CheckForKibanaIndexFn(Private, es, Notifier, configFile) {
-    var SetupError = Private(require('components/setup/_setup_error'));
-    var notify = new Notifier({ location: 'Setup: Kibana index check' });
-
-    return function checkForKibana() {
-      var complete = notify.lifecycle('kibana index check');
-      return es.indices.exists({
-        index: configFile.kibana_index
-      })
-      .catch(function (err) {
-        throw new SetupError('Unable to check for Kibana index "<%= configFile.kibana_index %>"', err);
-      })
-      .then(complete, complete.failure);
-    };
-  };
-});
diff --git a/src/kibana/components/setup/steps/create_kibana_index.js b/src/kibana/components/setup/steps/create_kibana_index.js
deleted file mode 100644
index 840984c57f07d..0000000000000
--- a/src/kibana/components/setup/steps/create_kibana_index.js
+++ /dev/null
@@ -1,31 +0,0 @@
-define(function (require) {
-  return function CreateKibanaIndexFn(Private, es, configFile, Notifier) {
-    return function createKibanaIndex() {
-      var notify = new Notifier({ location: 'Setup: Kibana Index Creation' });
-      var complete = notify.lifecycle('kibana index creation');
-      var SetupError = Private(require('components/setup/_setup_error'));
-
-      return es.indices.create({
-        index: configFile.kibana_index,
-        body: {
-          settings: {
-            number_of_shards : 1
-          }
-        }
-      })
-      .catch(function (err) {
-        throw new SetupError('Unable to create Kibana index "<%= configFile.kibana_index %>"', err);
-      })
-      .then(function () {
-        return es.cluster.health({
-          waitForStatus: 'yellow',
-          index: configFile.kibana_index
-        })
-        .catch(function (err) {
-          throw new SetupError('Waiting for Kibana index "<%= configFile.kibana_index %>" to come online failed', err);
-        });
-      })
-      .then(complete, complete.failure);
-    };
-  };
-});
diff --git a/src/kibana/components/state_management/app_state.js b/src/kibana/components/state_management/app_state.js
deleted file mode 100644
index 509e4bcdd4571..0000000000000
--- a/src/kibana/components/state_management/app_state.js
+++ /dev/null
@@ -1,54 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var modules = require('modules');
-  var urlParam = '_a';
-
-
-  function AppStateProvider(Private, $rootScope, getAppState) {
-    var State = Private(require('components/state_management/state'));
-
-
-    _.class(AppState).inherits(State);
-    function AppState(defaults) {
-      AppState.Super.call(this, urlParam, defaults);
-      getAppState._set(this);
-    }
-
-    // if the url param is missing, write it back
-    AppState.prototype._persistAcrossApps = false;
-
-
-    AppState.prototype.destroy = function () {
-      AppState.Super.prototype.destroy.call(this);
-      getAppState._set(null);
-    };
-
-    return AppState;
-  }
-
-  modules.get('kibana/global_state')
-  .factory('AppState', function (Private) {
-    return Private(AppStateProvider);
-  })
-  .service('getAppState', function ($location) {
-    var currentAppState;
-
-    function get() {
-      return currentAppState;
-    }
-
-    // Checks to see if the appState might already exist, even if it hasn't been newed up
-    get.previouslyStored = function () {
-      var search = $location.search();
-      return search[urlParam] ? true : false;
-    };
-
-    get._set = function (current) {
-      currentAppState = current;
-    };
-
-    return get;
-  });
-
-  return AppStateProvider;
-});
diff --git a/src/kibana/components/state_management/global_state.js b/src/kibana/components/state_management/global_state.js
deleted file mode 100644
index 7d4b6b1d46919..0000000000000
--- a/src/kibana/components/state_management/global_state.js
+++ /dev/null
@@ -1,26 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
-  var qs = require('utils/query_string');
-  var rison = require('utils/rison');
-
-  var module = require('modules').get('kibana/global_state');
-
-  module.service('globalState', function (Private, $rootScope, $location) {
-    var State = Private(require('components/state_management/state'));
-
-    _.class(GlobalState).inherits(State);
-    function GlobalState(defaults) {
-      GlobalState.Super.call(this, '_g', defaults);
-    }
-
-    // if the url param is missing, write it back
-    GlobalState.prototype._persistAcrossApps = true;
-
-    GlobalState.prototype.removeFromUrl = function (url) {
-      return qs.replaceParamInUrl(url, this._urlParam, null);
-    };
-
-    return new GlobalState();
-  });
-});
diff --git a/src/kibana/components/state_management/state.js b/src/kibana/components/state_management/state.js
deleted file mode 100644
index 399e08de8d215..0000000000000
--- a/src/kibana/components/state_management/state.js
+++ /dev/null
@@ -1,151 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var rison = require('utils/rison');
-
-  var applyDiff = require('utils/diff_object');
-  var qs = require('utils/query_string');
-
-  return function StateProvider(Notifier, Private, $rootScope, $location) {
-    var Events = Private(require('factories/events'));
-
-    _.class(State).inherits(Events);
-    function State(urlParam, defaults) {
-      State.Super.call(this);
-
-      var self = this;
-      self.setDefaults(defaults);
-      self._urlParam = urlParam || '_s';
-
-      // When the URL updates we need to fetch the values from the URL
-      self._cleanUpListeners = _.partial(_.callEach, [
-        // partial route update, no app reload
-        $rootScope.$on('$routeUpdate', function () {
-          self.fetch();
-        }),
-
-        // begining of full route update, new app will be initialized before
-        // $routeChangeSuccess or $routeChangeError
-        $rootScope.$on('$routeChangeStart', function () {
-          if (self._persistAcrossApps) {
-            self.fetch();
-          } else {
-            self.destroy();
-          }
-        })
-      ]);
-
-      // Initialize the State with fetch
-      self.fetch();
-    }
-
-    State.prototype._readFromURL = function () {
-      var search = $location.search();
-      try {
-        return search[this._urlParam] ? rison.decode(search[this._urlParam]) : null;
-      } catch (e) {
-        var notify = new Notifier();
-        notify.error('Unable to parse URL');
-        search[this._urlParam] = rison.encode(this._defaults);
-        $location.search(search).replace();
-        return null;
-      }
-    };
-
-    /**
-     * Fetches the state from the url
-     * @returns {void}
-     */
-    State.prototype.fetch = function () {
-      var stash = this._readFromURL();
-
-      // nothing to read from the url? save if ordered to persist
-      if (stash === null) {
-        if (this._persistAcrossApps) {
-          return this.save();
-        } else {
-          stash = {};
-        }
-      }
-
-      _.defaults(stash, this._defaults);
-      // apply diff to state from stash, will change state in place via side effect
-      var diffResults = applyDiff(this, stash);
-
-      if (diffResults.keys.length) {
-        this.emit('fetch_with_changes', diffResults.keys);
-      }
-    };
-
-    /**
-     * Saves the state to the url
-     * @returns {void}
-     */
-    State.prototype.save = function (replace) {
-      var stash = this._readFromURL();
-      var state = this.toObject();
-      replace = replace || false;
-
-      if (!stash) {
-        replace = true;
-        stash = {};
-      }
-
-      _.defaults(state, this._defaults);
-      // apply diff to state from stash, will change state in place via side effect
-      var diffResults = applyDiff(stash, state);
-
-      if (diffResults.keys.length) {
-        this.emit('save_with_changes', diffResults.keys);
-      }
-
-      // persist the state in the URL
-      var search = $location.search();
-      search[this._urlParam] = this.toRISON();
-      if (replace) {
-        $location.search(search).replace();
-      } else {
-        $location.search(search);
-      }
-    };
-
-    /**
-     * Calls save with a forced replace
-     * @returns {void}
-     */
-    State.prototype.replace = function () {
-      this.save(true);
-    };
-
-    /**
-     * Resets the state to the defaults
-     *
-     * @returns {void}
-     */
-    State.prototype.reset = function () {
-      // apply diff to _attributes from defaults, this is side effecting so
-      // it will change the state in place.
-      var diffResults = applyDiff(this, this._defaults);
-      if (diffResults.keys.length) {
-        this.emit('reset_with_changes', diffResults.keys);
-      }
-      this.save();
-    };
-
-    /**
-     * Cleans up the state object
-     * @returns {void}
-     */
-    State.prototype.destroy = function () {
-      this.off(); // removes all listners
-      this._cleanUpListeners(); // Removes the $routeUpdate listner
-    };
-
-    State.prototype.setDefaults = function (defaults) {
-      this._defaults = defaults || {};
-    };
-
-    return State;
-
-  };
-
-});
diff --git a/src/kibana/components/storage/storage.js b/src/kibana/components/storage/storage.js
deleted file mode 100644
index d8873c104e3d1..0000000000000
--- a/src/kibana/components/storage/storage.js
+++ /dev/null
@@ -1,43 +0,0 @@
-define(function (require) {
-  var modules = require('modules');
-  var angular = require('angular');
-
-  function Storage(store) {
-    var self = this;
-    self.store = store;
-
-    self.get = function (key) {
-      try {
-        return JSON.parse(self.store.getItem(key));
-      } catch (e) {
-        return null;
-      }
-    };
-
-    self.set = function (key, value) {
-      try {
-        return self.store.setItem(key, angular.toJson(value));
-      } catch (e) {
-        return false;
-      }
-    };
-
-    self.remove = function (key) {
-      return self.store.removeItem(key);
-    };
-
-    self.clear = function () {
-      return self.store.clear();
-    };
-  }
-
-  var createService = function (type) {
-    return function ($window) {
-      return new Storage($window[type]);
-    };
-  };
-
-  modules.get('kibana/storage')
-    .service('localStorage', createService('localStorage'))
-    .service('sessionStorage', createService('sessionStorage'));
-});
\ No newline at end of file
diff --git a/src/kibana/components/stringify/.jshintrc b/src/kibana/components/stringify/.jshintrc
deleted file mode 100644
index 6a5e6e12a7db9..0000000000000
--- a/src/kibana/components/stringify/.jshintrc
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "extends": "../../.jshintrc",
-  "unused": true
-}
diff --git a/src/kibana/components/stringify/register.js b/src/kibana/components/stringify/register.js
deleted file mode 100644
index d4c5970f7f61c..0000000000000
--- a/src/kibana/components/stringify/register.js
+++ /dev/null
@@ -1,11 +0,0 @@
-define(function (require) {
-  var fieldFormats = require('registry/field_formats');
-  fieldFormats.register(require('components/stringify/types/Url'));
-  fieldFormats.register(require('components/stringify/types/Bytes'));
-  fieldFormats.register(require('components/stringify/types/Date'));
-  fieldFormats.register(require('components/stringify/types/Ip'));
-  fieldFormats.register(require('components/stringify/types/Number'));
-  fieldFormats.register(require('components/stringify/types/Percent'));
-  fieldFormats.register(require('components/stringify/types/String'));
-  fieldFormats.register(require('components/stringify/types/Source'));
-});
diff --git a/src/kibana/components/stringify/types/Bytes.js b/src/kibana/components/stringify/types/Bytes.js
deleted file mode 100644
index 2cfeb57667ad0..0000000000000
--- a/src/kibana/components/stringify/types/Bytes.js
+++ /dev/null
@@ -1,10 +0,0 @@
-define(function (require) {
-  return function BytesFormatProvider(Private) {
-    var Numeral = Private(require('components/stringify/types/_Numeral'));
-    return Numeral.factory({
-      id: 'bytes',
-      title: 'Bytes',
-      sampleInputs: [1024, 5150000, 1990000000]
-    });
-  };
-});
diff --git a/src/kibana/components/style_compile/style_compile.css.tmpl b/src/kibana/components/style_compile/style_compile.css.tmpl
deleted file mode 100644
index 1f23c6fb57a06..0000000000000
--- a/src/kibana/components/style_compile/style_compile.css.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-.truncate-by-height {
-  max-height: <%= truncateMaxHeight %>;
-  display: inline-block;
-}
-.truncate-by-height::before {
-  top: <%= truncateGradientTop %>;
-}
\ No newline at end of file
diff --git a/src/kibana/components/style_compile/style_compile.js b/src/kibana/components/style_compile/style_compile.js
deleted file mode 100644
index 5ce60aca5acc1..0000000000000
--- a/src/kibana/components/style_compile/style_compile.js
+++ /dev/null
@@ -1,32 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var $style = $('<style>').appendTo('head').attr('id', 'style-compile');
-
-  require('modules')
-  .get('kibana')
-  .run(function ($rootScope, $compile, config) {
-    var truncateGradientHeight = 15;
-    var template = _.template(require('text!components/style_compile/style_compile.css.tmpl'));
-    var locals = {};
-
-    $rootScope.$on('$destroy', function () {
-      $style.remove();
-    });
-
-    // watch the value of the truncate:maxHeight config param
-    $rootScope.$watch(function () {
-      return config.get('truncate:maxHeight');
-    }, function (maxHeight) {
-      if (maxHeight > 0) {
-        locals.truncateMaxHeight = maxHeight + 'px !important';
-        locals.truncateGradientTop = maxHeight - truncateGradientHeight + 'px';
-      } else {
-        locals.truncateMaxHeight = 'none';
-        locals.truncateGradientTop = '-' + truncateGradientHeight + 'px';
-      }
-
-      $style.html(template(locals));
-    });
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/components/timefilter/lib/diff_interval.js b/src/kibana/components/timefilter/lib/diff_interval.js
deleted file mode 100644
index 8f96fcc9a86e1..0000000000000
--- a/src/kibana/components/timefilter/lib/diff_interval.js
+++ /dev/null
@@ -1,21 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  return function diffTimeProvider(Private) {
-    var diff = Private(require('utils/diff_time_picker_vals'));
-
-    return function (self) {
-      var oldRefreshInterval = _.clone(self.refreshInterval);
-
-      return function () {
-        if (diff(self.refreshInterval, oldRefreshInterval)) {
-          self.emit('update');
-          if (!self.refreshInterval.pause && self.refreshInterval.value !== 0) {
-            self.emit('fetch');
-          }
-        }
-
-        oldRefreshInterval = _.clone(self.refreshInterval);
-      };
-    };
-  };
-});
diff --git a/src/kibana/components/timefilter/lib/diff_time.js b/src/kibana/components/timefilter/lib/diff_time.js
deleted file mode 100644
index ce67462bfb8ad..0000000000000
--- a/src/kibana/components/timefilter/lib/diff_time.js
+++ /dev/null
@@ -1,17 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  return function diffTimeProvider(Private) {
-    var diff = Private(require('utils/diff_time_picker_vals'));
-
-    return function (self) {
-        var oldTime = _.clone(self.time);
-        return function () {
-          if (diff(self.time, oldTime)) {
-            self.emit('update');
-            self.emit('fetch');
-          }
-          oldTime = _.clone(self.time);
-        };
-      };
-  };
-});
diff --git a/src/kibana/components/timepicker/timepicker.js b/src/kibana/components/timepicker/timepicker.js
deleted file mode 100644
index cb7552f6075b1..0000000000000
--- a/src/kibana/components/timepicker/timepicker.js
+++ /dev/null
@@ -1,156 +0,0 @@
-define(function (require) {
-  var html = require('text!components/timepicker/timepicker.html');
-  var module = require('modules').get('components/timepicker');
-  var _ = require('lodash');
-  var datemath = require('utils/datemath');
-  var moment = require('moment');
-
-  require('directives/input_datetime');
-  require('directives/inequality');
-  require('components/timepicker/quick_ranges');
-  require('components/timepicker/refresh_intervals');
-  require('components/timepicker/time_units');
-
-  module.directive('kbnTimepicker', function (quickRanges, timeUnits, refreshIntervals) {
-    return {
-      restrict: 'E',
-      scope: {
-        from: '=',
-        to: '=',
-        mode: '=',
-        interval: '=',
-        activeTab: '='
-      },
-      template: html,
-      controller: function ($scope) {
-        var init = function () {
-          $scope.setMode($scope.mode);
-        };
-
-        $scope.format = 'MMMM Do YYYY, HH:mm:ss.SSS';
-        $scope.modes = ['quick', 'relative', 'absolute'];
-        $scope.activeTab = $scope.activeTab || 'filter';
-
-        if (_.isUndefined($scope.mode)) $scope.mode = 'quick';
-
-        $scope.quickLists = _(quickRanges).groupBy('section').values().value();
-        $scope.refreshLists = _(refreshIntervals).groupBy('section').values().value();
-
-        $scope.relative = {
-          count: 1,
-          unit: 'm',
-          preview: undefined,
-          round: false
-        };
-
-        $scope.absolute = {
-          from: moment(),
-          to: moment()
-        };
-
-        $scope.units = timeUnits;
-
-        $scope.relativeOptions = [
-          {text: 'Seconds ago', value: 's'},
-          {text: 'Minutes ago', value: 'm'},
-          {text: 'Hours ago', value: 'h'},
-          {text: 'Days ago', value: 'd'},
-          {text: 'Weeks ago', value: 'w'},
-          {text: 'Months ago', value: 'M'},
-          {text: 'Years ago', value: 'y'},
-        ];
-
-        $scope.$watch('absolute.from', function (date) {
-          if (_.isDate(date)) $scope.absolute.from = moment(date);
-        });
-
-        $scope.$watch('absolute.to', function (date) {
-          if (_.isDate(date)) $scope.absolute.to = moment(date);
-        });
-
-        $scope.setMode = function (thisMode) {
-          switch (thisMode) {
-          case 'quick':
-            break;
-          case 'relative':
-            var fromParts = $scope.from.toString().split('-');
-            var relativeParts = [];
-
-            // Try to parse the relative time, if we can't use moment duration to guestimate
-            if ($scope.to.toString() === 'now' && fromParts[0] === 'now' && fromParts[1]) {
-              relativeParts = fromParts[1].match(/([0-9]+)([smhdwMy]).*/);
-            }
-            if (relativeParts[1] && relativeParts[2]) {
-              $scope.relative.count = parseInt(relativeParts[1], 10);
-              $scope.relative.unit = relativeParts[2];
-            } else {
-              var duration = moment.duration(moment().diff(datemath.parse($scope.from)));
-              var units = _.pluck(_.clone($scope.relativeOptions).reverse(), 'value');
-              if ($scope.from.toString().split('/')[1]) $scope.relative.round = true;
-              for (var i = 0; i < units.length; i++) {
-                var as = duration.as(units[i]);
-                if (as > 1) {
-                  $scope.relative.count = Math.round(as);
-                  $scope.relative.unit = units[i];
-                  break;
-                }
-              }
-            }
-
-            if ($scope.from.toString().split('/')[1]) $scope.relative.round = true;
-            $scope.formatRelative();
-
-            break;
-          case 'absolute':
-            $scope.absolute.from = datemath.parse($scope.from || moment().subtract('minutes', 15));
-            $scope.absolute.to = datemath.parse($scope.to || moment(), true);
-            break;
-          }
-
-          $scope.mode = thisMode;
-        };
-
-        $scope.setQuick = function (from, to, description) {
-          $scope.from = from;
-          $scope.to = to;
-        };
-
-        $scope.setToNow = function () {
-          $scope.absolute.to = moment();
-        };
-
-        $scope.formatRelative = function () {
-          var parsed = datemath.parse(getRelativeString());
-          $scope.relative.preview =  parsed ? parsed.format($scope.format) : undefined;
-          return parsed;
-        };
-
-        $scope.applyRelative = function () {
-          $scope.from = getRelativeString();
-          $scope.to = 'now';
-        };
-
-        var getRelativeString = function () {
-          return 'now-' + $scope.relative.count + $scope.relative.unit + ($scope.relative.round ? '/' + $scope.relative.unit : '');
-        };
-
-        $scope.applyAbsolute = function () {
-          $scope.from = moment($scope.absolute.from);
-          $scope.to = moment($scope.absolute.to);
-        };
-
-        $scope.setRefreshInterval = function (interval) {
-          interval = _.clone(interval);
-          console.log('before: ' + interval.pause);
-          interval.pause = (interval.pause == null || interval.pause === false) ? false : true;
-
-          console.log('after: ' + interval.pause);
-          $scope.interval = interval;
-        };
-
-        init();
-      }
-    };
-  });
-
-});
diff --git a/src/kibana/components/tooltip/tooltip.js b/src/kibana/components/tooltip/tooltip.js
deleted file mode 100644
index 81c003d75ddc5..0000000000000
--- a/src/kibana/components/tooltip/tooltip.js
+++ /dev/null
@@ -1,28 +0,0 @@
-define(function (require) {
-  var html = require('text!components/tooltip/tooltip.html');
-
-  require('modules').get('kibana')
-  .config(function ($tooltipProvider) {
-    $tooltipProvider.options({
-      placement: 'bottom',
-      animation: true,
-      popupDelay: 150,
-      appendToBody: false
-    });
-  })
-  .directive('kbnTooltip', function () {
-    return {
-      restrict: 'E',
-      template: html,
-      transclude: true,
-      replace: true,
-      scope: true,
-      link: function ($scope, $el, attr) {
-        $scope.text = attr.text;
-        $scope.placement = attr.placement || 'top';
-        $scope.delay = attr.delay || 400;
-        $scope.appendToBody = attr.appendToBody || 0;
-      }
-    };
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/components/typeahead/_items.js b/src/kibana/components/typeahead/_items.js
deleted file mode 100644
index 5e59094ba7bcc..0000000000000
--- a/src/kibana/components/typeahead/_items.js
+++ /dev/null
@@ -1,20 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var typeahead = require('modules').get('kibana/typeahead');
-  var listTemplate = require('text!components/typeahead/partials/typeahead-items.html');
-
-  require('components/notify/directives');
-
-  typeahead.directive('kbnTypeaheadItems', function () {
-    return {
-      restrict: 'E',
-      require: '^kbnTypeahead',
-      replace: true,
-      template: listTemplate,
-
-      link: function ($scope, $el, attr, typeaheadCtrl) {
-        $scope.typeahead = typeaheadCtrl;
-      }
-    };
-  });
-});
diff --git a/src/kibana/components/typeahead/typeahead.js b/src/kibana/components/typeahead/typeahead.js
deleted file mode 100644
index 76468df545ed9..0000000000000
--- a/src/kibana/components/typeahead/typeahead.js
+++ /dev/null
@@ -1,241 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var typeahead = require('modules').get('kibana/typeahead');
-
-  require('css!components/typeahead/typeahead.css');
-  require('components/typeahead/_input');
-  require('components/typeahead/_items');
-
-  typeahead.directive('kbnTypeahead', function () {
-    var keyMap = {
-      ESC: 27,
-      UP: 38,
-      DOWN: 40,
-      TAB: 9,
-      ENTER: 13
-    };
-
-    return {
-      restrict: 'A',
-      scope: {
-        historyKey: '@kbnTypeahead'
-      },
-      controllerAs: 'typeahead',
-
-      controller: function ($scope, $element, $timeout, PersistedLog, config) {
-        var self = this;
-        self.form = $element.closest('form');
-        self.query = '';
-        self.hidden = true;
-        self.focused = false;
-        self.mousedOver = false;
-
-        // instantiate history and add items to the scope
-        self.history = new PersistedLog('typeahead:' + $scope.historyKey, {
-          maxLength: config.get('history:limit'),
-          filterDuplicates: true
-        });
-
-        $scope.items = self.history.get();
-        $scope.filteredItems = [];
-
-        self.setInputModel = function (model) {
-          $scope.inputModel = model;
-
-          // watch for changes to the query parameter, delegate to typeaheadCtrl
-          $scope.$watch('inputModel.$viewValue', self.filterItemsByQuery);
-        };
-
-        self.setHidden = function (hidden) {
-          self.hidden = !!(hidden);
-        };
-
-        self.setFocused = function (focused) {
-          self.focused = !!(focused);
-        };
-
-        self.setMouseover = function (mousedOver) {
-          self.mousedOver = !!(mousedOver);
-        };
-
-        // activation methods
-        self.activateItem = function (item) {
-          self.active = item;
-        };
-
-        self.getActiveIndex = function () {
-          if (!self.active) {
-            return;
-          }
-
-          return $scope.filteredItems.indexOf(self.active);
-        };
-
-        self.getItems = function () {
-          return $scope.filteredItems;
-        };
-
-        self.activateNext = function () {
-          var index = self.getActiveIndex();
-          if (index == null) {
-            index = 0;
-          } else if (index < $scope.filteredItems.length - 1) {
-            ++index;
-          }
-
-          self.activateItem($scope.filteredItems[index]);
-        };
-
-        self.activatePrev = function () {
-          var index = self.getActiveIndex();
-
-          if (index > 0 && index != null) {
-            --index;
-          } else if (index === 0) {
-            self.active = false;
-            return;
-          }
-
-          self.activateItem($scope.filteredItems[index]);
-        };
-
-        self.isActive = function (item) {
-          return item === self.active;
-        };
-
-        // selection methods
-        self.selectItem = function (item, ev) {
-          self.hidden = true;
-          self.active = false;
-          $scope.inputModel.$setViewValue(item);
-          $scope.inputModel.$render();
-          self.persistEntry();
-
-          if (ev && ev.type === 'click') {
-            $timeout(function () {
-              self.submitForm();
-            });
-          }
-        };
-
-        self.submitForm = function () {
-          if (self.form.length) {
-            self.form.submit();
-          }
-        };
-
-        self.persistEntry = function () {
-          if ($scope.inputModel.$viewValue.length) {
-            // push selection into the history
-            $scope.items = self.history.add($scope.inputModel.$viewValue);
-          }
-        };
-
-        self.selectActive = function () {
-          if (self.active) {
-            self.selectItem(self.active);
-          }
-        };
-
-        self.keypressHandler = function (ev) {
-          var keyCode = ev.which || ev.keyCode;
-
-          if (self.focused) {
-            self.hidden = false;
-          }
-
-          // hide on escape
-          if (_.contains([keyMap.ESC], keyCode)) {
-            self.hidden = true;
-            self.active = false;
-          }
-
-          // change selection with arrow up/down
-          // on down key, attempt to load all items if none are loaded
-          if (_.contains([keyMap.DOWN], keyCode) && $scope.filteredItems.length === 0) {
-            $scope.filteredItems = $scope.items;
-            $scope.$digest();
-          } else if (_.contains([keyMap.UP, keyMap.DOWN], keyCode)) {
-            if (self.isVisible() && $scope.filteredItems.length) {
-              ev.preventDefault();
-
-              if (keyCode === keyMap.DOWN) {
-                self.activateNext();
-              } else {
-                self.activatePrev();
-              }
-            }
-          }
-
-          // persist selection on enter, when not selecting from the list
-          if (_.contains([keyMap.ENTER], keyCode)) {
-            if (!self.active) {
-              self.persistEntry();
-            }
-          }
-
-          // select on enter or tab
-          if (_.contains([keyMap.ENTER, keyMap.TAB], keyCode)) {
-            self.selectActive();
-            self.hidden = true;
-          }
-        };
-
-        self.filterItemsByQuery = function (query) {
-          // cache query so we can call it again if needed
-          if (query) {
-            self.query = query;
-          }
-
-          // if the query is empty, clear the list items
-          if (!self.query.length) {
-            $scope.filteredItems = [];
-            return;
-          }
-
-          // update the filteredItems using the query
-          var beginningMatches = $scope.items.filter(function (item) {
-            return item.indexOf(query) === 0;
-          });
-
-          var otherMatches = $scope.items.filter(function (item) {
-            return item.indexOf(query) > 0;
-          });
-
-          $scope.filteredItems = beginningMatches.concat(otherMatches);
-        };
-
-        self.isVisible = function () {
-          return !self.hidden && ($scope.filteredItems.length > 0) && (self.focused || self.mousedOver);
-        };
-
-        // handle updates to parent scope history
-        $scope.$watch('items', function (items) {
-          if (self.query) {
-            self.filterItemsByQuery(self.query);
-          }
-        });
-
-        // watch for changes to the filtered item list
-        $scope.$watch('filteredItems', function (filteredItems) {
-
-          // if list is empty, or active item is missing, unset active item
-          if (!filteredItems.length || !_.contains(filteredItems, self.active)) {
-            self.active = false;
-          }
-        });
-      },
-
-      link: function ($scope, $el, attr) {
-        // should be defined via setInput() method
-        if (!$scope.inputModel) {
-          throw new Error('kbn-typeahead-input must be defined');
-        }
-
-        $scope.$watch('typeahead.isVisible()', function (vis) {
-          $el.toggleClass('visible', vis);
-        });
-      }
-    };
-  });
-});
diff --git a/src/kibana/components/url/url.js b/src/kibana/components/url/url.js
deleted file mode 100644
index 2cdc495ca68ab..0000000000000
--- a/src/kibana/components/url/url.js
+++ /dev/null
@@ -1,190 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  require('filters/uriescape');
-  require('filters/rison');
-
-  require('modules').get('kibana/url')
-  .service('kbnUrl', function (Private) { return Private(KbnUrlProvider); });
-
-  function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getAppState) {
-    var self = this;
-
-    /**
-     * Navigate to a url
-     *
-     * @param  {String} url - the new url, can be a template. See #eval
-     * @param  {Object} [paramObj] - optional set of parameters for the url template
-     * @return {undefined}
-     */
-    self.change = function (url, paramObj) {
-      self._changeLocation('url', url, paramObj);
-    };
-
-    /**
-     * Same as #change except only changes the url's path,
-     * leaving the search string and such intact
-     *
-     * @param  {String} path - the new path, can be a template. See #eval
-     * @param  {Object} [paramObj] - optional set of parameters for the path template
-     * @return {undefined}
-     */
-    self.changePath = function (path, paramObj) {
-      self._changeLocation('path', path, paramObj);
-    };
-
-    /**
-     * Same as #change except that it removes the current url from history
-     *
-     * @param  {String} url - the new url, can be a template. See #eval
-     * @param  {Object} [paramObj] - optional set of parameters for the url template
-     * @return {undefined}
-     */
-    self.redirect = function (url, paramObj) {
-      self._changeLocation('url', url, paramObj, true);
-    };
-
-    /**
-     * Same as #redirect except only changes the url's path,
-     * leaving the search string and such intact
-     *
-     * @param  {String} path - the new path, can be a template. See #eval
-     * @param  {Object} [paramObj] - optional set of parameters for the path template
-     * @return {undefined}
-     */
-    self.redirectPath = function (path, paramObj) {
-      self._changeLocation('path', path, paramObj, true);
-    };
-
-    /**
-     * Evaluate a url template. templates can contain double-curly wrapped
-     * expressions that are evaluated in the context of the paramObj
-     *
-     * @param  {String} template - the url template to evaluate
-     * @param  {Object} [paramObj] - the variables to expose to the template
-     * @return {String} - the evaluated result
-     * @throws {Error} If any of the expressions can't be parsed.
-     */
-    self.eval = function (template, paramObj) {
-      paramObj = paramObj || {};
-
-      return template.replace(/\{\{([^\}]+)\}\}/g, function (match, expr) {
-        // remove filters
-        var key = expr.split('|')[0].trim();
-
-        // verify that the expression can be evaluated
-        var p = $parse(key)(paramObj);
-
-        // if evaluation can't be made, throw
-        if (_.isUndefined(p)) {
-          throw new Error('Replacement failed, unresolved expression: ' + expr);
-        }
-
-        // append uriescape filter if not included
-        if (expr.indexOf('uriescape') === -1) {
-          expr += '|uriescape';
-        }
-
-        return $parse(expr)(paramObj);
-      });
-    };
-
-    /**
-     * convert an object's route to an href, compatible with
-     * window.location.href= and <a href="">
-     *
-     * @param  {Object} obj - any object that list's it's routes at obj.routes{}
-     * @param  {string} route - the route name
-     * @return {string} - the computed href
-     */
-    self.getRouteHref = function (obj, route) {
-      return '#' + self.getRouteUrl(obj, route);
-    };
-
-    /**
-     * convert an object's route to a url, compatible with url.change() or $location.url()
-     *
-     * @param  {Object} obj - any object that list's it's routes at obj.routes{}
-     * @param  {string} route - the route name
-     * @return {string} - the computed url
-     */
-    self.getRouteUrl = function (obj, route) {
-      var template = obj && obj.routes && obj.routes[route];
-      if (template) return self.eval(template, obj);
-    };
-
-    /**
-     * Similar to getRouteUrl, supports objects which list their routes,
-     * and redirects to the named route. See #redirect
-     *
-     * @param  {Object} obj - any object that list's it's routes at obj.routes{}
-     * @param  {string} route - the route name
-     * @return {undefined}
-     */
-    self.redirectToRoute = function (obj, route) {
-      self.redirect(self.getRouteUrl(obj, route));
-    };
-
-    /**
-     * Similar to getRouteUrl, supports objects which list their routes,
-     * and changes the url to the named route. See #change
-     *
-     * @param  {Object} obj - any object that list's it's routes at obj.routes{}
-     * @param  {string} route - the route name
-     * @return {undefined}
-     */
-    self.changeToRoute = function (obj, route) {
-      self.change(self.getRouteUrl(obj, route));
-    };
-
-    /////
-    // private api
-    /////
-    var reloading;
-
-    self._changeLocation = function (type, url, paramObj, replace) {
-      var prev = {
-        path: $location.path(),
-        search: $location.search()
-      };
-
-      url = self.eval(url, paramObj);
-      $location[type](url);
-      if (replace) $location.replace();
-
-      var next = {
-        path: $location.path(),
-        search: $location.search()
-      };
-
-      if (self._shouldAutoReload(next, prev)) {
-        var appState = getAppState();
-        if (appState) appState.destroy();
-
-        reloading = $rootScope.$on('$locationChangeSuccess', function () {
-          // call the "unlisten" function returned by $on
-          reloading();
-          reloading = false;
-
-          $route.reload();
-        });
-      }
-    };
-
-    self._shouldAutoReload = function (next, prev) {
-      if (reloading) return false;
-
-      var route = $route.current && $route.current.$$route;
-      if (!route) return false;
-
-      if (next.path !== prev.path) return false;
-
-      var reloadOnSearch = route.reloadOnSearch;
-      var searchSame = _.isEqual(next.search, prev.search);
-
-      return (reloadOnSearch && searchSame) || !reloadOnSearch;
-    };
-  }
-
-  return KbnUrlProvider;
-});
diff --git a/src/kibana/components/validate_query/validate_query.js b/src/kibana/components/validate_query/validate_query.js
deleted file mode 100644
index 4457c4df472b7..0000000000000
--- a/src/kibana/components/validate_query/validate_query.js
+++ /dev/null
@@ -1,124 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-
-  require('services/debounce');
-
-  require('modules')
-    .get('kibana')
-    .directive('validateQuery', function (es, $compile, timefilter, configFile, debounce, Private) {
-      var fromUser = Private(require('components/validate_query/lib/from_user'));
-      var toUser = require('components/validate_query/lib/to_user');
-
-      return {
-        restrict: 'A',
-        require: 'ngModel',
-        scope: {
-          'ngModel': '=',
-          'queryInput': '=?',
-        },
-        link: function ($scope, elem, attr, ngModel) {
-
-          // track request so we can abort it if needed
-          var request = {};
-
-          var errorElem = $('<i tooltip={{tooltipMsg}} class="fa fa-ban input-error"></i>').hide();
-          $compile(errorElem)($scope);
-
-          var init = function () {
-            elem.after(errorElem);
-            $scope.ngModel = fromUser($scope.ngModel);
-            validator($scope.ngModel);
-          };
-
-          var validator = function (query) {
-            var index, type;
-            if (request.abort) request.abort();
-
-            if ($scope.queryInput) {
-              useSearchSource();
-            } else {
-              useDefaults();
-            }
-
-            return sendRequest();
-
-            function useSearchSource() {
-              var pattern = $scope.queryInput.get('index');
-              if (!pattern) return useDefaults();
-
-              if (_.isString(pattern)) {
-                index = pattern;
-              } else if (_.isFunction(pattern.toIndexList)) {
-                index = pattern.toIndexList();
-              } else {
-                useDefaults();
-              }
-            }
-
-            function useDefaults() {
-              index = configFile.kibana_index;
-              type = '__kibanaQueryValidator';
-            }
-
-            function sendRequest() {
-              request = es.indices.validateQuery({
-                index: index,
-                type: type,
-                explain: true,
-                ignoreUnavailable: true,
-                body: {
-                  query: query || { match_all: {} }
-                }
-              })
-              .then(success, error);
-            }
-
-            function error(resp) {
-              var msg;
-
-              ngModel.$setValidity('queryInput', false);
-
-              if (resp.explanations && resp.explanations[0]) {
-                msg = resp.explanations[0].error;
-              } else {
-                msg = resp.body.error;
-              }
-
-              $scope.tooltipMsg = msg;
-              errorElem.show();
-
-              return undefined;
-            }
-
-            function success(resp) {
-              if (resp.valid) {
-                ngModel.$setValidity('queryInput', true);
-                errorElem.hide();
-                return query;
-              } else {
-                return error(resp);
-              }
-            }
-          };
-
-          var debouncedValidator = debounce(validator, 300, {
-            leading: true,
-            trailing: true
-          });
-
-          ngModel.$parsers.push(fromUser);
-          ngModel.$formatters.push(toUser);
-
-          // Use a model watch instead of parser/formatter. Parsers require the
-          // user to actually enter input, which may not happen if the back button is clicked
-          $scope.$watch('ngModel', function (newValue, oldValue) {
-            if (newValue === oldValue) return;
-            debouncedValidator(newValue);
-          });
-
-          init();
-        }
-      };
-    });
-});
diff --git a/src/kibana/components/vis/vis.js b/src/kibana/components/vis/vis.js
deleted file mode 100644
index eabff4c86fbbc..0000000000000
--- a/src/kibana/components/vis/vis.js
+++ /dev/null
@@ -1,123 +0,0 @@
-define(function (require) {
-  return function VisFactory(Notifier, Private) {
-    var _ = require('lodash');
-    var aggTypes = Private(require('components/agg_types/index'));
-    var visTypes = Private(require('registry/vis_types'));
-    var AggConfigs = Private(require('components/vis/AggConfigs'));
-
-    var notify = new Notifier({
-      location: 'Vis'
-    });
-
-    function Vis(indexPattern, state) {
-      state = state || {};
-
-      if (_.isString(state)) {
-        state = {
-          type: state
-        };
-      }
-
-      this.indexPattern = indexPattern;
-
-      // http://aphyr.com/data/posts/317/state.gif
-      this.setState(state);
-    }
-
-    Vis.convertOldState = function (type, oldState) {
-      if (!type || _.isString(type)) {
-        type = visTypes.byName[type || 'histogram'];
-      }
-
-      var schemas = type.schemas;
-
-      var aggs = _.transform(oldState, function (newConfigs, oldConfigs, oldGroupName) {
-        var schema = schemas.all.byName[oldGroupName];
-
-        if (!schema) {
-          notify.log('unable to match old schema', oldGroupName, 'to a new schema');
-          return;
-        }
-
-        oldConfigs.forEach(function (oldConfig) {
-          var agg = {
-            schema: schema.name,
-            type: oldConfig.agg,
-          };
-
-          var aggType = aggTypes.byName[agg.type];
-          if (!aggType) {
-            notify.log('unable to find an agg type for old confg', oldConfig);
-            return;
-          }
-
-          agg.params = _.pick(oldConfig, _.keys(aggType.params.byName));
-
-          newConfigs.push(agg);
-        });
-      }, []);
-
-      return {
-        type: type,
-        aggs: aggs
-      };
-    };
-
-    Vis.prototype.type = 'histogram';
-
-    Vis.prototype.setState = function (state) {
-      this.type = state.type || this.type;
-      if (_.isString(this.type)) this.type = visTypes.byName[this.type];
-
-      this.listeners = _.assign({}, state.listeners, this.type.listeners);
-      this.params = _.defaults({}, _.cloneDeep(state.params || {}), this.type.params.defaults || {});
-
-      this.aggs = new AggConfigs(this, state.aggs);
-    };
-
-    Vis.prototype.getState = function () {
-      return {
-        type: this.type.name,
-        params: this.params,
-        aggs: this.aggs.map(function (agg) {
-          return agg.toJSON();
-        }).filter(Boolean),
-        listeners: this.listeners
-      };
-    };
-
-    Vis.prototype.createEditableVis = function () {
-      return this._editableVis || (this._editableVis = this.clone());
-    };
-
-    Vis.prototype.getEditableVis = function () {
-      return this._editableVis || undefined;
-    };
-
-    Vis.prototype.clone = function () {
-      return new Vis(this.indexPattern, this.getState());
-    };
-
-    Vis.prototype.requesting = function () {
-      _.invoke(this.aggs.getRequestAggs(), 'requesting');
-    };
-
-    Vis.prototype.isHierarchical = function () {
-      if (_.isFunction(this.type.hierarchicalData)) {
-        return !!this.type.hierarchicalData(this);
-      } else {
-        return !!this.type.hierarchicalData;
-      }
-    };
-
-    Vis.prototype.hasSchemaAgg = function (schemaName, aggTypeName) {
-      var aggs = this.aggs.bySchemaName[schemaName] || [];
-      return aggs.some(function (agg) {
-        if (!agg.type || !agg.type.name) return false;
-        return agg.type.name === aggTypeName;
-      });
-    };
-
-    return Vis;
-  };
-});
diff --git a/src/kibana/components/vislib/components/color/color.js b/src/kibana/components/vislib/components/color/color.js
deleted file mode 100644
index 5fc0ff7779e93..0000000000000
--- a/src/kibana/components/vislib/components/color/color.js
+++ /dev/null
@@ -1,39 +0,0 @@
-define(function (require) {
-  return function ColorUtilService(Private) {
-    var _ = require('lodash');
-
-    var createColorPalette = Private(require('components/vislib/components/color/color_palette'));
-    var MappedColors = Private(require('components/vislib/components/color/mapped_colors'));
-    var mappedColors = new MappedColors();
-    /*
-     * Accepts an array of strings or numbers that are used to create a
-     * a lookup table that associates the values (key) with a hex color (value).
-     * Returns a function that accepts a value (i.e. a string or number)
-     * and returns a hex color associated with that value.
-     */
-
-    return function (arrayOfStringsOrNumbers) {
-      if (!_.isArray(arrayOfStringsOrNumbers)) {
-        throw new Error('ColorUtil expects an array');
-      }
-
-      arrayOfStringsOrNumbers.forEach(function (val) {
-        if (!_.isString(val) && !_.isNumber(val) && !_.isUndefined(val)) {
-          throw new TypeError('ColorUtil expects an array of strings, numbers, or undefined values');
-        }
-      });
-
-      var arrayLength = arrayOfStringsOrNumbers.length;
-      var colors = createColorPalette(arrayLength + mappedColors.count());
-      var uniqueColors = _.difference(colors, mappedColors.all()).slice(0, arrayLength + 1);
-      var colorObj = _.zipObject(arrayOfStringsOrNumbers, uniqueColors);
-
-      return function (value) {
-        if (!mappedColors.get(value)) {
-          mappedColors.add(value, colorObj[value]);
-        }
-        return mappedColors.get(value);
-      };
-    };
-  };
-});
diff --git a/src/kibana/components/vislib/components/labels/labels.js b/src/kibana/components/vislib/components/labels/labels.js
deleted file mode 100644
index 3e2acc99d360a..0000000000000
--- a/src/kibana/components/vislib/components/labels/labels.js
+++ /dev/null
@@ -1,22 +0,0 @@
-define(function (require) {
-  return function LabelUtilService(Private) {
-    var _ = require('lodash');
-
-    var createArr = Private(require('components/vislib/components/labels/data_array'));
-    var getArrOfUniqLabels = Private(require('components/vislib/components/labels/uniq_labels'));
-    var getPieLabels = Private(require('components/vislib/components/labels/pie/pie_labels'));
-
-    /*
-     * Accepts a Kibana data object and returns an array of unique labels (strings).
-     * Extracts the field formatter from the raw object and passes it to the
-     * getArrOfUniqLabels function.
-     *
-     * Currently, this service is only used for vertical bar charts and line charts.
-     */
-    return function (obj, chartType) {
-      if (!_.isObject(obj)) { throw new TypeError('LabelUtil expects an object'); }
-      if (chartType === 'pie') { return getPieLabels(obj); }
-      return getArrOfUniqLabels(createArr(obj));
-    };
-  };
-});
diff --git a/src/kibana/components/vislib/components/labels/pie/pie_labels.js b/src/kibana/components/vislib/components/labels/pie/pie_labels.js
deleted file mode 100644
index 9f75f623bd76b..0000000000000
--- a/src/kibana/components/vislib/components/labels/pie/pie_labels.js
+++ /dev/null
@@ -1,26 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return function PieLabels(Private) {
-    var removeZeroSlices = Private(require('components/vislib/components/labels/pie/remove_zero_slices'));
-    var getNames = Private(require('components/vislib/components/labels/pie/get_pie_names'));
-
-    return function (obj) {
-      if (!_.isObject(obj)) { throw new TypeError('PieLabel expects an object'); }
-
-      var data = obj.columns || obj.rows || [obj];
-      var names = [];
-
-      data.forEach(function (obj) {
-        var columns = obj.raw ? obj.raw.columns : undefined;
-        obj.slices = removeZeroSlices(obj.slices);
-
-        getNames(obj, columns).forEach(function (name) {
-          names.push(name);
-        });
-      });
-
-      return _.uniq(names);
-    };
-  };
-});
diff --git a/src/kibana/components/vislib/components/tooltip/_position_tooltip.js b/src/kibana/components/vislib/components/tooltip/_position_tooltip.js
deleted file mode 100644
index 004103579e379..0000000000000
--- a/src/kibana/components/vislib/components/tooltip/_position_tooltip.js
+++ /dev/null
@@ -1,148 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-
-  var OFFSET = 10;
-  var $clone;
-
-  // translate css properties into their basic direction
-  var propDirs = {
-    top: 'north',
-    left: 'west'
-  };
-
-  function positionTooltip(opts, html) {
-    if (!opts) return;
-    var $chart = $(opts.$chart);
-    var $el = $(opts.$el);
-    var $window = $(opts.$window || window);
-    var $sizer = $(opts.$sizer);
-    var prev = $chart.data('previousPlacement') || {};
-    var event = opts.event;
-
-    if (!$chart.size() || !$el.size()) return;
-
-    var size = getTtSize(html || $el.html(), $sizer);
-    var pos = getBasePosition(size, event);
-    var overflow = getOverflow(size, pos, [$chart, $window]);
-
-    var placement = placeToAvoidOverflow(pos, prev, overflow);
-    $chart.data('previousPlacement', placement);
-    return placement;
-  }
-
-  function getTtSize(ttHtml, $sizer) {
-    if ($sizer.html() !== ttHtml) {
-      $sizer.html(ttHtml);
-    }
-
-    var size = {
-      width: $sizer.outerWidth(),
-      height: $sizer.outerHeight()
-    };
-
-    return size;
-  }
-
-  function getBasePosition(size, event) {
-    return {
-      east: event.clientX + OFFSET,
-      west: event.clientX - size.width - OFFSET,
-      south: event.clientY + OFFSET,
-      north: event.clientY - size.height - OFFSET
-    };
-  }
-
-  function getBounds($el) {
-    // in testing, $window is not actually a window, so we need to add
-    // the offsets to make it work right.
-    var bounds = $el.offset() || { top: 0, left: 0 };
-    bounds.top += $el.scrollTop();
-    bounds.left += $el.scrollLeft();
-    bounds.bottom = bounds.top + $el.outerHeight();
-    bounds.right = bounds.left + $el.outerWidth();
-    return bounds;
-  }
-
-  function getOverflow(size, pos, containers) {
-    var overflow = {};
-
-    containers.map(getBounds).forEach(function (bounds) {
-      // number of pixels that the toolip would overflow it's far
-      // side, if we placed it that way. (negative === no overflow)
-      mergeOverflows(overflow, {
-        north: bounds.top - pos.north,
-        east: (pos.east + size.width) - bounds.right,
-        south: (pos.south + size.height) - bounds.bottom,
-        west: bounds.left - pos.west
-      });
-    });
-
-    (window.overflows || (window.overflows = [])).push(overflow);
-    return overflow;
-  }
-
-  function mergeOverflows(dest, src) {
-    return _.merge(dest, src, function (a, b) {
-      if (a == null || b == null) return a || b;
-      if (a < 0 && b < 0) return Math.min(a, b);
-      return Math.max(a, b);
-    });
-  }
-
-  function pickPlacement(prop, pos, overflow, prev, pref, fallback, placement) {
-    var stash = '_' + prop;
-
-    // list of directions in order of preference
-    var dirs = _.unique([prev[stash], pref, fallback].filter(Boolean));
-
-    var dir;
-    var value;
-
-    // find the first direction that doesn't overflow
-    for (var i = 0; i < dirs.length; i++) {
-      dir = dirs[i];
-      if (overflow[dir] > 0) continue;
-      value = pos[dir];
-      break;
-    }
-
-    // if we don't find one that doesn't overflow, use
-    // the first choice and offset based on overflo
-    if (value == null) {
-      dir = dirs[0];
-
-      var offset = overflow[dir];
-      if (propDirs[prop] === dir) {
-        // when the property represents the same direction
-        // as dir, we flip the overflow
-        offset = offset * -1;
-      }
-
-      value = pos[dir] - offset;
-    }
-
-    placement[prop] = value;
-    placement[stash] = dir;
-  }
-
-  function placeToAvoidOverflow(pos, prev, overflow) {
-    var placement = {};
-    pickPlacement('top', pos, overflow, prev, 'south', 'north', placement);
-    pickPlacement('left', pos, overflow, prev, 'east', 'west', placement);
-    return placement;
-  }
-
-  // expose units/helpers for testing
-  positionTooltip.getTtSize = getTtSize;
-  positionTooltip.getBasePosition = getBasePosition;
-  positionTooltip.getOverflow = getOverflow;
-  positionTooltip.getBounds = getBounds;
-  positionTooltip.placeToAvoidOverflow = placeToAvoidOverflow;
-  positionTooltip.removeClone = function () {
-    $clone && $clone.remove();
-    $clone = null;
-  };
-
-  return positionTooltip;
-});
\ No newline at end of file
diff --git a/src/kibana/components/vislib/components/tooltip/tooltip.js b/src/kibana/components/vislib/components/tooltip/tooltip.js
deleted file mode 100644
index b683b9e2bd5a9..0000000000000
--- a/src/kibana/components/vislib/components/tooltip/tooltip.js
+++ /dev/null
@@ -1,197 +0,0 @@
-define(function (require) {
-  return function TooltipFactory(d3, Private) {
-    var _ = require('lodash');
-    var $ = require('jquery');
-    var positionTooltip = require('components/vislib/components/tooltip/_position_tooltip');
-
-    var allContents = [];
-
-    require('css!components/vislib/styles/main');
-
-    /**
-     * Add tooltip and listeners to visualization elements
-     *
-     * @class Tooltip
-     * @constructor
-     * @param el {HTMLElement} Reference to DOM element
-     * @param formatter {Function} Tooltip formatter
-     * @param events {Constructor} Allows tooltip to return event response data
-     */
-    function Tooltip(id, el, formatter, events) {
-      if (!(this instanceof Tooltip)) {
-        return new Tooltip(id, el, formatter, events);
-      }
-
-      this.id = id; // unique id for this tooltip type
-      this.el = el;
-      this.order = 100; // higher ordered contents are rendered below the others
-      this.formatter = formatter;
-      this.events = events;
-      this.containerClass = 'vis-wrapper';
-      this.tooltipClass = 'vis-tooltip';
-      this.tooltipSizerClass = 'vis-tooltip-sizing-clone';
-      this.showCondition = _.constant(true);
-    }
-
-    /**
-     * Get jquery reference to the tooltip node
-     *
-     * @return {Object} jQuery node object
-     */
-    Tooltip.prototype.$get = _.once(function () {
-      return $('<div>').addClass(this.tooltipClass).appendTo(document.body);
-    });
-
-    /**
-     * Get jquery reference to the tooltip sizer node
-     *
-     * @return {Object} jQuery node object
-     */
-    Tooltip.prototype.$getSizer = _.once(function () {
-      return this.$get()
-      .clone()
-      .removeClass(this.tooltipClass)
-      .addClass(this.tooltipSizerClass)
-      .appendTo(document.body);
-    });
-
-    /**
-     * Show the tooltip, positioning it based on the content and chart container
-     */
-    Tooltip.prototype.show = function () {
-      var $tooltip = this.$get();
-      var $chart = this.$getChart();
-      var html = $tooltip.html();
-
-      if (!$chart) return;
-
-      var placement = positionTooltip({
-        $window: $(window),
-        $chart: $chart,
-        $el: $tooltip,
-        $sizer: this.$getSizer(),
-        event: d3.event
-      }, html);
-
-      $tooltip.css({
-        visibility: 'visible',
-        left: placement.left,
-        top: placement.top
-      });
-    };
-
-    /**
-     * Hide the tooltip, clearing its contents
-     */
-    Tooltip.prototype.hide = function () {
-      var $tooltip = this.$get();
-      allContents = [];
-      $tooltip.css({
-        visibility: 'hidden',
-        left: '-500px',
-        top: '-500px'
-      });
-    };
-
-    /**
-     * Get the jQuery chart node, based on the container object
-     * NOTE: the container is a d3 selection
-     *
-     * @return {Object} jQuery node for the chart
-     */
-    Tooltip.prototype.$getChart = function () {
-      var chart = $(this.container && this.container.node());
-      return chart.size() ? chart : false;
-    };
-
-    /**
-     * Renders tooltip
-     *
-     * @method render
-     * @return {Function} Renders tooltip on a D3 selection
-     */
-    Tooltip.prototype.render = function () {
-      var self = this;
-
-      /**
-       * Calculates values for the tooltip placement
-       *
-       * @param {Object} selection D3 selection object
-       */
-      return function (selection) {
-        var $tooltip = self.$get();
-        var id = self.id;
-        var order = self.order;
-
-        var tooltipSelection = d3.select($tooltip.get(0));
-
-        if (self.container === undefined || self.container !== d3.select(self.el).select('.' + self.containerClass)) {
-          self.container = d3.select(self.el).select('.' + self.containerClass);
-        }
-
-        var $chart = self.$getChart();
-        if ($chart) {
-          $chart.on('mouseleave', function (event) {
-            // only clear when we leave the chart, so that
-            // moving between points doesn't make it reposition
-            $chart.removeData('previousPlacement');
-          });
-        }
-
-        selection.each(function (d, i) {
-          var element = d3.select(this);
-
-          function render(html) {
-            allContents = _.filter(allContents, function (content) {
-              return content.id !== id;
-            });
-
-            if (html) allContents.push({ id: id, html: html, order: order });
-
-            var allHtml = _(allContents)
-            .sortBy('order')
-            .pluck('html')
-            .compact()
-            .join('\n');
-
-            if (allHtml) {
-              $tooltip.html(allHtml);
-              self.show();
-            } else {
-              self.hide();
-            }
-          }
-
-          fakeD3Bind(this, 'mousemove', function () {
-            if (!self.showCondition.call(element, d, i)) {
-              return render();
-            }
-
-            var events = self.events ? self.events.eventResponse(d, i) : d;
-            return render(self.formatter(events));
-          });
-
-          fakeD3Bind(this, 'mouseleave', function () {
-            render();
-          });
-
-        });
-      };
-    };
-
-    function fakeD3Bind(el, event, handler) {
-      $(el).on(event, function (e) {
-        // mimicing https://github.com/mbostock/d3/blob/3abb00113662463e5c19eb87cd33f6d0ddc23bc0/src/selection/on.js#L87-L94
-        var o = d3.event; // Events can be reentrant (e.g., focus).
-        d3.event = e;
-        try {
-          handler.apply(this, [this.__data__]);
-        } finally {
-          d3.event = o;
-        }
-      });
-    }
-
-    return Tooltip;
-  };
-});
diff --git a/src/kibana/components/vislib/index.js b/src/kibana/components/vislib/index.js
deleted file mode 100644
index 32bd67f1532fe..0000000000000
--- a/src/kibana/components/vislib/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-define(function (require) {
-  var module = require('modules').get('kibana/vislib', ['kibana']);
-
-  require('services/private');
-
-  module.service('d3', function () {
-    return require('d3');
-  });
-
-  /**
-   * Provides the Kibana4 Visualization Library
-   *
-   * @module vislib
-   * @main vislib
-   * @return {Object} Contains the version number and the Vis Class for creating visualizations
-   */
-  module.service('vislib', function (Private) {
-    return {
-      version: '0.0.0',
-      Vis: Private(require('components/vislib/vis'))
-    };
-  });
-});
diff --git a/src/kibana/components/vislib/lib/_error_handler.js b/src/kibana/components/vislib/lib/_error_handler.js
deleted file mode 100644
index 472323c1ca9af..0000000000000
--- a/src/kibana/components/vislib/lib/_error_handler.js
+++ /dev/null
@@ -1,35 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var errors = require('errors');
-
-  return function ErrorHandlerFactory() {
-
-    /**
-     * Common errors shared between constructors
-     *
-     * @class ErrorHandler
-     * @constructor
-     */
-    function ErrorHandler() {}
-
-    /**
-     * Validates the height and width are > 0
-     * min size must be at least 1 px
-     *
-     * @method validateWidthandHeight
-     * @param width {Number} HTMLElement width
-     * @param height {Number} HTMLElement height
-     * @returns {HTMLElement} HTML div with an error message
-     */
-    ErrorHandler.prototype.validateWidthandHeight = function (width, height) {
-      var badWidth = _.isNaN(width) || width <= 0;
-      var badHeight = _.isNaN(height) || height <= 0;
-
-      if (badWidth || badHeight) {
-        throw new errors.ContainerTooSmall();
-      }
-    };
-
-    return ErrorHandler;
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/vislib/lib/axis_title.js b/src/kibana/components/vislib/lib/axis_title.js
deleted file mode 100644
index 6ed661a678153..0000000000000
--- a/src/kibana/components/vislib/lib/axis_title.js
+++ /dev/null
@@ -1,76 +0,0 @@
-define(function (require) {
-  return function AxisTitleFactory(d3, Private) {
-    var $ = require('jquery');
-    var _ = require('lodash');
-
-    var ErrorHandler = Private(require('components/vislib/lib/_error_handler'));
-
-    /**
-     * Appends axis title(s) to the visualization
-     *
-     * @class AxisTitle
-     * @constructor
-     * @param el {HTMLElement} DOM element
-     * @param xTitle {String} X-axis title
-     * @param yTitle {String} Y-axis title
-     */
-    _.class(AxisTitle).inherits(ErrorHandler);
-    function AxisTitle(el, xTitle, yTitle) {
-      if (!(this instanceof AxisTitle)) {
-        return new AxisTitle(el, xTitle, yTitle);
-      }
-
-      this.el = el;
-      this.xTitle = xTitle;
-      this.yTitle = yTitle;
-    }
-
-    /**
-     * Renders both x and y axis titles
-     *
-     * @method render
-     * @returns {HTMLElement} DOM Element with axis titles
-     */
-    AxisTitle.prototype.render = function () {
-      d3.select(this.el).select('.x-axis-title').call(this.draw(this.xTitle));
-      d3.select(this.el).select('.y-axis-title').call(this.draw(this.yTitle));
-    };
-
-    /**
-     * Appends an SVG with title text
-     *
-     * @method draw
-     * @param title {String} Axis title
-     * @returns {Function} Appends axis title to a D3 selection
-     */
-    AxisTitle.prototype.draw = function (title) {
-      var self = this;
-
-      return function (selection) {
-        selection.each(function () {
-          var el = this;
-          var div = d3.select(el);
-          var width = $(el).width();
-          var height = $(el).height();
-
-          self.validateWidthandHeight(width, height);
-
-          div.append('svg')
-          .attr('width', width)
-          .attr('height', height)
-          .append('text')
-          .attr('transform', function () {
-            if (div.attr('class') === 'x-axis-title') {
-              return 'translate(' + width / 2 + ',11)';
-            }
-            return 'translate(11,' + height / 2 + ')rotate(270)';
-          })
-          .attr('text-anchor', 'middle')
-          .text(title);
-        });
-      };
-    };
-
-    return AxisTitle;
-  };
-});
diff --git a/src/kibana/components/vislib/lib/chart_title.js b/src/kibana/components/vislib/lib/chart_title.js
deleted file mode 100644
index 2ea13d15c5f3b..0000000000000
--- a/src/kibana/components/vislib/lib/chart_title.js
+++ /dev/null
@@ -1,130 +0,0 @@
-define(function (require) {
-  return function ChartTitleFactory(d3, Private) {
-    var $ = require('jquery');
-    var _ = require('lodash');
-
-    var ErrorHandler = Private(require('components/vislib/lib/_error_handler'));
-    var Tooltip = Private(require('components/vislib/components/tooltip/tooltip'));
-
-    /**
-     * Appends chart titles to the visualization
-     *
-     * @class ChartTitle
-     * @constructor
-     * @param el {HTMLElement} Reference to DOM element
-     */
-    _.class(ChartTitle).inherits(ErrorHandler);
-    function ChartTitle(el) {
-      if (!(this instanceof ChartTitle)) {
-        return new ChartTitle(el);
-      }
-
-      this.el = el;
-      this.tooltip = new Tooltip('chart-title', el, function (d) {
-        return '<p>' + _.escape(d.label) + '</p>';
-      });
-    }
-
-    /**
-     * Renders chart titles
-     *
-     * @method render
-     * @returns {D3.Selection|D3.Transition.Transition} DOM element with chart titles
-     */
-    ChartTitle.prototype.render = function () {
-      var el = d3.select(this.el).select('.chart-title').node();
-      var width = el ? el.clientWidth : 0;
-      var height = el ? el.clientHeight : 0;
-
-      return d3.select(this.el).selectAll('.chart-title').call(this.draw(width, height));
-    };
-
-    /**
-     * Truncates chart title text
-     *
-     * @method truncate
-     * @param size {Number} Height or width of the HTML Element
-     * @returns {Function} Truncates text
-     */
-    ChartTitle.prototype.truncate = function (size) {
-      var self = this;
-
-      return function (selection) {
-        selection.each(function () {
-          var text = d3.select(this);
-          var n = text[0].length;
-          var maxWidth = size / n * 0.9;
-          var length = this.getComputedTextLength();
-          var str;
-          var avg;
-          var end;
-
-          if (length > maxWidth) {
-            str = text.text();
-            avg = length / str.length;
-            end = Math.floor(maxWidth / avg) - 5;
-            str = str.substr(0, end) + '...';
-            self.addMouseEvents(text);
-
-            return text.text(str);
-          }
-
-          return text.text();
-        });
-      };
-    };
-
-    /**
-     * Adds tooltip events on truncated chart titles
-     *
-     * @method addMouseEvents
-     * @param target {HTMLElement} DOM element to attach event listeners
-     * @returns {*} DOM element with event listeners attached
-     */
-    ChartTitle.prototype.addMouseEvents = function (target) {
-      if (this.tooltip) {
-        return target.call(this.tooltip.render());
-      }
-    };
-
-    /**
-     * Appends chart titles to the visualization
-     *
-     * @method draw
-     * @returns {Function} Appends chart titles to a D3 selection
-     */
-    ChartTitle.prototype.draw = function (width, height) {
-      var self = this;
-
-      return function (selection) {
-        selection.each(function () {
-          var div = d3.select(this);
-          var dataType = this.parentNode.__data__.rows ? 'rows' : 'columns';
-          var size = dataType === 'rows' ? height : width;
-          var txtHtOffset = 11;
-
-          self.validateWidthandHeight(width, height);
-
-          div.append('svg')
-          .attr('width', width)
-          .attr('height', height)
-          .append('text')
-          .attr('transform', function () {
-            if (dataType === 'rows') {
-              return 'translate(' + txtHtOffset + ',' + height / 2 + ')rotate(270)';
-            }
-            return 'translate(' + width / 2 + ',' + txtHtOffset + ')';
-          })
-          .attr('text-anchor', 'middle')
-          .text(function (d) { return d.label; });
-
-          // truncate long chart titles
-          div.selectAll('text')
-          .call(self.truncate(size));
-        });
-      };
-    };
-
-    return ChartTitle;
-  };
-});
diff --git a/src/kibana/components/vislib/lib/data.js b/src/kibana/components/vislib/lib/data.js
deleted file mode 100644
index bfe9c130d68b8..0000000000000
--- a/src/kibana/components/vislib/lib/data.js
+++ /dev/null
@@ -1,711 +0,0 @@
-define(function (require) {
-  return function DataFactory(d3, Private) {
-    var _ = require('lodash');
-
-    var injectZeros = Private(require('components/vislib/components/zero_injection/inject_zeros'));
-    var orderKeys = Private(require('components/vislib/components/zero_injection/ordered_x_keys'));
-    var getLabels = Private(require('components/vislib/components/labels/labels'));
-    var color = Private(require('components/vislib/components/color/color'));
-    var errors = require('errors');
-
-    /**
-     * Provides an API for pulling values off the data
-     * and calculating values using the data
-     *
-     * @class Data
-     * @constructor
-     * @param data {Object} Elasticsearch query results
-     * @param attr {Object|*} Visualization options
-     */
-    function Data(data, attr) {
-      if (!(this instanceof Data)) {
-        return new Data(data, attr);
-      }
-
-      var self = this;
-      var offset;
-
-      if (attr.mode === 'stacked') {
-        offset = 'zero';
-      } else if (attr.mode === 'percentage') {
-        offset = 'expand';
-      } else if (attr.mode === 'grouped') {
-        offset = 'group';
-      } else {
-        offset = attr.mode;
-      }
-
-      this.data = data;
-      this.type = this.getDataType();
-
-      this.labels = this._getLabels(this.data);
-      this.color = this.labels ? color(this.labels) : undefined;
-      this._normalizeOrdered();
-
-      this._attr = _.defaults(attr || {}, {
-        stack: d3.layout.stack()
-          .x(function (d) { return d.x; })
-          .y(function (d) {
-            if (offset === 'expand') {
-              return Math.abs(d.y);
-            }
-            return d.y;
-          })
-          .offset(offset || 'zero')
-      });
-
-      if (attr.mode === 'stacked' && attr.type === 'histogram') {
-        this._attr.stack.out(function (d, y0, y) {
-          return self._stackNegAndPosVals(d, y0, y);
-        });
-      }
-    }
-
-    Data.prototype._updateData = function () {
-      if (this.data.rows) {
-        _.map(this.data.rows, this._updateDataSeriesLabel, this);
-      } else if (this.data.columns) {
-        _.map(this.data.columns, this._updateDataSeriesLabel, this);
-      } else {
-        this._updateDataSeriesLabel(this.data);
-      }
-    };
-
-    Data.prototype._updateDataSeriesLabel = function (eachData) {
-      if (eachData.series) {
-        eachData.series[0].label = this.get('yAxisLabel');
-      }
-    };
-
-    Data.prototype._getLabels = function (data) {
-      if (this.type === 'series') {
-        var noLabel = getLabels(data).length === 1 && getLabels(data)[0] === '';
-        if (noLabel) {
-          this._updateData();
-          return [(this.get('yAxisLabel'))];
-        }
-        return getLabels(data);
-      }
-      return this.pieNames();
-    };
-
-    /**
-     * Returns true for positive numbers
-     */
-    Data.prototype._isPositive = function (num) {
-      return num >= 0;
-    };
-
-    /**
-     * Returns true for negative numbers
-     */
-    Data.prototype._isNegative = function (num) {
-      return num < 0;
-    };
-
-    /**
-     * Adds two input values
-     */
-    Data.prototype._addVals = function (a, b) {
-      return a + b;
-    };
-
-    /**
-     * Returns the results of the addition of numbers in a filtered array.
-     */
-    Data.prototype._sumYs = function (arr, callback) {
-      var filteredArray = arr.filter(callback);
-
-      return (filteredArray.length) ? filteredArray.reduce(this._addVals) : 0;
-    };
-
-    /**
-     * Calculates the d.y0 value for stacked data in D3.
-     */
-    Data.prototype._calcYZero = function (y, arr) {
-      if (y >= 0) return this._sumYs(arr, this._isPositive);
-      return this._sumYs(arr, this._isNegative);
-    };
-
-    /**
-     *
-     */
-    Data.prototype._getCounts = function (i, j) {
-      var data = this.chartData();
-      var dataLengths = {};
-
-      dataLengths.charts = data.length;
-      dataLengths.stacks = dataLengths.charts ? data[i].series.length : 0;
-      dataLengths.values = dataLengths.stacks ? data[i].series[j].values.length : 0;
-
-      return dataLengths;
-    };
-
-    /**
-     *
-     */
-    Data.prototype._createCache = function () {
-      var cache = {
-        index: {
-          chart: 0,
-          stack: 0,
-          value: 0
-        },
-        yValsArr: []
-      };
-
-      cache.count = this._getCounts(cache.index.chart, cache.index.stack);
-
-      return cache;
-    };
-
-    /**
-     * Stacking function passed to the D3 Stack Layout `.out` API.
-     * See: https://github.com/mbostock/d3/wiki/Stack-Layout
-     * It is responsible for calculating the correct d.y0 value for
-     * mixed datasets containing both positive and negative values.
-     */
-    Data.prototype._stackNegAndPosVals = function (d, y0, y) {
-      var data = this.chartData();
-
-      // Storing counters and data characteristics needed to stack values properly
-      if (!this._cache) {
-        this._cache = this._createCache();
-      }
-
-      d.y0 = this._calcYZero(y, this._cache.yValsArr);
-      ++this._cache.index.stack;
-
-
-      // last stack, or last value, reset the stack count and y value array
-      var lastStack = (this._cache.index.stack >= this._cache.count.stacks);
-      if (lastStack) {
-        this._cache.index.stack = 0;
-        ++this._cache.index.value;
-        this._cache.yValsArr = [];
-      // still building the stack collection, push v value to array
-      } else if (y !== 0) {
-        this._cache.yValsArr.push(y);
-      }
-
-      // last value, prepare for the next chart, if one exists
-      var lastValue = (this._cache.index.value >= this._cache.count.values);
-      if (lastValue) {
-        this._cache.index.value = 0;
-        ++this._cache.index.chart;
-
-        // no more charts, reset the queue and finish
-        if (this._cache.index.chart >= this._cache.count.charts) {
-          this._cache = this._createCache();
-          return;
-        }
-
-        // get stack and value count for next chart
-        var chartSeries = data[this._cache.index.chart].series;
-        this._cache.count.stacks = chartSeries.length;
-        this._cache.count.values = chartSeries.length ? chartSeries[this._cache.index.stack].values.length : 0;
-      }
-    };
-
-    Data.prototype.getDataType = function () {
-      var data = this.getVisData();
-      var type;
-
-      data.forEach(function (obj) {
-        if (obj.series) {
-          type = 'series';
-        } else if (obj.slices) {
-          type = 'slices';
-        } else if (obj.geoJson) {
-          type = 'geoJson';
-        }
-      });
-
-      return type;
-    };
-
-    /**
-     * Returns an array of the actual x and y data value objects
-     * from data with series keys
-     *
-     * @method chartData
-     * @returns {*} Array of data objects
-     */
-    Data.prototype.chartData = function () {
-      if (!this.data.series) {
-        var arr = this.data.rows ? this.data.rows : this.data.columns;
-        return _.toArray(arr);
-      }
-      return [this.data];
-    };
-
-    /**
-     * Returns an array of chart data objects
-     *
-     * @method getVisData
-     * @returns {*} Array of chart data objects
-     */
-    Data.prototype.getVisData = function () {
-      var visData;
-
-      if (this.data.rows) {
-        visData = this.data.rows;
-      } else if (this.data.columns) {
-        visData = this.data.columns;
-      } else {
-        visData = [this.data];
-      }
-
-      return visData;
-    };
-
-    /**
-     * get min and max for all cols, rows of data
-     *
-     * @method getMaxMin
-     * @return {Object}
-     */
-    Data.prototype.getGeoExtents = function () {
-      var visData = this.getVisData();
-
-      return _.reduce(_.pluck(visData, 'geoJson.properties'), function (minMax, props) {
-        return {
-          min: Math.min(props.min, minMax.min),
-          max: Math.max(props.max, minMax.max)
-        };
-      }, { min: Infinity, max: -Infinity });
-    };
-
-    /**
-     * Returns array of chart data objects for pie data objects
-     *
-     * @method pieData
-     * @returns {*} Array of chart data objects
-     */
-    Data.prototype.pieData = function () {
-      if (!this.data.slices) {
-        return this.data.rows ? this.data.rows : this.data.columns;
-      }
-      return [this.data];
-    };
-
-    /**
-     * Get attributes off the data, e.g. `tooltipFormatter` or `xAxisFormatter`
-     * pulls the value off the first item in the array
-     * these values are typically the same between data objects of the same chart
-     * TODO: May need to verify this or refactor
-     *
-     * @method get
-     * @param thing {String} Data object key
-     * @returns {*} Data object value
-     */
-    Data.prototype.get = function (thing, def) {
-      var source = (this.data.rows || this.data.columns || [this.data])[0];
-      return _.get(source, thing, def);
-    };
-
-    /**
-     * Returns true if null values are present
-     * @returns {*}
-     */
-    Data.prototype.hasNullValues = function () {
-      var chartData = this.chartData();
-
-      return chartData.some(function (chart) {
-        return chart.series.some(function (obj) {
-          return obj.values.some(function (d) {
-            return d.y === null;
-          });
-        });
-      });
-    };
-
-    /**
-     * Return an array of all value objects
-     * Pluck the data.series array from each data object
-     * Create an array of all the value objects from the series array
-     *
-     * @method flatten
-     * @returns {Array} Value objects
-     */
-    Data.prototype.flatten = function () {
-      return _(this.chartData())
-      .pluck('series')
-      .flattenDeep()
-      .pluck('values')
-      .flattenDeep()
-      .value();
-    };
-
-    /**
-     * Determines whether histogram charts should be stacked
-     * TODO: need to make this more generic
-     *
-     * @method shouldBeStacked
-     * @returns {boolean}
-     */
-    Data.prototype.shouldBeStacked = function () {
-      var isHistogram = (this._attr.type === 'histogram');
-      var isArea = (this._attr.type === 'area');
-      var isOverlapping = (this._attr.mode === 'overlap');
-      var grouped = (this._attr.mode === 'grouped');
-
-      var stackedHisto = isHistogram && !grouped;
-      var stackedArea = isArea && !isOverlapping;
-
-      return stackedHisto || stackedArea;
-    };
-
-    /**
-     * Validates that the Y axis min value defined by user input
-     * is a number.
-     *
-     * @param val {Number} Y axis min value
-     * @returns {Number} Y axis min value
-     */
-    Data.prototype.validateUserDefinedYMin = function (val) {
-      if (!_.isNumber(val)) {
-        throw new Error('validateUserDefinedYMin expects a number');
-      }
-      return val;
-    };
-
-    /**
-     * Calculates the lowest Y value across all charts, taking
-     * stacking into consideration.
-     *
-     * @method getYMin
-     * @param {function} [getValue] - optional getter that will receive a
-     *                              point and should return the value that should
-     *                              be considered
-     * @returns {Number} Min y axis value
-     */
-    Data.prototype.getYMin = function (getValue) {
-      var self = this;
-      var arr = [];
-
-      if (this._attr.mode === 'percentage' || this._attr.mode === 'wiggle' ||
-        this._attr.mode === 'silhouette') {
-        return 0;
-      }
-
-      var flat = this.flatten();
-      // if there is only one data point and its less than zero,
-      // return 0 as the yMax value.
-      if (!flat.length || flat.length === 1 && flat[0].y > 0) {
-        return 0;
-      }
-
-      var min = Infinity;
-
-      // for each object in the dataArray,
-      // push the calculated y value to the initialized array (arr)
-      _.each(this.chartData(), function (chart) {
-        var calculatedMin = self._getYExtent(chart, 'min', getValue);
-        if (!_.isUndefined(calculatedMin)) {
-          min = Math.min(min, calculatedMin);
-        }
-      });
-
-      return min;
-    };
-
-    /**
-     * Calculates the highest Y value across all charts, taking
-     * stacking into consideration.
-     *
-     * @method getYMax
-     * @param {function} [getValue] - optional getter that will receive a
-     *                              point and should return the value that should
-     *                              be considered
-     * @returns {Number} Max y axis value
-     */
-    Data.prototype.getYMax = function (getValue) {
-      var self = this;
-      var arr = [];
-
-      if (self._attr.mode === 'percentage') {
-        return 1;
-      }
-
-      var flat = this.flatten();
-      // if there is only one data point and its less than zero,
-      // return 0 as the yMax value.
-      if (!flat.length || flat.length === 1 && flat[0].y < 0) {
-        return 0;
-      }
-
-      var max = -Infinity;
-
-      // for each object in the dataArray,
-      // push the calculated y value to the initialized array (arr)
-      _.each(this.chartData(), function (chart) {
-        var calculatedMax = self._getYExtent(chart, 'max', getValue);
-        if (!_.isUndefined(calculatedMax)) {
-          max = Math.max(max, calculatedMax);
-        }
-      });
-
-      return max;
-    };
-
-    /**
-     * Calculates the stacked values for each data object
-     *
-     * @method stackData
-     * @param series {Array} Array of data objects
-     * @returns {*} Array of data objects with x, y, y0 keys
-     */
-    Data.prototype.stackData = function (series) {
-      // Should not stack values on line chart
-      if (this._attr.type === 'line') return series;
-      return this._attr.stack(series);
-    };
-
-    /**
-     * Returns the max Y axis value for a `series` array based on
-     * a specified callback function (calculation).
-     * @param {function} [getValue] - Optional getter that will be used to read
-     *                              values from points when calculating the extent.
-     *                              default is either this._getYStack or this.getY
-     *                              based on this.shouldBeStacked().
-     */
-    Data.prototype._getYExtent = function (chart, extent, getValue) {
-      if (this.shouldBeStacked()) {
-        this.stackData(_.pluck(chart.series, 'values'));
-        getValue = getValue || this._getYStack;
-      } else {
-        getValue = getValue || this._getY;
-      }
-
-      var points = chart.series
-      .reduce(function (points, series) {
-        return points.concat(series.values);
-      }, [])
-      .map(getValue);
-
-      return d3[extent](points);
-    };
-
-    /**
-     * Calculates the y stack value for each data object
-     */
-    Data.prototype._getYStack = function (d) {
-      return d.y0 + d.y;
-    };
-
-    /**
-     * Calculates the Y max value
-     */
-    Data.prototype._getY = function (d) {
-      return d.y;
-    };
-
-    /**
-     * Helper function for getNames
-     * Returns an array of objects with a name (key) value and an index value.
-     * The index value allows us to sort the names in the correct nested order.
-     *
-     * @method returnNames
-     * @param array {Array} Array of data objects
-     * @param index {Number} Number of times the object is nested
-     * @param columns {Object} Contains name formatter information
-     * @returns {Array} Array of labels (strings)
-     */
-    Data.prototype.returnNames = function (array, index, columns) {
-      var names = [];
-      var self = this;
-
-      _.forEach(array, function (obj) {
-        names.push({ label: obj.name, values: obj, index: index });
-
-        if (obj.children) {
-          var plusIndex = index + 1;
-
-          _.forEach(self.returnNames(obj.children, plusIndex, columns), function (namedObj) {
-            names.push(namedObj);
-          });
-        }
-      });
-
-      return names;
-    };
-
-    /**
-     * Flattens hierarchical data into an array of objects with a name and index value.
-     * The indexed value determines the order of nesting in the data.
-     * Returns an array with names sorted by the index value.
-     *
-     * @method getNames
-     * @param data {Object} Chart data object
-     * @param columns {Object} Contains formatter information
-     * @returns {Array} Array of names (strings)
-     */
-    Data.prototype.getNames = function (data, columns) {
-      var slices = data.slices;
-
-      if (slices.children) {
-        var namedObj = this.returnNames(slices.children, 0, columns);
-
-        return _(namedObj)
-        .sortBy(function (obj) {
-          return obj.index;
-        })
-        .unique(function (d) {
-          return d.label;
-        })
-        .value();
-      }
-    };
-
-    /**
-     * Removes zeros from pie chart data
-     * @param slices
-     * @returns {*}
-     */
-    Data.prototype._removeZeroSlices = function (slices) {
-      var self = this;
-
-      if (!slices.children) return slices;
-
-      slices = _.clone(slices);
-      slices.children = slices.children.reduce(function (children, child) {
-        if (child.size !== 0) {
-          children.push(self._removeZeroSlices(child));
-        }
-        return children;
-      }, []);
-
-      return slices;
-    };
-
-    /**
-     * Returns an array of names ordered by appearance in the nested array
-     * of objects
-     *
-     * @method pieNames
-     * @returns {Array} Array of unique names (strings)
-     */
-    Data.prototype.pieNames = function (data) {
-      var self = this;
-      var names = [];
-
-      _.forEach(data, function (obj) {
-        var columns = obj.raw ? obj.raw.columns : undefined;
-        obj.slices = self._removeZeroSlices(obj.slices);
-
-        _.forEach(self.getNames(obj, columns), function (name) {
-          names.push(name);
-        });
-      });
-
-      return _.uniq(names, 'label');
-    };
-
-    /**
-     * Inject zeros into the data
-     *
-     * @method injectZeros
-     * @returns {Object} Data object with zeros injected
-     */
-    Data.prototype.injectZeros = function () {
-      return injectZeros(this.data);
-    };
-
-    /**
-     * Returns an array of all x axis values from the data
-     *
-     * @method xValues
-     * @returns {Array} Array of x axis values
-     */
-    Data.prototype.xValues = function () {
-      return orderKeys(this.data);
-    };
-
-    /**
-     * Return an array of unique labels
-     * Curently, only used for vertical bar and line charts,
-     * or any data object with series values
-     *
-     * @method getLabels
-     * @returns {Array} Array of labels (strings)
-     */
-    Data.prototype.getLabels = function () {
-      return getLabels(this.data);
-    };
-
-    /**
-     * Returns a function that does color lookup on labels
-     *
-     * @method getColorFunc
-     * @returns {Function} Performs lookup on string and returns hex color
-     */
-    Data.prototype.getColorFunc = function () {
-      return color(this.getLabels());
-    };
-
-    /**
-     * Returns a function that does color lookup on names for pie charts
-     *
-     * @method getPieColorFunc
-     * @returns {Function} Performs lookup on string and returns hex color
-     */
-    Data.prototype.getPieColorFunc = function () {
-      return color(this.pieNames(this.getVisData()).map(function (d) {
-        return d.label;
-      }));
-    };
-
-    /**
-     * ensure that the datas ordered property has a min and max
-     * if the data represents an ordered date range.
-     *
-     * @return {undefined}
-     */
-    Data.prototype._normalizeOrdered = function () {
-      if (!this.data.ordered || !this.data.ordered.date) return;
-
-      var missingMin = this.data.ordered.min == null;
-      var missingMax = this.data.ordered.max == null;
-
-      if (missingMax || missingMin) {
-        var extent = d3.extent(this.xValues());
-        if (missingMin) this.data.ordered.min = extent[0];
-        if (missingMax) this.data.ordered.max = extent[1];
-      }
-    };
-
-    /**
-     * Calculates min and max values for all map data
-     * series.rows is an array of arrays
-     * each row is an array of values
-     * last value in row array is bucket count
-     *
-     * @method mapDataExtents
-     * @param series {Array} Array of data objects
-     * @returns {Array} min and max values
-     */
-    Data.prototype.mapDataExtents = function (series) {
-      var values;
-      values = _.map(series.rows, function (row) {
-        return row[row.length - 1];
-      });
-      var extents = [_.min(values), _.max(values)];
-      return extents;
-    };
-
-    /**
-     * Get the maximum number of series, considering each chart
-     * individually.
-     *
-     * @return {number} - the largest number of series from all charts
-     */
-    Data.prototype.maxNumberOfSeries = function () {
-      return this.chartData().reduce(function (max, chart) {
-        return Math.max(max, chart.series.length);
-      }, 0);
-    };
-
-    return Data;
-  };
-});
diff --git a/src/kibana/components/vislib/lib/dispatch.js b/src/kibana/components/vislib/lib/dispatch.js
deleted file mode 100644
index 3977d8499a795..0000000000000
--- a/src/kibana/components/vislib/lib/dispatch.js
+++ /dev/null
@@ -1,317 +0,0 @@
-define(function (require) {
-  return function DispatchClass(d3, Private) {
-    var _ = require('lodash');
-    var $ = require('jquery');
-    var Tooltip = Private(require('components/vislib/components/tooltip/tooltip'));
-    var SimpleEmitter = require('utils/SimpleEmitter');
-
-    /**
-     * Handles event responses
-     *
-     * @class Dispatch
-     * @constructor
-     * @param handler {Object} Reference to Handler Class Object
-     */
-
-    _.class(Dispatch).inherits(SimpleEmitter);
-    function Dispatch(handler) {
-      if (!(this instanceof Dispatch)) {
-        return new Dispatch(handler);
-      }
-
-      Dispatch.Super.call(this);
-      this.handler = handler;
-      this._listeners = {};
-    }
-
-    /**
-     * Response to click and hover events
-     *
-     * @param d {Object} Data point
-     * @param i {Number} Index number of data point
-     * @returns {{value: *, point: *, label: *, color: *, pointIndex: *,
-      * series: *, config: *, data: (Object|*),
-     * e: (d3.event|*), handler: (Object|*)}} Event response object
-     */
-    Dispatch.prototype.eventResponse = function (d, i) {
-      var datum = d._input || d;
-      var data = d3.event.target.nearestViewportElement ?
-        d3.event.target.nearestViewportElement.__data__ : d3.event.target.__data__;
-      var label = d.label ? d.label : d.name;
-      var isSeries = !!(data && data.series);
-      var isSlices = !!(data && data.slices);
-      var series = isSeries ? data.series : undefined;
-      var slices = isSlices ? data.slices : undefined;
-      var handler = this.handler;
-      var color = _.get(handler, 'data.color');
-      var isPercentage = (handler && handler._attr.mode === 'percentage');
-
-      var eventData = {
-        value: d.y,
-        point: datum,
-        datum: datum,
-        label: label,
-        color: color ? color(label) : undefined,
-        pointIndex: i,
-        series: series,
-        slices: slices,
-        config: handler && handler._attr,
-        data: data,
-        e: d3.event,
-        handler: handler
-      };
-
-      if (isSeries) {
-        // Find object with the actual d value and add it to the point object
-        var object = _.find(series, { 'label': d.label });
-        eventData.value = +object.values[i].y;
-
-        if (isPercentage) {
-          // Add the formatted percentage to the point object
-          eventData.percent = (100 * d.y).toFixed(1) + '%';
-        }
-      }
-
-      return eventData;
-    };
-
-    /**
-     * Returns a function that adds events and listeners to a D3 selection
-     *
-     * @method addEvent
-     * @param event {String}
-     * @param callback {Function}
-     * @returns {Function}
-     */
-    Dispatch.prototype.addEvent = function (event, callback) {
-      return function (selection) {
-        selection.each(function () {
-          var element = d3.select(this);
-
-          if (typeof callback === 'function') {
-            return element.on(event, callback);
-          }
-        });
-      };
-    };
-
-    /**
-     *
-     * @method addHoverEvent
-     * @returns {Function}
-     */
-    Dispatch.prototype.addHoverEvent = function () {
-      var self = this;
-      var isClickable = this.listenerCount('click') > 0;
-      var addEvent = this.addEvent;
-      var $el = this.handler.el;
-
-      function hover(d, i) {
-        // Add pointer if item is clickable
-        if (isClickable) {
-          self.addMousePointer.call(this, arguments);
-        }
-
-        self.highlightLegend.call(this, $el);
-        self.emit('hover', self.eventResponse(d, i));
-      }
-
-      return addEvent('mouseover', hover);
-    };
-
-    /**
-     *
-     * @method addMouseoutEvent
-     * @returns {Function}
-     */
-    Dispatch.prototype.addMouseoutEvent = function () {
-      var self = this;
-      var addEvent = this.addEvent;
-      var $el = this.handler.el;
-
-      function mouseout() {
-        self.unHighlightLegend.call(this, $el);
-      }
-
-      return addEvent('mouseout', mouseout);
-    };
-
-    /**
-     *
-     * @method addClickEvent
-     * @returns {Function}
-     */
-    Dispatch.prototype.addClickEvent = function () {
-      var self = this;
-      var addEvent = this.addEvent;
-
-      function click(d, i) {
-        self.emit('click', self.eventResponse(d, i));
-      }
-
-      return addEvent('click', click);
-    };
-
-    /**
-     * Determine if we will allow brushing
-     *
-     * @method allowBrushing
-     * @returns {Boolean}
-     */
-    Dispatch.prototype.allowBrushing = function () {
-      var xAxis = this.handler.xAxis;
-      return Boolean(xAxis.ordered && xAxis.xScale && _.isFunction(xAxis.xScale.invert));
-    };
-
-    /**
-     * Determine if brushing is currently enabled
-     *
-     * @method isBrushable
-     * @returns {Boolean}
-     */
-    Dispatch.prototype.isBrushable = function () {
-      return this.allowBrushing() && this.listenerCount('brush') > 0;
-    };
-
-    /**
-     *
-     * @param svg
-     * @returns {Function}
-     */
-    Dispatch.prototype.addBrushEvent = function (svg) {
-      if (!this.isBrushable()) return;
-
-      var xScale = this.handler.xAxis.xScale;
-      var yScale = this.handler.xAxis.yScale;
-      var brush = this.createBrush(xScale, svg);
-
-      function brushEnd() {
-        if (!validBrushClick(d3.event)) return;
-
-        var bar = d3.select(this);
-        var startX = d3.mouse(svg.node());
-        var startXInv = xScale.invert(startX[0]);
-
-        // Reset the brush value
-        brush.extent([startXInv, startXInv]);
-
-        // Magic!
-        // Need to call brush on svg to see brush when brushing
-        // while on top of bars.
-        // Need to call brush on bar to allow the click event to be registered
-        svg.call(brush);
-        bar.call(brush);
-      }
-
-      return this.addEvent('mousedown', brushEnd);
-    };
-
-
-    /**
-     * Mouseover Behavior
-     *
-     * @method addMousePointer
-     * @returns {D3.Selection}
-     */
-    Dispatch.prototype.addMousePointer = function () {
-      return d3.select(this).style('cursor', 'pointer');
-    };
-
-    /**
-     * Mouseover Behavior
-     *
-     * @param element {D3.Selection}
-     * @method highlightLegend
-     */
-    Dispatch.prototype.highlightLegend = function (element) {
-      var label = this.getAttribute('data-label');
-
-      if (!label) return;
-
-      d3.select(element)
-        .select('.legend-ul')
-        .selectAll('li.color')
-        .filter(function (d, i) {
-          return String(d.label) !== label;
-        })
-        .classed('blur_shape', true);
-    };
-
-    /**
-     * Mouseout Behavior
-     *
-     * @param element {D3.Selection}
-     * @method unHighlightLegend
-     */
-    Dispatch.prototype.unHighlightLegend = function (element) {
-      d3.select(element)
-        .select('.legend-ul')
-        .selectAll('li.color')
-        .classed('blur_shape', false);
-    };
-
-    /**
-     * Adds D3 brush to SVG and returns the brush function
-     *
-     * @param xScale {Function} D3 xScale function
-     * @param svg {HTMLElement} Reference to SVG
-     * @returns {*} Returns a D3 brush function and a SVG with a brush group attached
-     */
-    Dispatch.prototype.createBrush = function (xScale, svg) {
-      var self = this;
-      var attr = self.handler._attr;
-      var height = attr.height;
-      var margin = attr.margin;
-
-      // Brush scale
-      var brush = d3.svg.brush()
-      .x(xScale)
-      .on('brushend', function brushEnd() {
-
-        // Assumes data is selected at the chart level
-        // In this case, the number of data objects should always be 1
-        var data = d3.select(this).data()[0];
-        var isTimeSeries = (data.ordered && data.ordered.date);
-
-        // Allows for brushing on d3.scale.ordinal()
-        var selected = xScale.domain().filter(function (d) {
-          return (brush.extent()[0] <= xScale(d)) && (xScale(d) <= brush.extent()[1]);
-        });
-        var range = isTimeSeries ? brush.extent() : selected;
-
-        return self.emit('brush', {
-          range: range,
-          config: attr,
-          e: d3.event,
-          data: data
-        });
-      });
-
-      // if `addBrushing` is true, add brush canvas
-      if (self.listenerCount('brush')) {
-        svg.insert('g', 'g')
-        .attr('class', 'brush')
-        .call(brush)
-        .call(function (brushG) {
-          // hijack the brush start event to filter out right/middle clicks
-          var brushHandler = brushG.on('mousedown.brush');
-          if (!brushHandler) return; // touch events in use
-          brushG.on('mousedown.brush', function () {
-            if (validBrushClick(d3.event)) brushHandler.apply(this, arguments);
-          });
-        })
-        .selectAll('rect')
-        .attr('height', height - margin.top - margin.bottom);
-
-        return brush;
-      }
-    };
-
-    function validBrushClick(event) {
-      return event.button === 0;
-    }
-
-
-    return Dispatch;
-  };
-});
diff --git a/src/kibana/components/vislib/lib/handler/handler.js b/src/kibana/components/vislib/lib/handler/handler.js
deleted file mode 100644
index b091b41b856f2..0000000000000
--- a/src/kibana/components/vislib/lib/handler/handler.js
+++ /dev/null
@@ -1,216 +0,0 @@
-define(function (require) {
-  return function HandlerBaseClass(d3, Private) {
-    var _ = require('lodash');
-    var errors = require('errors');
-
-    var Data = Private(require('components/vislib/lib/data'));
-    var Legend = Private(require('components/vislib/lib/legend'));
-    var Layout = Private(require('components/vislib/lib/layout/layout'));
-
-    /**
-     * Handles building all the components of the visualization
-     *
-     * @class Handler
-     * @constructor
-     * @param vis {Object} Reference to the Vis Class Constructor
-     * @param opts {Object} Reference to Visualization constructors needed to
-     * create the visualization
-     */
-    function Handler(vis, opts) {
-      if (!(this instanceof Handler)) {
-        return new Handler(vis, opts);
-      }
-
-      this.data = opts.data || new Data(vis.data, vis._attr);
-      this.vis = vis;
-      this.el = vis.el;
-      this.ChartClass = vis.ChartClass;
-      this.charts = [];
-
-      this._attr = _.defaults(vis._attr || {}, {
-        'margin' : { top: 10, right: 3, bottom: 5, left: 3 }
-      });
-
-      this.xAxis = opts.xAxis;
-      this.yAxis = opts.yAxis;
-      this.chartTitle = opts.chartTitle;
-      this.axisTitle = opts.axisTitle;
-      this.alerts = opts.alerts;
-
-      if (this._attr.addLegend) {
-        this.legend = opts.legend;
-      }
-
-      this.layout = new Layout(vis.el, vis.data, vis._attr.type, opts);
-
-      this.renderArray = _.filter([
-        this.layout,
-        this.legend,
-        this.axisTitle,
-        this.chartTitle,
-        this.alerts,
-        this.xAxis,
-        this.yAxis,
-      ], Boolean);
-
-      // memoize so that the same function is returned every time,
-      // allowing us to remove/re-add the same function
-      this.getProxyHandler = _.memoize(function (event) {
-        var self = this;
-        return function (e) {
-          self.vis.emit(event, e);
-        };
-      });
-    }
-
-    /**
-     * Validates whether data is actually present in the data object
-     * used to render the Vis. Throws a no results error if data is not
-     * present.
-     *
-     * @private
-     */
-    Handler.prototype._validateData = function () {
-      var dataType = this.data.type;
-
-      if (!dataType) {
-        throw new errors.NoResults();
-      }
-    };
-
-    /**
-     * Renders the constructors that create the visualization,
-     * including the chart constructor
-     *
-     * @method render
-     * @returns {HTMLElement} With the visualization child element
-     */
-    Handler.prototype.render = function () {
-      var self = this;
-      var charts = this.charts = [];
-      var selection = d3.select(this.el);
-
-      selection.selectAll('*').remove();
-
-      this._validateData();
-      this.renderArray.forEach(function (property) {
-        if (property instanceof Legend) {
-          self.vis.activeEvents().forEach(function (event) {
-            self.enable(event, property);
-          });
-        }
-
-        if (typeof property.render === 'function') {
-          property.render();
-        }
-      });
-
-      // render the chart(s)
-      selection.selectAll('.chart')
-      .each(function (chartData) {
-        var chart = new self.ChartClass(self, this, chartData);
-
-        self.vis.activeEvents().forEach(function (event) {
-          self.enable(event, chart);
-        });
-
-        charts.push(chart);
-        chart.render();
-      });
-    };
-
-
-    /**
-     * Enables events, i.e. binds specific events to the chart
-     * object(s) `on` method. For example, `click` or `mousedown` events.
-     *
-     * @method enable
-     * @param event {String} Event type
-     * @param chart {Object} Chart
-     * @returns {*}
-     */
-    Handler.prototype.enable = chartEventProxyToggle('on');
-
-    /**
-     * Disables events for all charts
-     *
-     * @method disable
-     * @param event {String} Event type
-     * @param chart {Object} Chart
-     * @returns {*}
-     */
-    Handler.prototype.disable = chartEventProxyToggle('off');
-
-
-    function chartEventProxyToggle(method) {
-      return function (event, chart) {
-        var proxyHandler = this.getProxyHandler(event);
-
-        _.each(chart ? [chart] : this.charts, function (chart) {
-          chart.events[method](event, proxyHandler);
-        });
-      };
-    }
-
-    /**
-     * Removes all DOM elements from the HTML element provided
-     *
-     * @method removeAll
-     * @param el {HTMLElement} Reference to the HTML Element that
-     * contains the chart
-     * @returns {D3.Selection|D3.Transition.Transition} With the chart
-     * child element removed
-     */
-    Handler.prototype.removeAll = function (el) {
-      return d3.select(el).selectAll('*').remove();
-    };
-
-    /**
-     * Displays an error message in the DOM
-     *
-     * @method error
-     * @param message {String} Error message to display
-     * @returns {HTMLElement} Displays the input message
-     */
-    Handler.prototype.error = function (message) {
-      this.removeAll(this.el);
-
-      var div = d3.select(this.el)
-      .append('div')
-      // class name needs `chart` in it for the polling checkSize function
-      // to continuously call render on resize
-      .attr('class', 'visualize-error chart error');
-
-      if (message === 'No results found') {
-        div.append('div')
-        .attr('class', 'text-center visualize-error visualize-chart ng-scope')
-        .append('div').attr('class', 'item top')
-        .append('div').attr('class', 'item')
-        .append('h2').html('<i class="fa fa-meh-o"></i>')
-        .append('h4').text(message);
-
-        div.append('div').attr('class', 'item bottom');
-        return div;
-      }
-
-      return div.append('h4').text(message);
-    };
-
-    /**
-     * Destroys all the charts in the visualization
-     *
-     * @method destroy
-     */
-    Handler.prototype.destroy = function () {
-      this.charts.forEach(function (chart) {
-        if (_.isFunction(chart.destroy)) {
-          chart.destroy();
-        }
-      });
-
-      this.charts.length = 0;
-    };
-
-    return Handler;
-  };
-});
diff --git a/src/kibana/components/vislib/lib/handler/handler_types.js b/src/kibana/components/vislib/lib/handler/handler_types.js
deleted file mode 100644
index 9cabd926ee22c..0000000000000
--- a/src/kibana/components/vislib/lib/handler/handler_types.js
+++ /dev/null
@@ -1,18 +0,0 @@
-define(function (require) {
-  return function HandlerTypeFactory(Private) {
-    var pointSeries = Private(require('components/vislib/lib/handler/types/point_series'));
-
-    /**
-     * Handles the building of each visualization
-     *
-     * @return {Function} Returns an Object of Handler types
-     */
-    return {
-      histogram: pointSeries.column,
-      line: pointSeries.line,
-      pie: Private(require('components/vislib/lib/handler/types/pie')),
-      area: pointSeries.area,
-      tile_map: Private(require('components/vislib/lib/handler/types/tile_map'))
-    };
-  };
-});
diff --git a/src/kibana/components/vislib/lib/handler/types/pie.js b/src/kibana/components/vislib/lib/handler/types/pie.js
deleted file mode 100644
index 10293e4bdda56..0000000000000
--- a/src/kibana/components/vislib/lib/handler/types/pie.js
+++ /dev/null
@@ -1,19 +0,0 @@
-define(function (require) {
-  return function PieHandler(d3, Private) {
-    var Handler = Private(require('components/vislib/lib/handler/handler'));
-    var Data = Private(require('components/vislib/lib/data'));
-    var Legend = Private(require('components/vislib/lib/legend'));
-    var ChartTitle = Private(require('components/vislib/lib/chart_title'));
-
-    /*
-     * Handler for Pie visualizations.
-     */
-
-    return function (vis) {
-      return new Handler(vis, {
-        legend: new Legend(vis),
-        chartTitle: new ChartTitle(vis.el)
-      });
-    };
-  };
-});
diff --git a/src/kibana/components/vislib/lib/handler/types/point_series.js b/src/kibana/components/vislib/lib/handler/types/point_series.js
deleted file mode 100644
index 745ea88d5a05e..0000000000000
--- a/src/kibana/components/vislib/lib/handler/types/point_series.js
+++ /dev/null
@@ -1,93 +0,0 @@
-define(function (require) {
-  return function ColumnHandler(d3, Private) {
-    var injectZeros = Private(require('components/vislib/components/zero_injection/inject_zeros'));
-    var Handler = Private(require('components/vislib/lib/handler/handler'));
-    var Data = Private(require('components/vislib/lib/data'));
-    var Legend = Private(require('components/vislib/lib/legend'));
-    var XAxis = Private(require('components/vislib/lib/x_axis'));
-    var YAxis = Private(require('components/vislib/lib/y_axis'));
-    var AxisTitle = Private(require('components/vislib/lib/axis_title'));
-    var ChartTitle = Private(require('components/vislib/lib/chart_title'));
-    var Alerts = Private(require('components/vislib/lib/alerts'));
-
-    /*
-     * Create handlers for Area, Column, and Line charts which
-     * are all nearly the same minus a few details
-     */
-    function create(opts) {
-      opts = opts || {};
-
-      return function (vis) {
-        var isUserDefinedYAxis = vis._attr.setYExtents;
-        var data;
-
-        if (opts.zeroFill) {
-          data = new Data(injectZeros(vis.data), vis._attr);
-        } else {
-          data = new Data(vis.data, vis._attr);
-        }
-
-        return new Handler(vis, {
-          data: data,
-          legend: new Legend(vis, vis.data),
-          axisTitle: new AxisTitle(vis.el, data.get('xAxisLabel'), data.get('yAxisLabel')),
-          chartTitle: new ChartTitle(vis.el),
-          xAxis: new XAxis({
-            el                : vis.el,
-            xValues           : data.xValues(),
-            ordered           : data.get('ordered'),
-            xAxisFormatter    : data.get('xAxisFormatter'),
-            expandLastBucket  : opts.expandLastBucket,
-            _attr             : vis._attr
-          }),
-          alerts: new Alerts(vis, data, opts.alerts),
-          yAxis: new YAxis({
-            el   : vis.el,
-            yMin : isUserDefinedYAxis ? vis._attr.yAxis.min : data.getYMin(),
-            yMax : isUserDefinedYAxis ? vis._attr.yAxis.max : data.getYMax(),
-            yAxisFormatter: data.get('yAxisFormatter'),
-            _attr: vis._attr
-          })
-        });
-
-      };
-    }
-
-    return {
-      line: create(),
-
-      column: create({
-        zeroFill: true,
-        expandLastBucket: true
-      }),
-
-      area: create({
-        zeroFill: true,
-        alerts: [
-          {
-            type: 'warning',
-            msg: 'Positive and negative values are not accurately represented by stacked ' +
-                 'area charts. Either changing the chart mode to "overlay" or using a ' +
-                 'bar chart is recommended.',
-            test: function (vis, data) {
-              if (!data.shouldBeStacked() || data.maxNumberOfSeries() < 2) return;
-
-              var hasPos = data.getYMax(data._getY) > 0;
-              var hasNeg = data.getYMin(data._getY) < 0;
-              return (hasPos && hasNeg);
-            }
-          },
-          {
-            type: 'warning',
-            msg: 'Parts of or the entire area chart might not be displayed due to null ' +
-            'values in the data. A line chart is recommended when displaying data ' +
-            'with null values.',
-            test: function (vis, data) {
-              return data.hasNullValues();
-            }
-          }
-        ]
-      })
-    };
-  };
-});
diff --git a/src/kibana/components/vislib/lib/handler/types/tile_map.js b/src/kibana/components/vislib/lib/handler/types/tile_map.js
deleted file mode 100644
index 141e29031a1a4..0000000000000
--- a/src/kibana/components/vislib/lib/handler/types/tile_map.js
+++ /dev/null
@@ -1,25 +0,0 @@
-define(function (require) {
-  return function MapHandler(d3, Private) {
-    var _ = require('lodash');
-
-    var Handler = Private(require('components/vislib/lib/handler/handler'));
-    var Data = Private(require('components/vislib/lib/data'));
-
-    return function (vis) {
-      var data = new Data(vis.data, vis._attr);
-
-      var MapHandler = new Handler(vis, {
-        data: data
-      });
-
-      MapHandler.resize = function () {
-        this.charts.forEach(function (chart) {
-          chart.resizeArea();
-        });
-      };
-
-      return MapHandler;
-    };
-  };
-});
-
diff --git a/src/kibana/components/vislib/lib/layout/layout.js b/src/kibana/components/vislib/lib/layout/layout.js
deleted file mode 100644
index ff7839ad6ea13..0000000000000
--- a/src/kibana/components/vislib/lib/layout/layout.js
+++ /dev/null
@@ -1,153 +0,0 @@
-define(function (require) {
-  return function LayoutFactory(d3, Private) {
-    var _ = require('lodash');
-
-    var layoutType = Private(require('components/vislib/lib/layout/layout_types'));
-
-    /**
-     * Builds the visualization DOM layout
-     *
-     * The Layout Constructor is responsible for rendering the visualization
-     * layout, which includes all the DOM div elements.
-     * Input:
-     *   1. DOM div - parent element for which the layout is attached
-     *   2. data - data is bound to the div element
-     *   3. chartType (e.g. 'histogram') - specifies the layout type to grab
-     *
-     * @class Layout
-     * @constructor
-     * @param el {HTMLElement} HTML element to which the chart will be appended
-     * @param data {Object} Elasticsearch query results for this specific chart
-     * @param chartType {Object} Reference to chart functions, i.e. Pie
-     */
-    function Layout(el, data, chartType, opts) {
-      if (!(this instanceof Layout)) {
-        return new Layout(el, data, chartType, opts);
-      }
-
-      this.el = el;
-      this.data = data;
-      this.opts = opts;
-      this.layoutType = layoutType[chartType](this.el, this.data);
-    }
-
-    // Render the layout
-    /**
-     * Renders visualization HTML layout
-     * Remove all elements from the current visualization and creates the layout
-     *
-     * @method render
-     */
-    Layout.prototype.render = function () {
-      this.removeAll(this.el);
-      this.createLayout(this.layoutType);
-    };
-
-    /**
-     * Create the layout based on the json array provided
-     * for each object in the layout array, call the layout function
-     *
-     * @method createLayout
-     * @param arr {Array} Json array
-     * @returns {*} Creates the visualization layout
-     */
-    Layout.prototype.createLayout = function (arr) {
-      var self = this;
-
-      return _.each(arr, function (obj) {
-        self.layout(obj);
-      });
-    };
-
-    /**
-     * Appends a DOM element based on the object keys
-     * check to see if reference to DOM element is string but not class selector
-     * Create a class selector
-     *
-     * @method layout
-     * @param obj {Object} Instructions for creating the layout of a DOM Element
-     * @returns {*} DOM Element
-     */
-    Layout.prototype.layout = function (obj) {
-      if (!obj.parent) {
-        throw new Error('No parent element provided');
-      }
-
-      if (!obj.type) {
-        throw new Error('No element type provided');
-      }
-
-      if (typeof obj.type !== 'string') {
-        throw new Error(obj.type + ' must be a string');
-      }
-
-      if (typeof obj.parent === 'string' && obj.parent.charAt(0) !== '.') {
-        obj.parent = '.' + obj.parent;
-      }
-
-      var childEl = this.appendElem(obj.parent, obj.type, obj.class);
-
-      if (obj.datum) {
-        childEl.datum(obj.datum);
-      }
-
-      if (obj.splits) {
-        childEl.call(obj.splits, obj.parent, this.opts);
-      }
-
-      if (obj.children) {
-        var newParent = childEl[0][0];
-
-        _.forEach(obj.children, function (obj) {
-          if (!obj.parent) {
-            obj.parent = newParent;
-          }
-        });
-
-        this.createLayout(obj.children);
-      }
-
-      return childEl;
-    };
-
-    /**
-     * Appends a `type` of DOM element to `el` and gives it a class name attribute `className`
-     *
-     * @method appendElem
-     * @param el {HTMLElement} Reference to a DOM Element
-     * @param type {String} DOM element type
-     * @param className {String} CSS class name
-     * @returns {*} Reference to D3 Selection
-     */
-    Layout.prototype.appendElem = function (el, type, className) {
-      if (!el || !type || !className) {
-        throw new Error('Function requires that an el, type, and class be provided');
-      }
-
-      if (typeof el === 'string') {
-        // Create a DOM reference with a d3 selection
-        // Need to make sure that the `el` is bound to this object
-        // to prevent it from being appended to another Layout
-        el = d3.select(this.el)
-          .select(el)[0][0];
-      }
-
-      return d3.select(el)
-        .append(type)
-        .attr('class', className);
-    };
-
-    /**
-     * Removes all DOM elements from DOM element
-     *
-     * @method removeAll
-     * @param el {HTMLElement} Reference to DOM element
-     * @returns {D3.Selection|D3.Transition.Transition} Reference to an empty DOM element
-     */
-    Layout.prototype.removeAll = function (el) {
-      return d3.select(el).selectAll('*').remove();
-    };
-
-    return Layout;
-  };
-});
diff --git a/src/kibana/components/vislib/lib/layout/layout_types.js b/src/kibana/components/vislib/lib/layout/layout_types.js
deleted file mode 100644
index 291498344d146..0000000000000
--- a/src/kibana/components/vislib/lib/layout/layout_types.js
+++ /dev/null
@@ -1,20 +0,0 @@
-define(function (require) {
-  return function LayoutTypeFactory(Private) {
-
-    /**
-     * Provides the HTML layouts for each visualization class
-     *
-     * @module vislib
-     * @submodule LayoutTypeFactory
-     * @param Private {Service} Loads any function as an angular module
-     * @return {Function} Returns an Object of HTML layouts for each visualization class
-     */
-    return {
-      histogram: Private(require('components/vislib/lib/layout/types/column_layout')),
-      line: Private(require('components/vislib/lib/layout/types/column_layout')),
-      area: Private(require('components/vislib/lib/layout/types/column_layout')),
-      pie: Private(require('components/vislib/lib/layout/types/pie_layout')),
-      tile_map: Private(require('components/vislib/lib/layout/types/map_layout'))
-    };
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/vislib/lib/layout/splits/column_chart/chart_split.js b/src/kibana/components/vislib/lib/layout/splits/column_chart/chart_split.js
deleted file mode 100644
index c5df9d629a6f1..0000000000000
--- a/src/kibana/components/vislib/lib/layout/splits/column_chart/chart_split.js
+++ /dev/null
@@ -1,48 +0,0 @@
-define(function () {
-  return function ChartSplitFactory(d3) {
-    /*
-     * Adds div DOM elements to the `.chart-wrapper` element based on the data layout.
-     * For example, if the data has rows, it returns the same number of
-     * `.chart` elements as row objects.
-     */
-    return function split(selection) {
-      selection.each(function (data) {
-        var div = d3.select(this)
-        .attr('class', function () {
-          if (data.rows) {
-            return 'chart-wrapper-row';
-          } else if (data.columns) {
-            return 'chart-wrapper-column';
-          } else {
-            return 'chart-wrapper';
-          }
-        });
-        var divClass;
-
-        var charts = div.selectAll('charts')
-        .append('div')
-        .data(function (d) {
-          if (d.rows) {
-            divClass = 'chart-row';
-            return d.rows;
-          } else if (d.columns) {
-            divClass = 'chart-column';
-            return d.columns;
-          } else {
-            divClass = 'chart';
-            return [d];
-          }
-        })
-        .enter()
-          .append('div')
-          .attr('class', function () {
-            return divClass;
-          });
-
-        if (!data.series) {
-          charts.call(split);
-        }
-      });
-    };
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/vislib/lib/layout/splits/column_chart/chart_title_split.js b/src/kibana/components/vislib/lib/layout/splits/column_chart/chart_title_split.js
deleted file mode 100644
index a183e11dac511..0000000000000
--- a/src/kibana/components/vislib/lib/layout/splits/column_chart/chart_title_split.js
+++ /dev/null
@@ -1,37 +0,0 @@
-define(function () {
-  return function ChartTitleSplitFactory(d3) {
-    /*
-     * Adds div DOM elements to either the `.y-axis-chart-title` element or the
-     * `.x-axis-chart-title` element based on the data layout.
-     * For example, if the data has rows, it returns the same number of
-     * `.chart-title` elements as row objects.
-     * if not data.rows or data.columns, return no chart titles
-     */
-    return function (selection) {
-      selection.each(function (data) {
-        var div = d3.select(this);
-
-        if (!data.series) {
-          div.selectAll('.chart-title')
-          .append('div')
-          .data(function (d) {
-            return d.rows ? d.rows : d.columns;
-          })
-          .enter()
-            .append('div')
-            .attr('class', 'chart-title');
-
-          if (data.rows) {
-            d3.select('.x-axis-chart-title').remove();
-          } else {
-            d3.select('.y-axis-chart-title').remove();
-          }
-
-          return div;
-        }
-
-        return d3.select(this).remove();
-      });
-    };
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/components/vislib/lib/layout/splits/pie_chart/chart_split.js b/src/kibana/components/vislib/lib/layout/splits/pie_chart/chart_split.js
deleted file mode 100644
index d0f869b1c027f..0000000000000
--- a/src/kibana/components/vislib/lib/layout/splits/pie_chart/chart_split.js
+++ /dev/null
@@ -1,50 +0,0 @@
-define(function () {
-  return function ChartSplitFactory(d3) {
-
-    /*
-     * Adds div DOM elements to the `.chart-wrapper` element based on the data layout.
-     * For example, if the data has rows, it returns the same number of
-     * `.chart` elements as row objects.
-     */
-
-    return function split(selection) {
-      selection.each(function (data) {
-        var div = d3.select(this)
-        .attr('class', function () {
-          if (data.rows) {
-            return 'chart-wrapper-row';
-          } else if (data.columns) {
-            return 'chart-wrapper-column';
-          } else {
-            return 'chart-wrapper';
-          }
-        });
-        var divClass;
-
-        var charts = div.selectAll('charts')
-        .append('div')
-        .data(function (d) {
-          if (d.rows) {
-            divClass = 'chart-row';
-            return d.rows;
-          } else if (d.columns) {
-            divClass = 'chart-column';
-            return d.columns;
-          } else {
-            divClass = 'chart';
-            return [d];
-          }
-        })
-        .enter()
-          .append('div')
-          .attr('class', function () {
-            return divClass;
-          });
-
-        if (!data.slices) {
-          charts.call(split);
-        }
-      });
-    };
-  };
-});
diff --git a/src/kibana/components/vislib/lib/layout/splits/pie_chart/chart_title_split.js b/src/kibana/components/vislib/lib/layout/splits/pie_chart/chart_title_split.js
deleted file mode 100644
index a538ac2ce7dee..0000000000000
--- a/src/kibana/components/vislib/lib/layout/splits/pie_chart/chart_title_split.js
+++ /dev/null
@@ -1,39 +0,0 @@
-define(function () {
-  return function ChartTitleSplitFactory(d3) {
-
-    /*
-     * Adds div DOM elements to either the `.y-axis-chart-title` element or the
-     * `.x-axis-chart-title` element based on the data layout.
-     * For example, if the data has rows, it returns the same number of
-     * `.chart-title` elements as row objects.
-     * if not data.rows or data.columns, return no chart titles
-     */
-
-    return function (selection, parent) {
-      selection.each(function (data) {
-        var div = d3.select(this);
-
-        if (!data.slices) {
-          div.selectAll('.chart-title')
-          .append('div')
-          .data(function (d) {
-            return d.rows ? d.rows : d.columns;
-          })
-          .enter()
-            .append('div')
-            .attr('class', 'chart-title');
-
-          if (data.rows) {
-            d3.select(parent).select('.x-axis-chart-title').remove();
-          } else {
-            d3.select(parent).select('.y-axis-chart-title').remove();
-          }
-
-          return div;
-        }
-
-        return d3.select(this).remove();
-      });
-    };
-  };
-});
diff --git a/src/kibana/components/vislib/lib/layout/types/column_layout.js b/src/kibana/components/vislib/lib/layout/types/column_layout.js
deleted file mode 100644
index bb2b4ae7abd9a..0000000000000
--- a/src/kibana/components/vislib/lib/layout/types/column_layout.js
+++ /dev/null
@@ -1,111 +0,0 @@
-define(function (require) {
-  return function ColumnLayoutFactory(d3, Private) {
-    var chartSplit = Private(require('components/vislib/lib/layout/splits/column_chart/chart_split'));
-    var yAxisSplit = Private(require('components/vislib/lib/layout/splits/column_chart/y_axis_split'));
-    var xAxisSplit = Private(require('components/vislib/lib/layout/splits/column_chart/x_axis_split'));
-    var chartTitleSplit = Private(require('components/vislib/lib/layout/splits/column_chart/chart_title_split'));
-
-    /**
-     * Specifies the visualization layout for column charts.
-     *
-     * This is done using an array of objects. The first object has
-     * a `parent` DOM element,  a DOM `type` (e.g. div, svg, etc),
-     * and a `class` (required). Each child can omit the parent object,
-     * but must include a type and class.
-     *
-     * Optionally, you can specify `datum` to be bound to the DOM
-     * element, a `splits` function that divides the selected element
-     * into more DOM elements based on a callback function provided, or
-     * a children array which nests other layout objects.
-     *
-     * Objects in children arrays are children of the current object and return
-     * DOM elements which are children of their respective parent element.
-     */
-
-    return function (el, data) {
-      if (!el || !data) {
-        throw new Error('Both an el and data need to be specified');
-      }
-
-      return [
-        {
-          parent: el,
-          type: 'div',
-          class: 'vis-wrapper',
-          datum: data,
-          children: [
-            {
-              type: 'div',
-              class: 'y-axis-col-wrapper',
-              children: [
-                {
-                  type: 'div',
-                  class: 'y-axis-col',
-                  children: [
-                    {
-                      type: 'div',
-                      class: 'y-axis-title'
-                    },
-                    {
-                      type: 'div',
-                      class: 'y-axis-chart-title',
-                      splits: chartTitleSplit
-                    },
-                    {
-                      type: 'div',
-                      class: 'y-axis-div-wrapper',
-                      splits: yAxisSplit
-                    }
-                  ]
-                },
-                {
-                  type: 'div',
-                  class: 'y-axis-spacer-block'
-                }
-              ]
-            },
-            {
-              type: 'div',
-              class: 'vis-col-wrapper',
-              children: [
-                {
-                  type: 'div',
-                  class: 'chart-wrapper',
-                  splits: chartSplit
-                },
-                {
-                  type: 'div',
-                  class: 'vis-alerts'
-                },
-                {
-                  type: 'div',
-                  class: 'x-axis-wrapper',
-                  children: [
-                    {
-                      type: 'div',
-                      class: 'x-axis-div-wrapper',
-                      splits: xAxisSplit
-                    },
-                    {
-                      type: 'div',
-                      class: 'x-axis-chart-title',
-                      splits: chartTitleSplit
-                    },
-                    {
-                      type: 'div',
-                      class: 'x-axis-title'
-                    }
-                  ]
-                }
-              ]
-            },
-            {
-              type: 'div',
-              class: 'legend-col-wrapper'
-            }
-          ]
-        }
-      ];
-    };
-  };
-});
diff --git a/src/kibana/components/vislib/lib/legend.js b/src/kibana/components/vislib/lib/legend.js
deleted file mode 100644
index ea40440acb271..0000000000000
--- a/src/kibana/components/vislib/lib/legend.js
+++ /dev/null
@@ -1,229 +0,0 @@
-define(function (require) {
-  return function LegendFactory(d3, Private) {
-    var _ = require('lodash');
-    var Dispatch = Private(require('components/vislib/lib/dispatch'));
-    var Data = Private(require('components/vislib/lib/data'));
-    var legendHeaderTemplate = _.template(require('text!components/vislib/partials/legend_header.html'));
-    var dataLabel = require('components/vislib/lib/_data_label');
-    var color = Private(require('components/vislib/components/color/color'));
-
-    require('css!components/vislib/styles/main');
-
-    /**
-     * Appends legend to the visualization
-     *
-     * @class Legend
-     * @constructor
-     * @param vis {Object} Reference to Vis Constructor
-     */
-    function Legend(vis) {
-      if (!(this instanceof Legend)) {
-        return new Legend(vis);
-      }
-
-      var data = vis.data.columns || vis.data.rows || [vis.data];
-      var type = vis._attr.type;
-      var labels = this.labels = this._getLabels(data, type);
-      var labelsArray = labels.map(function (obj) { return obj.label; });
-
-      this.events = new Dispatch();
-      this.vis = vis;
-      this.el = vis.el;
-      this.color = color(labelsArray);
-      this._attr = _.defaults({}, vis._attr || {}, {
-        'legendClass' : 'legend-col-wrapper',
-        'blurredOpacity' : 0.3,
-        'focusOpacity' : 1,
-        'defaultOpacity' : 1,
-        'legendDefaultOpacity': 1,
-        'isOpen' : true
-      });
-    }
-
-    Legend.prototype._getPieLabels = function (data) {
-      return Data.prototype.pieNames(data);
-    };
-
-    Legend.prototype._getSeriesLabels = function (data) {
-      var isOneSeries = data.every(function (chart) {
-        return chart.series.length === 1;
-      });
-
-      var values = data.map(function (chart) {
-        var yLabel = isOneSeries ? chart.yAxisLabel : undefined;
-
-        return chart.series.map(function (series) {
-          if (yLabel) series.label = yLabel;
-          return series;
-        });
-      })
-      .reduce(function (a, b) {
-        return a.concat(b);
-      }, []);
-
-      return _.uniq(values, 'label');
-    };
-
-    Legend.prototype._getLabels = function (data, type) {
-      if (type === 'pie') return this._getPieLabels(data);
-      return this._getSeriesLabels(data);
-    };
-
-    /**
-     * Adds legend header
-     *
-     * @method header
-     * @param el {HTMLElement} Reference to DOM element
-     * @param args {Object|*} Legend options
-     * @returns {*} HTML element
-     */
-    Legend.prototype._header = function (el, args) {
-      return el.append('div')
-      .attr('class', 'header')
-      .append('div')
-      .attr('class', 'column-labels')
-      .html(function () {
-        return legendHeaderTemplate(args._attr);
-      });
-    };
-
-    /**
-     * Adds list to legend
-     *
-     * @method list
-     * @param el {HTMLElement} Reference to DOM element
-     * @param arrOfLabels {Array} Array of labels
-     * @param args {Object|*} Legend options
-     * @returns {D3.Selection} HTML element with list of labels attached
-     */
-    Legend.prototype._list = function (el, data, args) {
-      var self = this;
-
-      return el.append('ul')
-      .attr('class', function () {
-        if (args._attr.isOpen) { return 'legend-ul'; }
-        return 'legend-ul hidden';
-      })
-      .selectAll('li')
-      .data(data)
-      .enter()
-        .append('li')
-        .attr('class', 'color')
-        .each(function (d) {
-          var li = d3.select(this);
-          self._addIdentifier.call(this, d);
-
-          li.append('i')
-          .attr('class', 'fa fa-circle dots')
-          .attr('style', 'color:' + args.color(d.label));
-
-          li.append('span').text(d.label);
-        });
-    };
-
-    /**
-     * Append the data label to the element
-     *
-     * @method _addIdentifier
-     * @param label {string} label to use
-     */
-    Legend.prototype._addIdentifier = function (d) {
-      dataLabel(this, d.label);
-    };
-
-    /**
-     * Renders legend
-     *
-     * @method render
-     * @return {HTMLElement} Legend
-     */
-    Legend.prototype.render = function () {
-      var self = this;
-      var visEl = d3.select(this.el);
-      var legendDiv = visEl.select('.' + this._attr.legendClass);
-      var items = this.labels;
-      this._header(legendDiv, this);
-      this._list(legendDiv, items, this);
-
-      var headerIcon = visEl.select('.legend-toggle');
-
-      // toggle
-      headerIcon
-      .on('click', function legendClick() {
-        if (self._attr.isOpen) {
-          // close legend
-          visEl.select('ul.legend-ul').classed('hidden', true);
-          self._attr.isOpen = false;
-
-          // need to add reference to resize function on toggle
-          self.vis.resize();
-        } else {
-          // open legend
-          visEl.select('ul.legend-ul').classed('hidden', false);
-          self._attr.isOpen = true;
-
-          // need to add reference to resize function on toggle
-          self.vis.resize();
-        }
-      });
-
-      legendDiv.select('.legend-ul').selectAll('li')
-      .on('mouseover', function (d) {
-        var label = d.label;
-        var charts = visEl.selectAll('.chart');
-
-        function filterLabel() {
-          var pointLabel = this.getAttribute('data-label');
-          return pointLabel !== label.toString();
-        }
-
-        if (label && label !== '_all') {
-          d3.select(this).style('cursor', 'pointer');
-        }
-
-        // legend
-        legendDiv.selectAll('li')
-        .filter(filterLabel)
-        .classed('blur_shape', true);
-
-        // all data-label attribute
-        charts.selectAll('[data-label]')
-        .filter(filterLabel)
-        .classed('blur_shape', true);
-
-        var eventEl =  d3.select(this);
-        eventEl.style('white-space', 'inherit');
-        eventEl.style('word-break', 'break-all');
-      })
-      .on('mouseout', function () {
-        /*
-         * The default opacity of elements in charts may be modified by the
-         * chart constructor, and so may differ from that of the legend
-         */
-
-        var charts = visEl.selectAll('.chart');
-
-        // legend
-        legendDiv.selectAll('li')
-        .classed('blur_shape', false);
-
-        // all data-label attribute
-        charts.selectAll('[data-label]')
-        .classed('blur_shape', false);
-
-        var eventEl =  d3.select(this);
-        eventEl.style('white-space', 'nowrap');
-        eventEl.style('word-break', 'inherit');
-      });
-
-      legendDiv.selectAll('li.color').each(function (d) {
-        var label = d.label;
-        if (label !== undefined && label !== '_all') {
-          d3.select(this).call(self.events.addClickEvent());
-        }
-      });
-    };
-
-    return Legend;
-  };
-});
diff --git a/src/kibana/components/vislib/lib/resize_checker.js b/src/kibana/components/vislib/lib/resize_checker.js
deleted file mode 100644
index b9d7e2c8ab84c..0000000000000
--- a/src/kibana/components/vislib/lib/resize_checker.js
+++ /dev/null
@@ -1,207 +0,0 @@
-define(function (require) {
-  return function ResizeCheckerFactory(Private, Notifier, $rootScope) {
-    var $ = require('jquery');
-    var _ = require('lodash');
-
-    var EventEmitter = Private(require('factories/events'));
-    var reflowWatcher = Private(require('components/reflow_watcher'));
-    var sequencer = require('utils/sequencer');
-
-    var SCHEDULE = ResizeChecker.SCHEDULE = sequencer.createEaseIn(
-      100,      // shortest delay
-      10000,  // longest delay
-      50     // tick count
-    );
-
-    // maximum ms that we can delay emitting 'resize'. This is only used
-    // to debounce resizes when the size of the element is constantly changing
-    var MS_MAX_RESIZE_DELAY = ResizeChecker.MS_MAX_RESIZE_DELAY = 500;
-
-    /**
-     * Checks the size of an element on a regular basis. Provides
-     * an event that is emited when the element has changed size.
-     *
-     * @class ResizeChecker
-     * @param {HtmlElement} el - the element to track the size of
-     */
-    _.class(ResizeChecker).inherits(EventEmitter);
-    function ResizeChecker(el) {
-      ResizeChecker.Super.call(this);
-
-      this.$el = $(el);
-      this.notify = new Notifier({ location: 'Vislib ResizeChecker ' + _.uniqueId() });
-
-      this.saveSize();
-
-      this.check = _.bind(this.check, this);
-      this.check();
-
-      this.onReflow = _.bind(this.onReflow, this);
-      reflowWatcher.on('reflow', this.onReflow);
-    }
-
-    ResizeChecker.prototype.onReflow = function () {
-      this.startSchedule(SCHEDULE);
-    };
-
-    /**
-     * Read the size of the element
-     *
-     * @method read
-     * @return {object} - an object with keys `w` (width) and `h` (height)
-     */
-    ResizeChecker.prototype.read = function () {
-      return {
-        w: this.$el[0].clientWidth,
-        h: this.$el[0].clientHeight
-      };
-    };
-
-
-    /**
-     * Save the element size, preventing it from being considered as an
-     * update.
-     *
-     * @method save
-     * @param  {object} [size] - optional size to save, otherwise #read() is called
-     * @return {boolean} - true if their was a change in the new
-     */
-    ResizeChecker.prototype.saveSize = function (size) {
-      if (!size) size = this.read();
-
-      if (this._equalsSavedSize(size)) {
-        return false;
-      }
-
-      this._savedSize = size;
-      return true;
-    };
-
-
-    /**
-     * Determine if a given size matches the currently saved size.
-     *
-     * @private
-     * @method _equalsSavedSize
-     * @param  {object} a - an object that matches the return value of #read()
-     * @return {boolean} - true if the passed in value matches the saved size
-     */
-    ResizeChecker.prototype._equalsSavedSize = function (a) {
-      var b = this._savedSize || {};
-      return a.w === b.w && a.h === b.h;
-    };
-
-    /**
-     * Read the time that the dirty state last changed.
-     *
-     * @method lastDirtyChange
-     * @return {timestamp} - the unix timestamp (in ms) of the last update
-     *                       to the dirty state
-     */
-    ResizeChecker.prototype.lastDirtyChange = function () {
-      return this._dirtyChangeStamp;
-    };
-
-    /**
-     * Record the dirty state
-     *
-     * @method saveDirty
-     * @param  {boolean} val
-     * @return {boolean} - true if the dirty state changed by this save
-     */
-    ResizeChecker.prototype.saveDirty = function (val) {
-      val = !!val;
-
-      if (val === this._isDirty) return false;
-
-      this._isDirty = val;
-      this._dirtyChangeStamp = Date.now();
-      return true;
-    };
-
-    /**
-     * The check routine that executes regularly and will reschedule itself
-     * to run again in the future. It determines the state of the elements
-     * size and decides when to emit the "update" event.
-     *
-     * @method check
-     * @return {void}
-     */
-    ResizeChecker.prototype.check = function () {
-      if (window.DISABLE_RESIZE_CHECKER) return;
-
-      var newSize = this.read();
-      var dirty = this.saveSize(newSize);
-      var dirtyChanged = this.saveDirty(dirty);
-
-      var doneDirty = !dirty && dirtyChanged;
-      var muchDirty = dirty && (this.lastDirtyChange() - Date.now() > MS_MAX_RESIZE_DELAY);
-      if (doneDirty || muchDirty) {
-        this.emit('resize', newSize);
-      }
-
-      // if the dirty state is unchanged, continue using the previous schedule
-      if (!dirtyChanged) {
-        return this.continueSchedule();
-      }
-
-      return this.startSchedule(SCHEDULE);
-    };
-
-    /**
-     * Start running a new schedule, using one of the SCHEDULE_* constants.
-     *
-     * @method startSchedule
-     * @param  {integer[]} schedule - an array of millisecond times that should
-     *                              be used to schedule calls to #check();
-     * @return {integer} - the id of the next timer
-     */
-    ResizeChecker.prototype.startSchedule = function (schedule) {
-      if (window.DISABLE_RESIZE_CHECKER) return;
-
-      this._tick = -1;
-      this._currentSchedule = schedule;
-      return this.continueSchedule();
-    };
-
-    /**
-     * Continue running the current schedule. MUST BE CALLED AFTER #startSchedule()
-     *
-     * @method continueSchedule
-     * @return {integer} - the id of the next timer
-     */
-    ResizeChecker.prototype.continueSchedule = function () {
-      if (window.DISABLE_RESIZE_CHECKER) return;
-
-      clearTimeout(this._timerId);
-
-      if (this._tick < this._currentSchedule.length - 1) {
-        // at the end of the schedule, don't progress any further but repeat the last value
-        this._tick += 1;
-      }
-
-      var check = this.check; // already bound
-      var tick = this._tick;
-      var notify = this.notify;
-      var ms = this._currentSchedule[this._tick];
-      return (this._timerId = setTimeout(function () {
-        check();
-      }, ms));
-    };
-
-    /**
-     * Signal that the ResizeChecker should shutdown.
-     *
-     * Cleans up it's listeners and timers.
-     *
-     * @method destroy
-     * @return {void}
-     */
-    ResizeChecker.prototype.destroy = function () {
-      reflowWatcher.off('reflow', this.onReflow);
-      clearTimeout(this._timerId);
-    };
-
-    return ResizeChecker;
-  };
-});
diff --git a/src/kibana/components/vislib/lib/x_axis.js b/src/kibana/components/vislib/lib/x_axis.js
deleted file mode 100644
index 5132900c7098a..0000000000000
--- a/src/kibana/components/vislib/lib/x_axis.js
+++ /dev/null
@@ -1,524 +0,0 @@
-define(function (require) {
-  return function XAxisFactory(d3, Private) {
-    var $ = require('jquery');
-    var _ = require('lodash');
-    var moment = require('moment');
-
-    var ErrorHandler = Private(require('components/vislib/lib/_error_handler'));
-
-    /**
-     * Adds an x axis to the visualization
-     *
-     * @class XAxis
-     * @constructor
-     * @param args {{el: (HTMLElement), xValues: (Array), ordered: (Object|*),
-     * xAxisFormatter: (Function), _attr: (Object|*)}}
-     */
-    _.class(XAxis).inherits(ErrorHandler);
-    function XAxis(args) {
-      if (!(this instanceof XAxis)) {
-        return new XAxis(args);
-      }
-
-      this.el = args.el;
-      this.xValues = args.xValues;
-      this.ordered = args.ordered;
-      this.xAxisFormatter = args.xAxisFormatter;
-      this.expandLastBucket = args.expandLastBucket == null ? true : args.expandLastBucket;
-      this._attr = _.defaults(args._attr || {});
-    }
-
-    /**
-     * Renders the x axis
-     *
-     * @method render
-     * @returns {D3.UpdateSelection} Appends x axis to visualization
-     */
-    XAxis.prototype.render = function () {
-      d3.select(this.el).selectAll('.x-axis-div').call(this.draw());
-    };
-
-    /**
-     * Returns d3 x axis scale function.
-     * If time, return time scale, else return d3 ordinal scale for nominal data
-     *
-     * @method getScale
-     * @returns {*} D3 scale function
-     */
-    XAxis.prototype.getScale = function () {
-      var ordered = this.ordered;
-
-      if (ordered && ordered.date) {
-        return d3.time.scale.utc();
-      }
-      return d3.scale.ordinal();
-    };
-
-    /**
-     * Add domain to the x axis scale.
-     * if time, return a time domain, and calculate the min date, max date, and time interval
-     * else, return a nominal (d3.scale.ordinal) domain, i.e. array of x axis values
-     *
-     * @method getDomain
-     * @param scale {Function} D3 scale
-     * @returns {*} D3 scale function
-     */
-    XAxis.prototype.getDomain = function (scale) {
-      var ordered = this.ordered;
-
-      if (ordered && ordered.date) {
-        return this.getTimeDomain(scale, this.xValues);
-      }
-      return this.getOrdinalDomain(scale, this.xValues);
-    };
-
-    /**
-     * Returns D3 time domain
-     *
-     * @method getTimeDomain
-     * @param scale {Function} D3 scale function
-     * @param data {Array}
-     * @returns {*} D3 scale function
-     */
-    XAxis.prototype.getTimeDomain = function (scale, data) {
-      return scale.domain([this.minExtent(data), this.maxExtent(data)]);
-    };
-
-    XAxis.prototype.minExtent = function (data) {
-      return this._calculateExtent(data || this.xValues, 'min');
-    };
-
-    XAxis.prototype.maxExtent = function (data) {
-      return this._calculateExtent(data || this.xValues, 'max');
-    };
-
-    /**
-     *
-     * @param data
-     * @param extent
-     */
-    XAxis.prototype._calculateExtent = function (data, extent) {
-      var ordered = this.ordered;
-      var opts = [ordered[extent]];
-
-      var point = d3[extent](data);
-      if (this.expandLastBucket && extent === 'max') {
-        point = this.addInterval(point);
-      }
-      opts.push(point);
-
-      return d3[extent](opts.reduce(function (opts, v) {
-        if (!_.isNumber(v)) v = +v;
-        if (!isNaN(v)) opts.push(v);
-        return opts;
-      }, []));
-    };
-
-    /**
-     * Add the interval to a point on the x axis,
-     * this properly adds dates if needed.
-     *
-     * @param {number} x - a value on the x-axis
-     * @returns {number} - x + the ordered interval
-     */
-    XAxis.prototype.addInterval = function (x) {
-      return this.modByInterval(x, +1);
-    };
-
-    /**
-     * Subtract the interval to a point on the x axis,
-     * this properly subtracts dates if needed.
-     *
-     * @param {number} x - a value on the x-axis
-     * @returns {number} - x - the ordered interval
-     */
-    XAxis.prototype.subtractInterval = function (x) {
-      return this.modByInterval(x, -1);
-    };
-
-    /**
-     * Modify the x value by n intervals, properly
-     * handling dates if needed.
-     *
-     * @param {number} x - a value on the x-axis
-     * @param {number} n - the number of intervals
-     * @returns {number} - x + n intervals
-     */
-    XAxis.prototype.modByInterval = function (x, n) {
-      var ordered = this.ordered;
-      if (!ordered) return x;
-      var interval = ordered.interval;
-      if (!interval) return x;
-
-      if (!ordered.date) {
-        return x += (ordered.interval * n);
-      }
-
-      var y = moment(x);
-      var method = n > 0 ? 'add' : 'subtract';
-
-      _.times(Math.abs(n), function () {
-        y[method](interval);
-      });
-
-      return y.valueOf();
-    };
-
-    /**
-     * Return a nominal(d3 ordinal) domain
-     *
-     * @method getOrdinalDomain
-     * @param scale {Function} D3 scale function
-     * @param xValues {Array} Array of x axis values
-     * @returns {*} D3 scale function
-     */
-    XAxis.prototype.getOrdinalDomain = function (scale, xValues) {
-      return scale.domain(xValues);
-    };
-
-    /**
-     * Return the range for the x axis scale
-     * if time, return a normal range, else if nominal, return rangeBands with a default (0.1) spacer specified
-     *
-     * @method getRange
-     * @param scale {Function} D3 scale function
-     * @param width {Number} HTML Element width
-     * @returns {*} D3 scale function
-     */
-    XAxis.prototype.getRange = function (domain, width) {
-      var ordered = this.ordered;
-
-      if (ordered && ordered.date) {
-        return domain.range([0, width]);
-      }
-      return domain.rangeBands([0, width], 0.1);
-    };
-
-    /**
-     * Return the x axis scale
-     *
-     * @method getXScale
-     * @param width {Number} HTML Element width
-     * @returns {*} D3 x scale function
-     */
-    XAxis.prototype.getXScale = function (width) {
-      var domain = this.getDomain(this.getScale());
-
-      return this.getRange(domain, width);
-    };
-
-    /**
-     * Creates d3 xAxis function
-     *
-     * @method getXAxis
-     * @param width {Number} HTML Element width
-     */
-    XAxis.prototype.getXAxis = function (width) {
-      this.xScale = this.getXScale(width);
-
-      if (!this.xScale || _.isNaN(this.xScale)) {
-        throw new Error('xScale is ' + this.xScale);
-      }
-
-      this.xAxis = d3.svg.axis()
-      .scale(this.xScale)
-      .ticks(10)
-      .tickFormat(this.xAxisFormatter)
-      .orient('bottom');
-    };
-
-    /**
-     * Renders the x axis
-     *
-     * @method draw
-     * @returns {Function} Renders the x axis to a D3 selection
-     */
-    XAxis.prototype.draw = function () {
-      var self = this;
-      var div;
-      var width;
-      var height;
-      var svg;
-      var parentWidth;
-      var n;
-      this._attr.isRotated = false;
-
-      return function (selection) {
-        n = selection[0].length;
-        parentWidth = $(self.el)
-        .find('.x-axis-div-wrapper')
-        .width();
-
-        selection.each(function () {
-
-          div = d3.select(this);
-          width = parentWidth / n;
-          height = $(this.parentElement).height();
-
-          self.validateWidthandHeight(width, height);
-
-          self.getXAxis(width);
-
-          svg = div.append('svg')
-          .attr('width', width)
-          .attr('height', height);
-
-          svg.append('g')
-          .attr('class', 'x axis')
-          .attr('transform', 'translate(0,0)')
-          .call(self.xAxis);
-        });
-
-        selection.call(self.filterOrRotate());
-      };
-    };
-
-    /**
-     * Returns a function that evaluates scale type and
-     * applies filter to tick labels on time scales
-     * rotates and truncates tick labels on nominal/ordinal scales
-     *
-     * @method filterOrRotate
-     * @returns {Function} Filters or rotates x axis tick labels
-     */
-    XAxis.prototype.filterOrRotate = function () {
-      var self = this;
-      var ordered = self.ordered;
-      var axis;
-      var labels;
-
-      return function (selection) {
-        selection.each(function () {
-          axis = d3.select(this);
-          labels = axis.selectAll('.tick text');
-          if (ordered && ordered.date) {
-            axis.call(self.filterAxisLabels());
-          } else {
-            axis.call(self.rotateAxisLabels());
-          }
-        });
-
-        self.updateXaxisHeight();
-
-        selection.call(self.fitTitles());
-
-      };
-    };
-
-    /**
-     * Rotate the axis tick labels within selection
-     *
-     * @returns {Function} Rotates x axis tick labels of a D3 selection
-     */
-    XAxis.prototype.rotateAxisLabels = function () {
-      var self = this;
-      var text;
-      var barWidth = self.xScale.rangeBand();
-      var maxRotatedLength = 180;
-      var xAxisPadding = 15;
-      var svg;
-      var lengths = [];
-      var length;
-      self._attr.isRotated = false;
-
-      return function (selection) {
-        text = selection.selectAll('.tick text');
-
-        text.each(function textWidths() {
-          lengths.push(d3.select(this).node().getBBox().width);
-        });
-        length = _.max(lengths);
-        self._attr.xAxisLabelHt = length + xAxisPadding;
-
-        // if longer than bar width, rotate
-        if (length > barWidth) {
-          self._attr.isRotated = true;
-        }
-
-        // if longer than maxRotatedLength, truncate
-        if (length > maxRotatedLength) {
-          self._attr.xAxisLabelHt = maxRotatedLength;
-        }
-
-        if (self._attr.isRotated) {
-          text
-          .text(function truncate() {
-            return self.truncateLabel(this, self._attr.xAxisLabelHt);
-          })
-          .style('text-anchor', 'end')
-          .attr('dx', '-.8em')
-          .attr('dy', '-.60em')
-          .attr('transform', function rotate() {
-            return 'rotate(-90)';
-          });
-          selection.select('svg')
-          .attr('height', self._attr.xAxisLabelHt);
-        }
-      };
-    };
-
-    /**
-     * Returns a string that is truncated to fit size
-     *
-     * @method truncateLabel
-     * @param text {HTMLElement}
-     * @param size {Number}
-     * @returns {*|jQuery}
-     */
-    XAxis.prototype.truncateLabel = function (text, size) {
-      var node = d3.select(text).node();
-      var str = $(node).text();
-      var width = node.getBBox().width;
-      var chars = str.length;
-      var pxPerChar = width / chars;
-      var endChar = 0;
-      var ellipsesPad = 4;
-
-      if (width > size) {
-        endChar = Math.floor((size / pxPerChar) - ellipsesPad);
-        while (str[endChar - 1] === ' ' || str[endChar - 1] === '-' || str[endChar - 1] === ',') {
-          endChar = endChar - 1;
-        }
-        str = str.substr(0, endChar) + '...';
-      }
-      return str;
-    };
-
-    /**
-     * Filter out text labels by width and position on axis
-     * trims labels that would overlap each other
-     * or extend past left or right edges
-     * if prev label pos (or 0) + half of label width is < label pos
-     * and label pos + half width  is not > width of axis
-     *
-     * @method filterAxisLabels
-     * @returns {Function}
-     */
-    XAxis.prototype.filterAxisLabels = function () {
-      var self = this;
-      var startX = 0;
-      var maxW;
-      var par;
-      var myX;
-      var myWidth;
-      var halfWidth;
-      var padding = 1.1;
-
-      return function (selection) {
-        selection.selectAll('.tick text')
-        .text(function (d) {
-          par = d3.select(this.parentNode).node();
-          myX = self.xScale(d);
-          myWidth = par.getBBox().width * padding;
-          halfWidth = myWidth / 2;
-          maxW = $(self.el).find('.x-axis-div').width();
-
-          if ((startX + halfWidth) < myX && maxW > (myX + halfWidth)) {
-            startX = myX + halfWidth;
-            return self.xAxisFormatter(d);
-          } else {
-            d3.select(this.parentNode).remove();
-          }
-        });
-      };
-    };
-
-    /**
-     * Returns a function that adjusts axis titles and
-     * chart title transforms to fit axis label divs.
-     * Sets transform of x-axis-title to fit .x-axis-title div width
-     * if x-axis-chart-titles, set transform of x-axis-chart-titles
-     * to fit .chart-title div width
-     *
-     * @method fitTitles
-     * @returns {Function}
-     */
-    XAxis.prototype.fitTitles = function () {
-      var visEls = $('.vis-wrapper');
-      var xAxisChartTitle;
-      var yAxisChartTitle;
-      var text;
-      var titles;
-
-      return function () {
-
-        visEls.each(function () {
-          var visEl = d3.select(this);
-          var $visEl = $(this);
-          var xAxisTitle = $visEl.find('.x-axis-title');
-          var yAxisTitle = $visEl.find('.y-axis-title');
-          var titleWidth = xAxisTitle.width();
-          var titleHeight = yAxisTitle.height();
-
-          text = visEl.select('.x-axis-title')
-          .select('svg')
-          .attr('width', titleWidth)
-          .select('text')
-          .attr('transform', 'translate(' + (titleWidth / 2) + ',11)');
-
-          text = visEl.select('.y-axis-title')
-          .select('svg')
-          .attr('height', titleHeight)
-          .select('text')
-          .attr('transform', 'translate(11,' + (titleHeight / 2) + ')rotate(-90)');
-
-          if ($visEl.find('.x-axis-chart-title').length) {
-            xAxisChartTitle = $visEl.find('.x-axis-chart-title');
-            titleWidth = xAxisChartTitle.find('.chart-title').width();
-
-            titles = visEl.select('.x-axis-chart-title').selectAll('.chart-title');
-            titles.each(function () {
-              text = d3.select(this)
-              .select('svg')
-              .attr('width', titleWidth)
-              .select('text')
-              .attr('transform', 'translate(' + (titleWidth / 2) + ',11)');
-            });
-          }
-
-          if ($visEl.find('.y-axis-chart-title').length) {
-            yAxisChartTitle = $visEl.find('.y-axis-chart-title');
-            titleHeight = yAxisChartTitle.find('.chart-title').height();
-
-            titles = visEl.select('.y-axis-chart-title').selectAll('.chart-title');
-            titles.each(function () {
-              text = d3.select(this)
-              .select('svg')
-              .attr('height', titleHeight)
-              .select('text')
-              .attr('transform', 'translate(11,' + (titleHeight / 2) + ')rotate(-90)');
-            });
-          }
-
-        });
-
-      };
-    };
-
-    /**
-     * Appends div to make .y-axis-spacer-block
-     * match height of .x-axis-wrapper
-     *
-     * @method updateXaxisHeight
-     */
-    XAxis.prototype.updateXaxisHeight = function () {
-      var selection = d3.select(this.el).selectAll('.vis-wrapper');
-
-      selection.each(function () {
-        var visEl = d3.select(this);
-
-        if (visEl.select('.inner-spacer-block').node() === null) {
-          visEl.select('.y-axis-spacer-block')
-          .append('div')
-          .attr('class', 'inner-spacer-block');
-        }
-        var xAxisHt = visEl.select('.x-axis-wrapper').style('height');
-
-        visEl.select('.inner-spacer-block').style('height', xAxisHt);
-      });
-
-    };
-
-    return XAxis;
-  };
-});
diff --git a/src/kibana/components/vislib/lib/y_axis.js b/src/kibana/components/vislib/lib/y_axis.js
deleted file mode 100644
index e62d3b5de2728..0000000000000
--- a/src/kibana/components/vislib/lib/y_axis.js
+++ /dev/null
@@ -1,235 +0,0 @@
-define(function (require) {
-  return function YAxisFactory(d3, Private) {
-    var _ = require('lodash');
-    var $ = require('jquery');
-    var errors = require('errors');
-
-    var ErrorHandler = Private(require('components/vislib/lib/_error_handler'));
-
-    /**
-     * Appends y axis to the visualization
-     *
-     * @class YAxis
-     * @constructor
-     * @param args {{el: (HTMLElement), yMax: (Number), _attr: (Object|*)}}
-     */
-    _.class(YAxis).inherits(ErrorHandler);
-    function YAxis(args) {
-      this.el = args.el;
-      this.scale = null;
-      this.domain = [args.yMin, args.yMax];
-      this.yAxisFormatter = args.yAxisFormatter;
-      this._attr = args._attr || {};
-    }
-
-    /**
-     * Renders the y axis
-     *
-     * @method render
-     * @return {D3.UpdateSelection} Renders y axis to visualization
-     */
-    YAxis.prototype.render = function () {
-      d3.select(this.el).selectAll('.y-axis-div').call(this.draw());
-    };
-
-    YAxis.prototype._isPercentage = function () {
-      return (this._attr.mode === 'percentage');
-    };
-
-    YAxis.prototype._isUserDefined = function () {
-      return (this._attr.setYExtents);
-    };
-
-    YAxis.prototype._isYExtents = function () {
-      return (this._attr.defaultYExtents);
-    };
-
-    YAxis.prototype._validateUserExtents = function (domain) {
-      var self = this;
-
-      return domain.map(function (val) {
-        val = parseInt(val, 10);
-
-        if (isNaN(val)) throw new Error(val + ' is not a valid number');
-        if (self._isPercentage() && self._attr.setYExtents) return val / 100;
-        return val;
-      });
-    };
-
-    YAxis.prototype._getExtents = function (domain) {
-      var min = domain[0];
-      var max = domain[1];
-
-      if (this._isUserDefined()) return this._validateUserExtents(domain);
-      if (this._isYExtents()) return domain;
-      if (this._attr.scale === 'log') return this._logDomain(min, max); // Negative values cannot be displayed with a log scale.
-      if (!this._isYExtents() && !this._isUserDefined()) return [Math.min(0, min), Math.max(0, max)];
-      return domain;
-    };
-
-    YAxis.prototype._throwCustomError = function (message) {
-      throw new Error(message);
-    };
-
-    YAxis.prototype._throwLogScaleValuesError = function () {
-      throw new errors.InvalidLogScaleValues();
-    };
-
-    /**
-     * Returns the appropriate D3 scale
-     *
-     * @param fnName {String} D3 scale
-     * @returns {*}
-     */
-    YAxis.prototype._getScaleType = function (fnName) {
-      if (fnName === 'square root') fnName = 'sqrt'; // Rename 'square root' to 'sqrt'
-      fnName = fnName || 'linear';
-
-      if (typeof d3.scale[fnName] !== 'function') return this._throwCustomError('YAxis.getScaleType: ' + fnName + ' is not a function');
-
-      return d3.scale[fnName]();
-    };
-
-    /**
-     * Return the domain for log scale, i.e. the extent of the log scale.
-     * Log scales must begin at 1 since the log(0) = -Infinity
-     *
-     * @param scale
-     * @param yMin
-     * @param yMax
-     * @returns {*[]}
-     */
-    YAxis.prototype._logDomain = function (min, max) {
-      if (min < 0 || max < 0) return this._throwLogScaleValuesError();
-      return [1, max];
-    };
-
-    /**
-     * Creates the d3 y scale function
-     *
-     * @method getYScale
-     * @param height {Number} DOM Element height
-     * @returns {D3.Scale.QuantitiveScale|*} D3 yScale function
-     */
-    YAxis.prototype.getYScale = function (height) {
-      var scale = this._getScaleType(this._attr.scale);
-      var domain = this._getExtents(this.domain);
-
-      this.yScale = scale
-      .domain(domain)
-      .range([height, 0]);
-
-      if (!this._isUserDefined()) this.yScale.nice(); // round extents when not user defined
-      // Prevents bars from going off the chart when the y extents are within the domain range
-      if (this._attr.type === 'histogram') this.yScale.clamp(true);
-      return this.yScale;
-    };
-
-    YAxis.prototype.getScaleType = function () {
-      return this._attr.scale;
-    };
-
-    YAxis.prototype.tickFormat = function () {
-      var isPercentage = this._attr.mode === 'percentage';
-      if (isPercentage) return d3.format('%');
-      if (this.yAxisFormatter) return this.yAxisFormatter;
-      return d3.format('n');
-    };
-
-    YAxis.prototype._validateYScale = function (yScale) {
-      if (!yScale || _.isNaN(yScale)) throw new Error('yScale is ' + yScale);
-    };
-
-    /**
-     * Creates the d3 y axis function
-     *
-     * @method getYAxis
-     * @param height {Number} DOM Element height
-     * @returns {D3.Svg.Axis|*} D3 yAxis function
-     */
-    YAxis.prototype.getYAxis = function (height) {
-      var yScale = this.getYScale(height);
-      this._validateYScale(yScale);
-
-      // Create the d3 yAxis function
-      this.yAxis = d3.svg.axis()
-        .scale(yScale)
-        .tickFormat(this.tickFormat(this.domain))
-        .ticks(this.tickScale(height))
-        .orient('left');
-
-      return this.yAxis;
-    };
-
-    /**
-     * Create a tick scale for the y axis that modifies the number of ticks
-     * based on the height of the wrapping DOM element
-     * Avoid using even numbers in the yTickScale.range
-     * Causes the top most tickValue in the chart to be missing
-     *
-     * @method tickScale
-     * @param height {Number} DOM element height
-     * @returns {number} Number of y axis ticks
-     */
-    YAxis.prototype.tickScale = function (height) {
-      var yTickScale = d3.scale.linear()
-      .clamp(true)
-      .domain([20, 40, 1000])
-      .range([0, 3, 11]);
-
-      return Math.ceil(yTickScale(height));
-    };
-
-    /**
-     * Renders the y axis to the visualization
-     *
-     * @method draw
-     * @returns {Function} Renders y axis to visualization
-     */
-    YAxis.prototype.draw = function () {
-      var self = this;
-      var margin = this._attr.margin;
-      var mode = this._attr.mode;
-      var isWiggleOrSilhouette = (mode === 'wiggle' || mode === 'silhouette');
-
-      return function (selection) {
-        selection.each(function () {
-          var el = this;
-
-          var div = d3.select(el);
-          var width = $(el).parent().width();
-          var height = $(el).height();
-          var adjustedHeight = height - margin.top - margin.bottom;
-
-          // Validate whether width and height are not 0 or `NaN`
-          self.validateWidthandHeight(width, adjustedHeight);
-
-          var yAxis = self.getYAxis(adjustedHeight);
-
-          // The yAxis should not appear if mode is set to 'wiggle' or 'silhouette'
-          if (!isWiggleOrSilhouette) {
-            // Append svg and y axis
-            var svg = div.append('svg')
-            .attr('width', width)
-            .attr('height', height);
-
-            svg.append('g')
-            .attr('class', 'y axis')
-            .attr('transform', 'translate(' + (width - 2) + ',' + margin.top + ')')
-            .call(yAxis);
-
-            var container = svg.select('g.y.axis').node();
-            if (container) {
-              var cWidth = Math.max(width, container.getBBox().width);
-              svg.attr('width', cWidth);
-              svg.select('g')
-              .attr('transform', 'translate(' + (cWidth - 2) + ',' + margin.top + ')');
-            }
-          }
-        });
-      };
-    };
-
-    return YAxis;
-  };
-});
diff --git a/src/kibana/components/vislib/styles/_layout.less b/src/kibana/components/vislib/styles/_layout.less
deleted file mode 100644
index 7e428891964e9..0000000000000
--- a/src/kibana/components/vislib/styles/_layout.less
+++ /dev/null
@@ -1,173 +0,0 @@
-.visualize-chart {
-  .display(flex);
-  .flex(1 1 100%);
-  min-height: 0;
-  min-width: 0;
-}
-
-.vis-wrapper {
-  .display(flex);
-  .flex(1 1 100%);
-  .flex-direction(row);
-  // margin: 10px 0 0 6px;
-  min-height: 0;
-  min-width: 0;
-  overflow: hidden;
-}
-
-/* YAxis logic */
-.y-axis-col-wrapper {
-  .display(flex);
-  .flex-direction(column);
-  min-height: 0;
-  min-width: 0;
-}
-
-.y-axis-col {
-  .display(flex);
-  .flex-direction(row);
-  .flex(1 0 36px);
-  min-height: 0;
-  min-width: 0;
-}
-
-.y-axis-spacer-block {
-  min-height: 45px;
-}
-
-.y-axis-div-wrapper {
-  .display(flex);
-  .flex-direction(column);
-  min-height: 20px;
-  min-width: 0;
-}
-
-.y-axis-div {
-  .flex(1 1 25px);
-  min-width: 14px;
-  min-height: 14px;
-}
-
-.y-axis-title {
-  min-height: 14px;
-  min-width: 14px;
-}
-
-.y-axis-chart-title {
-  .display(flex);
-  .flex-direction(column);
-  min-height: 14px;
-  min-width: 0;
-  width: 14px;
-}
-
-.y-axis-title text, .x-axis-title text {
-  font-size: 9pt;
-  fill: #848e96;
-  font-weight: bold;
-}
-
-.chart-title {
-  .flex(1 1 100%);
-  min-height: 14px;
-  min-width: 14px;
-}
-
-.chart-title text {
-  font-size: 11px;
-  fill: #848e96;
-}
-
-.vis-col-wrapper {
-  .display(flex);
-  .flex(1 0 20px);
-  .flex-direction(column);
-  min-height: 0;
-  min-width: 0;
-  margin-right: 8px;
-}
-
-.chart-wrapper {
-  .display(flex);
-  .flex(1 0 20px);
-  overflow: visible;
-  margin: 0;
-  min-height: 0;
-  min-width: 0;
-}
-
-.chart-wrapper-column {
-  .display(flex);
-  .flex(1 0 20px);
-  .flex-direction(row);
-  min-height: 0;
-  min-width: 0;
-}
-
-.chart-wrapper-row {
-  .display(flex);
-  .flex-direction(column);
-  .flex(1 1 100%);
-  min-height: 0;
-  min-width: 0;
-}
-
-.chart {
-  .flex(1 1 100%);
-  min-height: 0;
-  min-width: 0;
-
-  > svg {
-    display: block;
-  }
-
-  overflow: visible;
-}
-
-.chart-row {
-  .flex(1 1 auto);
-  min-height: 0;
-  min-width: 0;
-}
-
-.chart-column {
-  .flex(1 1 auto);
-  min-height: 0;
-  min-width: 0;
-}
-
-.x-axis-wrapper {
-  .display(flex);
-  .flex-direction(column);
-  min-height: 45px;
-  min-width: 0;
-  overflow: visible;
-}
-
-.x-axis-div-wrapper {
-  .display(flex);
-  .flex-direction(row);
-  min-height: 20px;
-  min-width: 0;
-}
-
-.x-axis-chart-title {
-  .display(flex);
-  .flex-direction(row);
-  min-height: 15px;
-  max-height: 15px;
-  min-width: 20px;
-}
-
-.x-axis-title {
-  min-height: 15px;
-  max-height: 15px;
-  min-width: 20px;
-  overflow: hidden;
-}
-
-.x-axis-div {
-  margin-top: -5px;
-  min-height: 20px;
-  min-width: 20px;
-}
diff --git a/src/kibana/components/vislib/styles/main.less b/src/kibana/components/vislib/styles/main.less
deleted file mode 100644
index ff8b985b677f2..0000000000000
--- a/src/kibana/components/vislib/styles/main.less
+++ /dev/null
@@ -1,10 +0,0 @@
-@import (reference) "../../../styles/main.less";
-@import (reference) "lesshat.less";
-
-@import "_error";
-@import "_layout";
-@import "_legend";
-@import "_svg";
-@import "_tooltip";
-@import "_tilemap";
-@import "_alerts";
\ No newline at end of file
diff --git a/src/kibana/components/vislib/vis.js b/src/kibana/components/vislib/vis.js
deleted file mode 100644
index ca3194cf82846..0000000000000
--- a/src/kibana/components/vislib/vis.js
+++ /dev/null
@@ -1,177 +0,0 @@
-define(function (require) {
-  return function VisFactory(d3, Private) {
-    var _ = require('lodash');
-
-    var ResizeChecker = Private(require('components/vislib/lib/resize_checker'));
-    var Events = Private(require('factories/events'));
-    var handlerTypes = Private(require('components/vislib/lib/handler/handler_types'));
-    var chartTypes = Private(require('components/vislib/visualizations/vis_types'));
-    var errors = require('errors');
-    require('css!components/vislib/styles/main.css');
-
-    /**
-     * Creates the visualizations.
-     *
-     * @class Vis
-     * @constructor
-     * @param $el {HTMLElement} jQuery selected HTML element
-     * @param config {Object} Parameters that define the chart type and chart options
-     */
-    _.class(Vis).inherits(Events);
-    function Vis($el, config) {
-      if (!(this instanceof Vis)) {
-        return new Vis($el, config);
-      }
-      Vis.Super.apply(this, arguments);
-      this.el = $el.get ? $el.get(0) : $el;
-      this.ChartClass = chartTypes[config.type];
-      this._attr = _.defaults({}, config || {}, {});
-
-      // bind the resize function so it can be used as an event handler
-      this.resize = _.bind(this.resize, this);
-      this.resizeChecker = new ResizeChecker(this.el);
-      this.resizeChecker.on('resize', this.resize);
-    }
-
-    /**
-     * Renders the visualization
-     *
-     * @method render
-     * @param data {Object} Elasticsearch query results
-     */
-    Vis.prototype.render = function (data) {
-      var chartType = this._attr.type;
-
-      if (!data) {
-        throw new Error('No valid data!');
-      }
-
-      if (this.handler) {
-        this.data = null;
-        this._runOnHandler('destroy');
-      }
-
-      this.data = data;
-      this.handler = handlerTypes[chartType](this) || handlerTypes.column(this);
-      this._runOnHandler('render');
-    };
-
-    /**
-     * Resizes the visualization
-     *
-     * @method resize
-     */
-    Vis.prototype.resize = function () {
-      if (!this.data) {
-        // TODO: need to come up with a solution for resizing when no data is available
-        return;
-      }
-
-      if (this.handler && _.isFunction(this.handler.resize)) {
-        this._runOnHandler('resize');
-      } else {
-        this.render(this.data);
-      }
-    };
-
-    Vis.prototype._runOnHandler = function (method) {
-      try {
-        this.handler[method]();
-      } catch (error) {
-        // If involving height and width of the container, log error to screen.
-        // Because we have to wait for the DOM element to initialize, we do not
-        // want to throw an error when the DOM `el` is zero
-        if (error instanceof errors.ContainerTooSmall ||
-          error instanceof errors.InvalidWiggleSelection ||
-          error instanceof errors.InvalidLogScaleValues ||
-          error instanceof errors.PieContainsAllZeros ||
-          error instanceof errors.NotEnoughData ||
-          error instanceof errors.NoResults) {
-          this.handler.error(error.message);
-        } else {
-          throw error;
-        }
-      }
-    };
-
-    /**
-     * Destroys the visualization
-     * Removes chart and all elements associated with it.
-     * Removes chart and all elements associated with it.
-     * Remove event listeners and pass destroy call down to owned objects.
-     *
-     * @method destroy
-     */
-    Vis.prototype.destroy = function () {
-      var selection = d3.select(this.el).select('.vis-wrapper');
-
-      this.resizeChecker.off('resize', this.resize);
-      this.resizeChecker.destroy();
-      if (this.handler) this._runOnHandler('destroy');
-
-      selection.remove();
-      selection = null;
-    };
-
-    /**
-     * Sets attributes on the visualization
-     *
-     * @method set
-     * @param name {String} An attribute name
-     * @param val {*} Value to which the attribute name is set
-     */
-    Vis.prototype.set = function (name, val) {
-      this._attr[name] = val;
-      this.render(this.data);
-    };
-
-    /**
-     * Gets attributes from the visualization
-     *
-     * @method get
-     * @param name {String} An attribute name
-     * @returns {*} The value of the attribute name
-     */
-    Vis.prototype.get = function (name) {
-      return this._attr[name];
-    };
-
-    /**
-     * Turns on event listeners.
-     *
-     * @param event {String}
-     * @param listener{Function}
-     * @returns {*}
-     */
-    Vis.prototype.on = function (event, listener) {
-      var first = this.listenerCount(event) === 0;
-      var ret = Events.prototype.on.call(this, event, listener);
-      var added = this.listenerCount(event) > 0;
-
-      // if this is the first listener added for the event
-      // enable the event in the handler
-      if (first && added && this.handler) this.handler.enable(event);
-
-      return ret;
-    };
-
-    /**
-     * Turns off event listeners.
-     *
-     * @param event {String}
-     * @param listener{Function}
-     * @returns {*}
-     */
-    Vis.prototype.off = function (event, listener) {
-      var last = this.listenerCount(event) === 1;
-      var ret = Events.prototype.off.call(this, event, listener);
-      var removed = this.listenerCount(event) === 0;
-
-      // Once all listeners are removed, disable the events in the handler
-      if (last && removed && this.handler) this.handler.disable(event);
-      return ret;
-    };
-
-    return Vis;
-  };
-});
diff --git a/src/kibana/components/vislib/visualizations/area_chart.js b/src/kibana/components/vislib/visualizations/area_chart.js
deleted file mode 100644
index 1883367005ddd..0000000000000
--- a/src/kibana/components/vislib/visualizations/area_chart.js
+++ /dev/null
@@ -1,364 +0,0 @@
-define(function (require) {
-  return function AreaChartFactory(d3, Private) {
-    var _ = require('lodash');
-    var $ = require('jquery');
-
-    var PointSeriesChart = Private(require('components/vislib/visualizations/_point_series_chart'));
-    var TimeMarker = Private(require('components/vislib/visualizations/time_marker'));
-    var errors = require('errors');
-    require('css!components/vislib/styles/main');
-
-    /**
-     * Area chart visualization
-     *
-     * @class AreaChart
-     * @constructor
-     * @extends Chart
-     * @param handler {Object} Reference to the Handler Class Constructor
-     * @param el {HTMLElement} HTML element to which the chart will be appended
-     * @param chartData {Object} Elasticsearch query results for this specific
-     * chart
-     */
-    _.class(AreaChart).inherits(PointSeriesChart);
-    function AreaChart(handler, chartEl, chartData) {
-      if (!(this instanceof AreaChart)) {
-        return new AreaChart(handler, chartEl, chartData);
-      }
-
-      AreaChart.Super.apply(this, arguments);
-
-      this.isOverlapping = (handler._attr.mode === 'overlap');
-
-      if (this.isOverlapping) {
-
-        // Default opacity should return to 0.6 on mouseout
-        handler._attr.defaultOpacity = 0.6;
-      }
-
-      this.checkIfEnoughData();
-
-      this._attr = _.defaults(handler._attr || {}, {
-        xValue: function (d) { return d.x; },
-        yValue: function (d) { return d.y; }
-      });
-    }
-
-    /**
-     * Adds SVG path to area chart
-     *
-     * @method addPath
-     * @param svg {HTMLElement} SVG to which rect are appended
-     * @param layers {Array} Chart data array
-     * @returns {D3.UpdateSelection} SVG with path added
-     */
-    AreaChart.prototype.addPath = function (svg, layers) {
-      var self = this;
-      var ordered = this.handler.data.get('ordered');
-      var isTimeSeries = (ordered && ordered.date);
-      var isOverlapping = this.isOverlapping;
-      var color = this.handler.data.getColorFunc();
-      var xScale = this.handler.xAxis.xScale;
-      var yScale = this.handler.yAxis.yScale;
-      var interpolate = (this._attr.smoothLines) ? 'cardinal' : this._attr.interpolate;
-      var area = d3.svg.area()
-      .x(function (d) {
-        if (isTimeSeries) {
-          return xScale(d.x);
-        }
-        return xScale(d.x) + xScale.rangeBand() / 2;
-      })
-      .y0(function (d) {
-        if (isOverlapping) {
-          return yScale(0);
-        }
-
-        return yScale(d.y0);
-      })
-      .y1(function (d) {
-        if (isOverlapping) {
-          return yScale(d.y);
-        }
-
-        return yScale(d.y0 + d.y);
-      })
-      .defined(function (d) { return !_.isNull(d.y); })
-      .interpolate(interpolate);
-
-      // Data layers
-      var layer = svg.selectAll('.layer')
-      .data(layers)
-      .enter()
-      .append('g')
-      .attr('class', function (d, i) {
-        return 'pathgroup ' + i;
-      });
-
-      // Append path
-      var path = layer.append('path')
-      .call(this._addIdentifier)
-      .style('fill', function (d) {
-        return color(d[0].label);
-      })
-      .classed('overlap_area', function () {
-        return isOverlapping;
-      });
-
-      // update
-      path.attr('d', function (d) {
-        return area(d);
-      });
-
-      return path;
-    };
-
-    /**
-     * Adds Events to SVG circles
-     *
-     * @method addCircleEvents
-     * @param element {D3.UpdateSelection} SVG circles
-     * @returns {D3.Selection} circles with event listeners attached
-     */
-    AreaChart.prototype.addCircleEvents = function (element, svg) {
-      var events = this.events;
-      var isBrushable = events.isBrushable();
-      var brush = isBrushable ? events.addBrushEvent(svg) : undefined;
-      var hover = events.addHoverEvent();
-      var mouseout = events.addMouseoutEvent();
-      var click = events.addClickEvent();
-      var attachedEvents = element.call(hover).call(mouseout).call(click);
-
-      if (isBrushable) {
-        attachedEvents.call(brush);
-      }
-
-      return attachedEvents;
-    };
-
-    /**
-     * Adds SVG circles to area chart
-     *
-     * @method addCircles
-     * @param svg {HTMLElement} SVG to which circles are appended
-     * @param data {Array} Chart data array
-     * @returns {D3.UpdateSelection} SVG with circles added
-     */
-    AreaChart.prototype.addCircles = function (svg, data) {
-      var self = this;
-      var color = this.handler.data.getColorFunc();
-      var xScale = this.handler.xAxis.xScale;
-      var yScale = this.handler.yAxis.yScale;
-      var ordered = this.handler.data.get('ordered');
-      var circleRadius = 12;
-      var circleStrokeWidth = 0;
-      var tooltip = this.tooltip;
-      var isTooltip = this._attr.addTooltip;
-      var isOverlapping = this.isOverlapping;
-      var layer;
-      var circles;
-
-      layer = svg.selectAll('.points')
-      .data(data)
-      .enter()
-        .append('g')
-        .attr('class', 'points area');
-
-      // append the circles
-      circles = layer
-      .selectAll('circles')
-      .data(function appendData(data) {
-        return data.filter(function isZeroOrNull(d) {
-          return d.y !== 0 && !_.isNull(d.y);
-        });
-      });
-
-      // exit
-      circles.exit().remove();
-
-      // enter
-      circles
-      .enter()
-      .append('circle')
-      .call(this._addIdentifier)
-      .attr('stroke', function strokeColor(d) {
-        return color(d.label);
-      })
-      .attr('fill', 'transparent')
-      .attr('stroke-width', circleStrokeWidth);
-
-      // update
-      circles
-      .attr('cx', function cx(d) {
-        if (ordered && ordered.date) {
-          return xScale(d.x);
-        }
-        return xScale(d.x) + xScale.rangeBand() / 2;
-      })
-      .attr('cy', function cy(d) {
-        if (isOverlapping) {
-          return yScale(d.y);
-        }
-        return yScale(d.y0 + d.y);
-      })
-      .attr('r', circleRadius);
-
-      // Add tooltip
-      if (isTooltip) {
-        circles.call(tooltip.render());
-      }
-
-      return circles;
-    };
-
-    /**
-     * Adds SVG clipPath
-     *
-     * @method addClipPath
-     * @param svg {HTMLElement} SVG to which clipPath is appended
-     * @param width {Number} SVG width
-     * @param height {Number} SVG height
-     * @returns {D3.UpdateSelection} SVG with clipPath added
-     */
-    AreaChart.prototype.addClipPath = function (svg, width, height) {
-      // Prevents circles from being clipped at the top of the chart
-      var startX = 0;
-      var startY = 0;
-      var id = 'chart-area' + _.uniqueId();
-
-      // Creating clipPath
-      return svg
-      .attr('clip-path', 'url(#' + id + ')')
-      .append('clipPath')
-      .attr('id', id)
-      .append('rect')
-      .attr('x', startX)
-      .attr('y', startY)
-      .attr('width', width)
-      .attr('height', height);
-    };
-
-    AreaChart.prototype.checkIfEnoughData = function () {
-      var series = this.chartData.series;
-      var message = 'Area charts require more than one data point. Try adding ' +
-        'an X-Axis Aggregation';
-
-      var notEnoughData = series.some(function (obj) {
-        return obj.values.length < 2;
-      });
-
-      if (notEnoughData) {
-        throw new errors.NotEnoughData(message);
-      }
-    };
-
-    AreaChart.prototype.validateWiggleSelection = function () {
-      var isWiggle = this._attr.mode === 'wiggle';
-      var ordered = this.handler.data.get('ordered');
-
-      if (isWiggle && !ordered) throw new errors.InvalidWiggleSelection();
-    };
-
-    /**
-     * Renders d3 visualization
-     *
-     * @method draw
-     * @returns {Function} Creates the area chart
-     */
-    AreaChart.prototype.draw = function () {
-      // Attributes
-      var self = this;
-      var xScale = this.handler.xAxis.xScale;
-      var $elem = $(this.chartEl);
-      var margin = this._attr.margin;
-      var elWidth = this._attr.width = $elem.width();
-      var elHeight = this._attr.height = $elem.height();
-      var yMin = this.handler.yAxis.yMin;
-      var yScale = this.handler.yAxis.yScale;
-      var minWidth = 20;
-      var minHeight = 20;
-      var addTimeMarker = this._attr.addTimeMarker;
-      var times = this._attr.times || [];
-      var timeMarker;
-      var div;
-      var svg;
-      var width;
-      var height;
-      var layers;
-      var circles;
-      var path;
-
-      return function (selection) {
-        selection.each(function (data) {
-          // Stack data
-          layers = self.stackData(data);
-
-          // Get the width and height
-          width = elWidth;
-          height = elHeight - margin.top - margin.bottom;
-
-          if (addTimeMarker) {
-            timeMarker = new TimeMarker(times, xScale, height);
-          }
-
-          if (width < minWidth || height < minHeight) {
-            throw new errors.ContainerTooSmall();
-          }
-          self.validateWiggleSelection();
-
-          // Select the current DOM element
-          div = d3.select(this);
-
-          // Create the canvas for the visualization
-          svg = div.append('svg')
-          .attr('width', width)
-          .attr('height', height + margin.top + margin.bottom)
-          .append('g')
-          .attr('transform', 'translate(0,' + margin.top + ')');
-
-          // add clipPath to hide circles when they go out of bounds
-          self.addClipPath(svg, width, height);
-          self.createEndZones(svg);
-
-          // add path
-          path = self.addPath(svg, layers);
-
-          if (yMin < 0 && self._attr.mode !== 'wiggle' && self._attr.mode !== 'silhouette') {
-
-            // Draw line at yScale 0 value
-            svg.append('line')
-              .attr('class', 'zero-line')
-              .attr('x1', 0)
-              .attr('y1', yScale(0))
-              .attr('x2', width)
-              .attr('y2', yScale(0))
-              .style('stroke', '#ddd')
-              .style('stroke-width', 1);
-          }
-
-          // add circles
-          circles = self.addCircles(svg, layers);
-
-          // add click and hover events to circles
-          self.addCircleEvents(circles, svg);
-
-          // chart base line
-          var line = svg.append('line')
-          .attr('class', 'base-line')
-          .attr('x1', 0)
-          .attr('y1', yScale(0))
-          .attr('x2', width)
-          .attr('y2', yScale(0))
-          .style('stroke', '#ddd')
-          .style('stroke-width', 1);
-
-          if (addTimeMarker) {
-            timeMarker.render(svg);
-          }
-
-          return svg;
-        });
-      };
-    };
-
-    return AreaChart;
-  };
-});
diff --git a/src/kibana/components/vislib/visualizations/column_chart.js b/src/kibana/components/vislib/visualizations/column_chart.js
deleted file mode 100644
index 59a71fb605ebf..0000000000000
--- a/src/kibana/components/vislib/visualizations/column_chart.js
+++ /dev/null
@@ -1,328 +0,0 @@
-define(function (require) {
-  return function ColumnChartFactory(d3, Private) {
-    var _ = require('lodash');
-    var $ = require('jquery');
-    var moment = require('moment');
-
-    var DataClass = Private(require('components/vislib/lib/data'));
-
-    var PointSeriesChart = Private(require('components/vislib/visualizations/_point_series_chart'));
-    var TimeMarker = Private(require('components/vislib/visualizations/time_marker'));
-    var errors = require('errors');
-    require('css!components/vislib/styles/main');
-
-    /**
-     * Vertical Bar Chart Visualization: renders vertical and/or stacked bars
-     *
-     * @class ColumnChart
-     * @constructor
-     * @extends Chart
-     * @param handler {Object} Reference to the Handler Class Constructor
-     * @param el {HTMLElement} HTML element to which the chart will be appended
-     * @param chartData {Object} Elasticsearch query results for this specific chart
-     */
-    _.class(ColumnChart).inherits(PointSeriesChart);
-    function ColumnChart(handler, chartEl, chartData) {
-      if (!(this instanceof ColumnChart)) {
-        return new ColumnChart(handler, chartEl, chartData);
-      }
-
-      ColumnChart.Super.apply(this, arguments);
-
-      // Column chart specific attributes
-      this._attr = _.defaults(handler._attr || {}, {
-        xValue: function (d) { return d.x; },
-        yValue: function (d) { return d.y; }
-      });
-    }
-
-    /**
-     * Adds SVG rect to Vertical Bar Chart
-     *
-     * @method addBars
-     * @param svg {HTMLElement} SVG to which rect are appended
-     * @param layers {Array} Chart data array
-     * @returns {D3.UpdateSelection} SVG with rect added
-     */
-    ColumnChart.prototype.addBars = function (svg, layers) {
-      var self = this;
-      var color = this.handler.data.getColorFunc();
-      var tooltip = this.tooltip;
-      var isTooltip = this._attr.addTooltip;
-      var layer;
-      var bars;
-
-      layer = svg.selectAll('.layer')
-      .data(layers)
-      .enter().append('g')
-      .attr('class', function (d, i) {
-        return 'series ' + i;
-      });
-
-      bars = layer.selectAll('rect')
-      .data(function (d) {
-        return d;
-      });
-
-      bars
-      .exit()
-      .remove();
-
-      bars
-      .enter()
-      .append('rect')
-      .call(this._addIdentifier)
-      .attr('fill', function (d) {
-        return color(d.label);
-      });
-
-      self.updateBars(bars);
-
-      // Add tooltip
-      if (isTooltip) {
-        bars.call(tooltip.render());
-      }
-
-      return bars;
-    };
-
-    /**
-     * Determines whether bars are grouped or stacked and updates the D3
-     * selection
-     *
-     * @method updateBars
-     * @param bars {D3.UpdateSelection} SVG with rect added
-     * @returns {D3.UpdateSelection}
-     */
-    ColumnChart.prototype.updateBars = function (bars) {
-      var offset = this._attr.mode;
-
-      if (offset === 'grouped') {
-        return this.addGroupedBars(bars);
-      }
-      return this.addStackedBars(bars);
-    };
-
-    /**
-     * Adds stacked bars to column chart visualization
-     *
-     * @method addStackedBars
-     * @param bars {D3.UpdateSelection} SVG with rect added
-     * @returns {D3.UpdateSelection}
-     */
-    ColumnChart.prototype.addStackedBars = function (bars) {
-      var data = this.chartData;
-      var xScale = this.handler.xAxis.xScale;
-      var yScale = this.handler.yAxis.yScale;
-      var height = yScale.range()[0];
-      var yMin = this.handler.yAxis.yScale.domain()[0];
-      var self = this;
-
-      var barWidth;
-      if (data.ordered && data.ordered.date) {
-        var start = data.ordered.min;
-        var end = moment(data.ordered.min).add(data.ordered.interval).valueOf();
-
-        barWidth = xScale(end) - xScale(start);
-        barWidth = barWidth - Math.min(barWidth * 0.25, 15);
-      }
-
-      // update
-      bars
-      .attr('x', function (d) {
-        return xScale(d.x);
-      })
-      .attr('width', function () {
-        return barWidth || xScale.rangeBand();
-      })
-      .attr('y', function (d) {
-        if (d.y < 0) {
-          return yScale(d.y0);
-        }
-
-        return yScale(d.y0 + d.y);
-      })
-      .attr('height', function (d) {
-        if (d.y < 0) {
-          return Math.abs(yScale(d.y0 + d.y) - yScale(d.y0));
-        }
-
-        // Due to an issue with D3 not returning zeros correctly when using
-        // an offset='expand', need to add conditional statement to handle zeros
-        // appropriately
-        if (d._input.y === 0) {
-          return 0;
-        }
-
-        // for split bars or for one series,
-        // last series will have d.y0 = 0
-        if (d.y0 === 0 && yMin > 0) {
-          return yScale(yMin) - yScale(d.y);
-        }
-
-        return yScale(d.y0) - yScale(d.y0 + d.y);
-      });
-
-      return bars;
-    };
-
-    /**
-     * Adds grouped bars to column chart visualization
-     *
-     * @method addGroupedBars
-     * @param bars {D3.UpdateSelection} SVG with rect added
-     * @returns {D3.UpdateSelection}
-     */
-    ColumnChart.prototype.addGroupedBars = function (bars) {
-      var xScale = this.handler.xAxis.xScale;
-      var yScale = this.handler.yAxis.yScale;
-      var yMin = this.handler.yAxis.yMin;
-      var data = this.chartData;
-      var n = data.series.length;
-      var height = yScale.range()[0];
-      var groupSpacingPercentage = 0.15;
-      var isTimeScale = (data.ordered && data.ordered.date);
-      var minWidth = 1;
-      var barWidth;
-
-      // update
-      bars
-      .attr('x', function (d, i, j) {
-        if (isTimeScale) {
-          var groupWidth = xScale(data.ordered.min + data.ordered.interval) -
-            xScale(data.ordered.min);
-          var groupSpacing = groupWidth * groupSpacingPercentage;
-
-          barWidth = (groupWidth - groupSpacing) / n;
-
-          return xScale(d.x) + barWidth * j;
-        }
-        return xScale(d.x) + xScale.rangeBand() / n * j;
-      })
-      .attr('width', function () {
-        if (barWidth < minWidth) {
-          throw new errors.ContainerTooSmall();
-        }
-
-        if (isTimeScale) {
-          return barWidth;
-        }
-        return xScale.rangeBand() / n;
-      })
-      .attr('y', function (d) {
-        if (d.y < 0) {
-          return yScale(0);
-        }
-
-        return yScale(d.y);
-      })
-      .attr('height', function (d) {
-        return Math.abs(yScale(0) - yScale(d.y));
-      });
-
-      return bars;
-    };
-
-    /**
-     * Adds Events to SVG rect
-     * Visualization is only brushable when a brush event is added
-     * If a brush event is added, then a function should be returned.
-     *
-     * @method addBarEvents
-     * @param element {D3.UpdateSelection} target
-     * @param svg {D3.UpdateSelection} chart SVG
-     * @returns {D3.Selection} rect with event listeners attached
-     */
-    ColumnChart.prototype.addBarEvents = function (element, svg) {
-      var events = this.events;
-      var isBrushable = events.isBrushable();
-      var brush = isBrushable ? events.addBrushEvent(svg) : undefined;
-      var hover = events.addHoverEvent();
-      var mouseout = events.addMouseoutEvent();
-      var click = events.addClickEvent();
-      var attachedEvents = element.call(hover).call(mouseout).call(click);
-
-      if (isBrushable) {
-        attachedEvents.call(brush);
-      }
-
-      return attachedEvents;
-    };
-
-    /**
-     * Renders d3 visualization
-     *
-     * @method draw
-     * @returns {Function} Creates the vertical bar chart
-     */
-    ColumnChart.prototype.draw = function () {
-      var self = this;
-      var $elem = $(this.chartEl);
-      var margin = this._attr.margin;
-      var elWidth = this._attr.width = $elem.width();
-      var elHeight = this._attr.height = $elem.height();
-      var yMin = this.handler.yAxis.yMin;
-      var yScale = this.handler.yAxis.yScale;
-      var xScale = this.handler.xAxis.xScale;
-      var minWidth = 20;
-      var minHeight = 20;
-      var addTimeMarker = this._attr.addTimeMarker;
-      var times = this._attr.times || [];
-      var timeMarker;
-      var div;
-      var svg;
-      var width;
-      var height;
-      var layers;
-      var bars;
-
-      return function (selection) {
-        selection.each(function (data) {
-          layers = self.stackData(data);
-
-          width = elWidth;
-          height = elHeight - margin.top - margin.bottom;
-
-          if (addTimeMarker) {
-            timeMarker = new TimeMarker(times, xScale, height);
-          }
-
-          if (width < minWidth || height < minHeight) {
-            throw new errors.ContainerTooSmall();
-          }
-
-          div = d3.select(this);
-
-          svg = div.append('svg')
-          .attr('width', width)
-          .attr('height', height + margin.top + margin.bottom)
-          .append('g')
-          .attr('transform', 'translate(0,' + margin.top + ')');
-
-          bars = self.addBars(svg, layers);
-          self.createEndZones(svg);
-
-          // Adds event listeners
-          self.addBarEvents(bars, svg);
-
-          var line = svg.append('line')
-          .attr('class', 'base-line')
-          .attr('x1', 0)
-          .attr('y1', yScale(0))
-          .attr('x2', width)
-          .attr('y2', yScale(0))
-          .style('stroke', '#ddd')
-          .style('stroke-width', 1);
-
-          if (addTimeMarker) {
-            timeMarker.render(svg);
-          }
-
-          return svg;
-        });
-      };
-    };
-
-    return ColumnChart;
-  };
-});
diff --git a/src/kibana/components/vislib/visualizations/line_chart.js b/src/kibana/components/vislib/visualizations/line_chart.js
deleted file mode 100644
index f66d7251624f5..0000000000000
--- a/src/kibana/components/vislib/visualizations/line_chart.js
+++ /dev/null
@@ -1,357 +0,0 @@
-define(function (require) {
-  return function LineChartFactory(d3, Private) {
-    var _ = require('lodash');
-    var $ = require('jquery');
-    var errors = require('errors');
-
-    var PointSeriesChart = Private(require('components/vislib/visualizations/_point_series_chart'));
-    var TimeMarker = Private(require('components/vislib/visualizations/time_marker'));
-    require('css!components/vislib/styles/main');
-
-    /**
-     * Line Chart Visualization
-     *
-     * @class LineChart
-     * @constructor
-     * @extends Chart
-     * @param handler {Object} Reference to the Handler Class Constructor
-     * @param el {HTMLElement} HTML element to which the chart will be appended
-     * @param chartData {Object} Elasticsearch query results for this specific chart
-     */
-    _.class(LineChart).inherits(PointSeriesChart);
-    function LineChart(handler, chartEl, chartData) {
-      if (!(this instanceof LineChart)) {
-        return new LineChart(handler, chartEl, chartData);
-      }
-
-      LineChart.Super.apply(this, arguments);
-
-      // Line chart specific attributes
-      this._attr = _.defaults(handler._attr || {}, {
-        interpolate: 'linear',
-        xValue: function (d) { return d.x; },
-        yValue: function (d) { return d.y; }
-      });
-    }
-
-    /**
-     * Adds Events to SVG circle
-     *
-     * @method addCircleEvents
-     * @param element{D3.UpdateSelection} Reference to SVG circle
-     * @returns {D3.Selection} SVG circles with event listeners attached
-     */
-    LineChart.prototype.addCircleEvents = function (element, svg) {
-      var events = this.events;
-      var isBrushable = events.isBrushable();
-      var brush = isBrushable ? events.addBrushEvent(svg) : undefined;
-      var hover = events.addHoverEvent();
-      var mouseout = events.addMouseoutEvent();
-      var click = events.addClickEvent();
-      var attachedEvents = element.call(hover).call(mouseout).call(click);
-
-      if (isBrushable) {
-        attachedEvents.call(brush);
-      }
-
-      return attachedEvents;
-    };
-
-    /**
-     * Adds circles to SVG
-     *
-     * @method addCircles
-     * @param svg {HTMLElement} SVG to which rect are appended
-     * @param data {Array} Array of object data points
-     * @returns {D3.UpdateSelection} SVG with circles added
-     */
-    LineChart.prototype.addCircles = function (svg, data) {
-      var self = this;
-      var showCircles = this._attr.showCircles;
-      var color = this.handler.data.getColorFunc();
-      var xScale = this.handler.xAxis.xScale;
-      var yScale = this.handler.yAxis.yScale;
-      var ordered = this.handler.data.get('ordered');
-      var tooltip = this.tooltip;
-      var isTooltip = this._attr.addTooltip;
-
-      var radii = _(data)
-      .map(function (series) {
-        return _.pluck(series, '_input.z');
-      })
-      .flattenDeep()
-      .reduce(function (result, val) {
-        if (result.min > val) result.min = val;
-        if (result.max < val) result.max = val;
-        return result;
-      }, {
-        min: Infinity,
-        max: -Infinity
-      });
-
-      var radiusStep = ((radii.max - radii.min) || (radii.max * 100)) / Math.pow(this._attr.radiusRatio, 2);
-
-      var layer = svg.selectAll('.points')
-      .data(data)
-      .enter()
-        .append('g')
-        .attr('class', 'points line');
-
-      var circles = layer
-      .selectAll('circle')
-      .data(function appendData(data) {
-        return data.filter(function (d) {
-          return !_.isNull(d.y);
-        });
-      });
-
-      circles
-      .exit()
-      .remove();
-
-      function cx(d) {
-        if (ordered && ordered.date) {
-          return xScale(d.x);
-        }
-        return xScale(d.x) + xScale.rangeBand() / 2;
-      }
-
-      function cy(d) {
-        return yScale(d.y);
-      }
-
-      function cColor(d) {
-        return color(d.label);
-      }
-
-      function colorCircle(d) {
-        var parent = d3.select(this).node().parentNode;
-        var lengthOfParent = d3.select(parent).data()[0].length;
-        var isVisible = (lengthOfParent === 1);
-
-        // If only 1 point exists, show circle
-        if (!showCircles && !isVisible) return 'none';
-        return cColor(d);
-      }
-      function getCircleRadiusFn(modifier) {
-        return function getCircleRadius(d) {
-          var margin = self._attr.margin;
-          var width = self._attr.width - margin.left - margin.right;
-          var height = self._attr.height - margin.top - margin.bottom;
-          var circleRadius = (d._input.z - radii.min) / radiusStep;
-
-          return _.min([Math.sqrt((circleRadius || 2) + 2), width, height]) + (modifier || 0);
-        };
-      }
-
-
-      circles
-      .enter()
-        .append('circle')
-        .attr('r', getCircleRadiusFn())
-        .attr('fill-opacity', (this._attr.drawLinesBetweenPoints ? 1 : 0.7))
-        .attr('cx', cx)
-        .attr('cy', cy)
-        .attr('class', 'circle-decoration')
-        .call(this._addIdentifier)
-        .attr('fill', colorCircle);
-
-      circles
-      .enter()
-        .append('circle')
-        .attr('r', getCircleRadiusFn(10))
-        .attr('cx', cx)
-        .attr('cy', cy)
-        .attr('fill', 'transparent')
-        .attr('class', 'circle')
-        .call(this._addIdentifier)
-        .attr('stroke', cColor)
-        .attr('stroke-width', 0);
-
-      if (isTooltip) {
-        circles.call(tooltip.render());
-      }
-
-      return circles;
-    };
-
-    /**
-     * Adds path to SVG
-     *
-     * @method addLines
-     * @param svg {HTMLElement} SVG to which path are appended
-     * @param data {Array} Array of object data points
-     * @returns {D3.UpdateSelection} SVG with paths added
-     */
-    LineChart.prototype.addLines = function (svg, data) {
-      var self = this;
-      var xScale = this.handler.xAxis.xScale;
-      var yScale = this.handler.yAxis.yScale;
-      var xAxisFormatter = this.handler.data.get('xAxisFormatter');
-      var color = this.handler.data.getColorFunc();
-      var ordered = this.handler.data.get('ordered');
-      var interpolate = (this._attr.smoothLines) ? 'cardinal' : this._attr.interpolate;
-      var line = d3.svg.line()
-      .defined(function (d) { return !_.isNull(d.y); })
-      .interpolate(interpolate)
-      .x(function x(d) {
-        if (ordered && ordered.date) {
-          return xScale(d.x);
-        }
-        return xScale(d.x) + xScale.rangeBand() / 2;
-      })
-      .y(function y(d) {
-        return yScale(d.y);
-      });
-      var lines;
-
-      lines = svg
-      .selectAll('.lines')
-      .data(data)
-      .enter()
-        .append('g')
-        .attr('class', 'pathgroup lines');
-
-      lines.append('path')
-      .call(this._addIdentifier)
-      .attr('d', function lineD(d) {
-        return line(d.values);
-      })
-      .attr('fill', 'none')
-      .attr('stroke', function lineStroke(d) {
-        return color(d.label);
-      })
-      .attr('stroke-width', 2);
-
-      return lines;
-    };
-
-    /**
-     * Adds SVG clipPath
-     *
-     * @method addClipPath
-     * @param svg {HTMLElement} SVG to which clipPath is appended
-     * @param width {Number} SVG width
-     * @param height {Number} SVG height
-     * @returns {D3.UpdateSelection} SVG with clipPath added
-     */
-    LineChart.prototype.addClipPath = function (svg, width, height) {
-      var clipPathBuffer = 5;
-      var startX = 0;
-      var startY = 0 - clipPathBuffer;
-      var id = 'chart-area' + _.uniqueId();
-
-      return svg
-      .attr('clip-path', 'url(#' + id + ')')
-      .append('clipPath')
-      .attr('id', id)
-      .append('rect')
-      .attr('x', startX)
-      .attr('y', startY)
-      .attr('width', width)
-      // Adding clipPathBuffer to height so it doesn't
-      // cutoff the lower part of the chart
-      .attr('height', height + clipPathBuffer);
-    };
-
-    /**
-     * Renders d3 visualization
-     *
-     * @method draw
-     * @returns {Function} Creates the line chart
-     */
-    LineChart.prototype.draw = function () {
-      var self = this;
-      var $elem = $(this.chartEl);
-      var margin = this._attr.margin;
-      var elWidth = this._attr.width = $elem.width();
-      var elHeight = this._attr.height = $elem.height();
-      var scaleType = this.handler.yAxis.getScaleType();
-      var yMin = this.handler.yAxis.yMin;
-      var yScale = this.handler.yAxis.yScale;
-      var xScale = this.handler.xAxis.xScale;
-      var minWidth = 20;
-      var minHeight = 20;
-      var startLineX = 0;
-      var lineStrokeWidth = 1;
-      var addTimeMarker = this._attr.addTimeMarker;
-      var times = this._attr.times || [];
-      var timeMarker;
-      var div;
-      var svg;
-      var width;
-      var height;
-      var lines;
-      var circles;
-
-      return function (selection) {
-        selection.each(function (data) {
-          var el = this;
-
-          var layers = data.series.map(function mapSeries(d) {
-            var label = d.label;
-            return d.values.map(function mapValues(e, i) {
-              return {
-                _input: e,
-                label: label,
-                x: self._attr.xValue.call(d.values, e, i),
-                y: self._attr.yValue.call(d.values, e, i)
-              };
-            });
-          });
-
-          width = elWidth - margin.left - margin.right;
-          height = elHeight - margin.top - margin.bottom;
-
-          if (addTimeMarker) {
-            timeMarker = new TimeMarker(times, xScale, height);
-          }
-
-          if (self._attr.scale === 'log' && self._invalidLogScaleValues(data)) {
-            throw new errors.InvalidLogScaleValues();
-          }
-
-          if (width < minWidth || height < minHeight) {
-            throw new errors.ContainerTooSmall();
-          }
-
-          div = d3.select(el);
-
-          svg = div.append('svg')
-          .attr('width', width + margin.left + margin.right)
-          .attr('height', height + margin.top + margin.bottom)
-          .append('g')
-          .attr('transform', 'translate(' + margin.left + ',' + margin.top + ')');
-
-          self.addClipPath(svg, width, height);
-          if (self._attr.drawLinesBetweenPoints) {
-            lines = self.addLines(svg, data.series);
-          }
-          circles = self.addCircles(svg, layers);
-          self.addCircleEvents(circles, svg);
-          self.createEndZones(svg);
-
-          var scale = (scaleType === 'log') ? yScale(1) : yScale(0);
-          if (scale) {
-            svg.append('line')
-            .attr('class', 'base-line')
-            .attr('x1', startLineX)
-            .attr('y1', scale)
-            .attr('x2', width)
-            .attr('y2', scale)
-            .style('stroke', '#ddd')
-            .style('stroke-width', lineStrokeWidth);
-          }
-
-          if (addTimeMarker) {
-            timeMarker.render(svg);
-          }
-
-          return svg;
-        });
-      };
-    };
-
-    return LineChart;
-  };
-});
diff --git a/src/kibana/components/vislib/visualizations/pie_chart.js b/src/kibana/components/vislib/visualizations/pie_chart.js
deleted file mode 100644
index ce4ff70672dc6..0000000000000
--- a/src/kibana/components/vislib/visualizations/pie_chart.js
+++ /dev/null
@@ -1,210 +0,0 @@
-define(function (require) {
-  return function PieChartFactory(d3, Private) {
-    var _ = require('lodash');
-    var $ = require('jquery');
-
-    var Chart = Private(require('components/vislib/visualizations/_chart'));
-    var errors = require('errors');
-    require('css!components/vislib/styles/main');
-
-    /**
-     * Pie Chart Visualization
-     *
-     * @class PieChart
-     * @constructor
-     * @extends Chart
-     * @param handler {Object} Reference to the Handler Class Constructor
-     * @param el {HTMLElement} HTML element to which the chart will be appended
-     * @param chartData {Object} Elasticsearch query results for this specific chart
-     */
-    _.class(PieChart).inherits(Chart);
-    function PieChart(handler, chartEl, chartData) {
-      if (!(this instanceof PieChart)) {
-        return new PieChart(handler, chartEl, chartData);
-      }
-      PieChart.Super.apply(this, arguments);
-
-      var charts = this.handler.data.getVisData();
-      this._validatePieData(charts);
-
-      this._attr = _.defaults(handler._attr || {}, {
-        isDonut: handler._attr.isDonut || false
-      });
-    }
-
-    /**
-     * Checks whether pie slices have all zero values.
-     * If so, an error is thrown.
-     */
-    PieChart.prototype._validatePieData = function (charts) {
-      var isAllZeros = charts.every(function (chart) {
-        return chart.slices.children.length === 0;
-      });
-
-      if (isAllZeros) { throw new errors.PieContainsAllZeros(); }
-    };
-
-    /**
-     * Adds Events to SVG paths
-     *
-     * @method addPathEvents
-     * @param element {D3.Selection} Reference to SVG path
-     * @returns {D3.Selection} SVG path with event listeners attached
-     */
-    PieChart.prototype.addPathEvents = function (element) {
-      var events = this.events;
-
-      return element
-        .call(events.addHoverEvent())
-        .call(events.addMouseoutEvent())
-        .call(events.addClickEvent());
-    };
-
-    PieChart.prototype.convertToPercentage = function (slices) {
-      (function assignPercentages(slices) {
-        if (slices.sumOfChildren != null) return;
-
-        var parent = slices;
-        var children = parent.children;
-        var parentPercent = parent.percentOfParent;
-
-        var sum = parent.sumOfChildren = Math.abs(children.reduce(function (sum, child) {
-          return sum + Math.abs(child.size);
-        }, 0));
-
-        children.forEach(function (child) {
-          child.percentOfGroup = Math.abs(child.size) / sum;
-          child.percentOfParent = child.percentOfGroup;
-
-          if (parentPercent != null) {
-            child.percentOfParent *= parentPercent;
-          }
-
-          if (child.children) {
-            assignPercentages(child);
-          }
-        });
-      }(slices));
-    };
-
-    /**
-     * Adds pie paths to SVG
-     *
-     * @method addPath
-     * @param width {Number} Width of SVG
-     * @param height {Number} Height of SVG
-     * @param svg {HTMLElement} Chart SVG
-     * @param slices {Object} Chart data
-     * @returns {D3.Selection} SVG with paths attached
-     */
-    PieChart.prototype.addPath = function (width, height, svg, slices) {
-      var self = this;
-      var marginFactor = 0.95;
-      var isDonut = self._attr.isDonut;
-      var radius = (Math.min(width, height) / 2) * marginFactor;
-      var color = self.handler.data.getPieColorFunc();
-      var tooltip = self.tooltip;
-      var isTooltip = self._attr.addTooltip;
-
-      var partition = d3.layout.partition()
-      .sort(null)
-      .value(function (d) {
-        return d.percentOfParent * 100;
-      });
-      var x = d3.scale.linear()
-      .range([0, 2 * Math.PI]);
-      var y = d3.scale.sqrt()
-      .range([0, radius]);
-      var arc = d3.svg.arc()
-      .startAngle(function (d) {
-        return Math.max(0, Math.min(2 * Math.PI, x(d.x)));
-      })
-      .endAngle(function (d) {
-        return Math.max(0, Math.min(2 * Math.PI, x(d.x + d.dx)));
-      })
-      .innerRadius(function (d) {
-        // option for a single layer, i.e pie chart
-        if (d.depth === 1 && !isDonut) {
-          // return no inner radius
-          return 0;
-        }
-
-        return Math.max(0, y(d.y));
-      })
-      .outerRadius(function (d) {
-        return Math.max(0, y(d.y + d.dy));
-      });
-
-      var path = svg
-      .datum(slices)
-      .selectAll('path')
-      .data(partition.nodes)
-      .enter()
-        .append('path')
-        .attr('d', arc)
-        .attr('class', function (d) {
-          if (d.depth === 0) { return; }
-          return 'slice';
-        })
-        .call(self._addIdentifier, 'name')
-        .style('stroke', '#fff')
-        .style('fill', function (d) {
-          if (d.depth === 0) { return 'none'; }
-          return color(d.name);
-        });
-
-      if (isTooltip) {
-        path.call(tooltip.render());
-      }
-
-      return path;
-    };
-
-    PieChart.prototype._validateContainerSize = function (width, height) {
-      var minWidth = 20;
-      var minHeight = 20;
-
-      if (width <= minWidth || height <= minHeight) {
-        throw new errors.ContainerTooSmall();
-      }
-    };
-
-    /**
-     * Renders d3 visualization
-     *
-     * @method draw
-     * @returns {Function} Creates the pie chart
-     */
-    PieChart.prototype.draw = function () {
-      var self = this;
-
-      return function (selection) {
-        selection.each(function (data) {
-          var slices = data.slices;
-          var div = d3.select(this);
-          var width = $(this).width();
-          var height = $(this).height();
-          var path;
-
-          if (!slices.children.length) return;
-
-          self.convertToPercentage(slices);
-          self._validateContainerSize(width, height);
-
-          var svg = div.append('svg')
-          .attr('width', width)
-          .attr('height', height)
-          .append('g')
-          .attr('transform', 'translate(' + width / 2 + ',' + height / 2 + ')');
-
-          path = self.addPath(width, height, svg, slices);
-          self.addPathEvents(path);
-
-          return svg;
-        });
-      };
-    };
-
-    return PieChart;
-  };
-});
diff --git a/src/kibana/components/vislib/visualizations/tile_map.js b/src/kibana/components/vislib/visualizations/tile_map.js
deleted file mode 100644
index f0a6141485da3..0000000000000
--- a/src/kibana/components/vislib/visualizations/tile_map.js
+++ /dev/null
@@ -1,128 +0,0 @@
-define(function (require) {
-  return function TileMapFactory(d3, Private) {
-    var _ = require('lodash');
-    var $ = require('jquery');
-    require('css!components/vislib/styles/main');
-
-    var Chart = Private(require('components/vislib/visualizations/_chart'));
-    var Map = Private(require('components/vislib/visualizations/_map'));
-
-    /**
-     * Tile Map Visualization: renders maps
-     *
-     * @class TileMap
-     * @constructor
-     * @extends Chart
-     * @param handler {Object} Reference to the Handler Class Constructor
-     * @param chartEl {HTMLElement} HTML element to which the map will be appended
-     * @param chartData {Object} Elasticsearch query results for this map
-     */
-    _.class(TileMap).inherits(Chart);
-    function TileMap(handler, chartEl, chartData) {
-      if (!(this instanceof TileMap)) {
-        return new TileMap(handler, chartEl, chartData);
-      }
-
-      TileMap.Super.apply(this, arguments);
-
-      // track the map objects
-      this.maps = [];
-      this._chartData = chartData || {};
-      _.assign(this, this._chartData);
-
-      this._appendGeoExtents();
-    }
-
-    /**
-     * Draws tile map, called on chart render
-     *
-     * @method draw
-     * @return {Function} - function to add a map to a selection
-     */
-    TileMap.prototype.draw = function () {
-      var self = this;
-
-      // clean up old maps
-      self.destroy();
-
-      return function (selection) {
-        selection.each(function () {
-          self._appendMap(this);
-        });
-      };
-    };
-
-    /**
-     * Invalidate the size of the map, so that leaflet will resize to fit.
-     * then moves to center
-     *
-     * @method resizeArea
-     * @return {undefined}
-     */
-    TileMap.prototype.resizeArea = function () {
-      this.maps.forEach(function (map) {
-        map.updateSize();
-      });
-    };
-
-    /**
-     * clean up the maps
-     *
-     * @method destroy
-     * @return {undefined}
-     */
-    TileMap.prototype.destroy = function () {
-      this.maps = this.maps.filter(function (map) {
-        map.destroy();
-      });
-    };
-
-    /**
-     * Adds allmin and allmax properties to geoJson data
-     *
-     * @method _appendMap
-     * @param selection {Object} d3 selection
-     */
-    TileMap.prototype._appendGeoExtents = function () {
-      // add allmin and allmax to geoJson
-      var geoMinMax = this.handler.data.getGeoExtents();
-      this.geoJson.properties.allmin = geoMinMax.min;
-      this.geoJson.properties.allmax = geoMinMax.max;
-    };
-
-    /**
-     * Renders map
-     *
-     * @method _appendMap
-     * @param selection {Object} d3 selection
-     */
-    TileMap.prototype._appendMap = function (selection) {
-      var container = $(selection).addClass('tilemap');
-
-      var map = new Map(container, this._chartData, {
-        // center: this._attr.mapCenter,
-        // zoom: this._attr.mapZoom,
-        events: this.events,
-        markerType: this._attr.mapType,
-        tooltipFormatter: this.tooltipFormatter,
-        valueFormatter: this.valueFormatter,
-        attr: this._attr
-      });
-
-      // add title for splits
-      if (this.title) {
-        map.addTitle(this.title);
-      }
-
-      // add fit to bounds control
-      if (_.get(this.geoJson, 'features.length') > 0) {
-        map.addFitControl();
-        map.addBoundingControl();
-      }
-
-      this.maps.push(map);
-    };
-
-    return TileMap;
-  };
-});
diff --git a/src/kibana/components/vislib/visualizations/time_marker.js b/src/kibana/components/vislib/visualizations/time_marker.js
deleted file mode 100644
index f10f6779a62a1..0000000000000
--- a/src/kibana/components/vislib/visualizations/time_marker.js
+++ /dev/null
@@ -1,74 +0,0 @@
-define(function (require) {
-  var datemath = require('utils/datemath');
-
-  return function TimeMarkerFactory(d3) {
-    function TimeMarker(times, xScale, height) {
-      if (!(this instanceof TimeMarker)) {
-        return new TimeMarker(times, xScale, height);
-      }
-
-      var currentTimeArr = [{
-        'time': new Date().getTime(),
-        'class': 'time-marker',
-        'color': '#c80000',
-        'opacity': 0.3,
-        'width': 2
-      }];
-
-      this.xScale = xScale;
-      this.height = height;
-      this.times = (times.length) ? times.map(function (d) {
-        return {
-          'time': datemath.parse(d.time),
-          'class': d.class || 'time-marker',
-          'color': d.color || '#c80000',
-          'opacity': d.opacity || 0.3,
-          'width': d.width || 2
-        };
-      }) : currentTimeArr;
-    }
-
-    TimeMarker.prototype._isTimeBasedChart = function (selection) {
-      var data = selection.data();
-      return data.every(function (datum) {
-        return (datum.ordered && datum.ordered.date);
-      });
-    };
-
-    TimeMarker.prototype.render = function (selection) {
-      var self = this;
-
-      // return if not time based chart
-      if (!self._isTimeBasedChart(selection)) return;
-
-      selection.each(function () {
-        d3.select(this).selectAll('time-marker')
-          .data(self.times)
-          .enter().append('line')
-          .attr('class', function (d) {
-            return d.class;
-          })
-          .attr('pointer-events', 'none')
-          .attr('stroke', function (d) {
-            return d.color;
-          })
-          .attr('stroke-width', function (d) {
-            return d.width;
-          })
-          .attr('stroke-opacity', function (d) {
-            return d.opacity;
-          })
-          .attr('x1', function (d) {
-            return self.xScale(d.time);
-          })
-          .attr('x2', function (d) {
-            return self.xScale(d.time);
-          })
-          .attr('y1', self.height)
-          .attr('y2', self.xScale.range()[0]);
-      });
-    };
-
-    return TimeMarker;
-  };
-});
diff --git a/src/kibana/components/vislib/visualizations/vis_types.js b/src/kibana/components/vislib/visualizations/vis_types.js
deleted file mode 100644
index 9a43e52561abb..0000000000000
--- a/src/kibana/components/vislib/visualizations/vis_types.js
+++ /dev/null
@@ -1,21 +0,0 @@
-define(function (require) {
-  return function VisTypeFactory(Private) {
-
-    /**
-     * Provides the visualizations for the vislib
-     *
-     * @module vislib
-     * @submodule VisTypeFactory
-     * @param Private {Object} Loads any function as an angular module
-     * @return {Function} Returns an Object of Visualization classes
-     */
-    return {
-      histogram: Private(require('components/vislib/visualizations/column_chart')),
-      pie: Private(require('components/vislib/visualizations/pie_chart')),
-      line: Private(require('components/vislib/visualizations/line_chart')),
-      area: Private(require('components/vislib/visualizations/area_chart')),
-      tile_map: Private(require('components/vislib/visualizations/tile_map'))
-    };
-  };
-
-});
\ No newline at end of file
diff --git a/src/kibana/components/vislib_vis_type/VislibRenderbot.js b/src/kibana/components/vislib_vis_type/VislibRenderbot.js
deleted file mode 100644
index a6b216f838aa0..0000000000000
--- a/src/kibana/components/vislib_vis_type/VislibRenderbot.js
+++ /dev/null
@@ -1,69 +0,0 @@
-define(function (require) {
-  return function VislibRenderbotFactory(Private, vislib) {
-    var _ = require('lodash');
-    var Renderbot = Private(require('components/vis/Renderbot'));
-    var buildChartData = Private(require('components/vislib_vis_type/buildChartData'));
-
-    _.class(VislibRenderbot).inherits(Renderbot);
-    function VislibRenderbot(vis, $el) {
-      VislibRenderbot.Super.call(this, vis, $el);
-      this._createVis();
-    }
-
-    VislibRenderbot.prototype._createVis = function () {
-      var self = this;
-
-      if (self.vislibVis) self.destroy();
-
-      self.vislibParams = self._getVislibParams();
-      self.vislibVis = new vislib.Vis(self.$el[0], self.vislibParams);
-
-      _.each(self.vis.listeners, function (listener, event) {
-        self.vislibVis.on(event, listener);
-      });
-
-      if (this.chartData) self.vislibVis.render(this.chartData);
-    };
-
-    VislibRenderbot.prototype._getVislibParams = function () {
-      var self = this;
-
-      return _.assign(
-        {},
-        self.vis.type.params.defaults,
-        { type: self.vis.type.name },
-        self.vis.params
-      );
-    };
-
-    VislibRenderbot.prototype.buildChartData = buildChartData;
-    VislibRenderbot.prototype.render = function (esResponse) {
-      this.chartData = this.buildChartData(esResponse);
-      this.vislibVis.render(this.chartData);
-    };
-
-    VislibRenderbot.prototype.destroy = function () {
-      var self = this;
-
-      var vislibVis = self.vislibVis;
-
-      _.forOwn(self.vis.listeners, function (listener, event) {
-        vislibVis.off(event, listener);
-      });
-
-      vislibVis.destroy();
-    };
-
-    VislibRenderbot.prototype.updateParams = function () {
-      var self = this;
-
-      // get full vislib params object
-      var newParams = self._getVislibParams();
-
-      // if there's been a change, replace the vis
-      if (!_.isEqual(newParams, self.vislibParams)) self._createVis();
-    };
-
-    return VislibRenderbot;
-  };
-});
diff --git a/src/kibana/components/vislib_vis_type/VislibVisType.js b/src/kibana/components/vislib_vis_type/VislibVisType.js
deleted file mode 100644
index f5823a461a4bc..0000000000000
--- a/src/kibana/components/vislib_vis_type/VislibVisType.js
+++ /dev/null
@@ -1,33 +0,0 @@
-define(function (require) {
-  return function VislibVisTypeFactory(Private) {
-    var _ = require('lodash');
-
-    var VisTypeSchemas = Private(require('components/vis/Schemas'));
-    var VisType = Private(require('components/vis/VisType'));
-    var pointSeries = Private(require('components/agg_response/point_series/point_series'));
-    var VislibRenderbot = Private(require('components/vislib_vis_type/VislibRenderbot'));
-
-    require('plugins/kbn_vislib_vis_types/controls/vislib_basic_options');
-    require('plugins/kbn_vislib_vis_types/controls/point_series_options');
-    require('plugins/kbn_vislib_vis_types/controls/line_interpolation_option');
-
-    _.class(VislibVisType).inherits(VisType);
-    function VislibVisType(opts) {
-      opts = opts || {};
-
-      VislibVisType.Super.call(this, opts);
-
-      if (this.responseConverter == null) {
-        this.responseConverter = pointSeries;
-      }
-
-      this.listeners = opts.listeners || {};
-    }
-
-    VislibVisType.prototype.createRenderbot = function (vis, $el) {
-      return new VislibRenderbot(vis, $el);
-    };
-
-    return VislibVisType;
-  };
-});
diff --git a/src/kibana/components/visualize/spy/_req_resp_stats.js b/src/kibana/components/visualize/spy/_req_resp_stats.js
deleted file mode 100644
index 97bb0ebfbf98c..0000000000000
--- a/src/kibana/components/visualize/spy/_req_resp_stats.js
+++ /dev/null
@@ -1,59 +0,0 @@
-define(function (require) {
-
-  var _ = require('lodash');
-  var reqRespStatsHTML = require('text!components/visualize/spy/_req_resp_stats.html');
-  require('components/clipboard/clipboard');
-
-  var linkReqRespStats = function ($scope, config) {
-    $scope.$bind('req', 'searchSource.history[searchSource.history.length - 1]');
-    $scope.$watchMulti([
-      'req',
-      'req.started',
-      'req.stopped',
-      'searchSource'
-    ], function () {
-      if (!$scope.searchSource || !$scope.req) return;
-
-      var req = $scope.req;
-      var resp = $scope.req.resp;
-      var stats = $scope.stats = [];
-
-      if (resp && resp.took != null) stats.push(['Query Duration', resp.took + 'ms']);
-      if (req && req.ms != null) stats.push(['Request Duration', req.ms + 'ms']);
-      if (resp && resp.hits) stats.push(['Hits', resp.hits.total]);
-
-      if (req.fetchParams.index) stats.push(['Index', req.fetchParams.index]);
-      if (req.fetchParams.type) stats.push(['Type', req.fetchParams.type]);
-      if (req.fetchParams.id) stats.push(['Id', req.fetchParams.id]);
-    });
-  };
-
-  require('registry/spy_modes')
-  .register(function () {
-    return {
-      name: 'request',
-      display: 'Request',
-      order: 2,
-      template: reqRespStatsHTML,
-      link: linkReqRespStats
-    };
-  })
-  .register(function () {
-    return {
-      name: 'response',
-      display: 'Response',
-      order: 3,
-      template: reqRespStatsHTML,
-      link: linkReqRespStats
-    };
-  })
-  .register(function () {
-    return {
-      name: 'stats',
-      display: 'Statistics',
-      order: 4,
-      template: reqRespStatsHTML,
-      link: linkReqRespStats
-    };
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/components/visualize/spy/_table.js b/src/kibana/components/visualize/spy/_table.js
deleted file mode 100644
index 601ec7afaf23d..0000000000000
--- a/src/kibana/components/visualize/spy/_table.js
+++ /dev/null
@@ -1,40 +0,0 @@
-define(function (require) {
-  function VisSpyTableProvider(Notifier, $filter, $rootScope, config, Private) {
-    var _ = require('lodash');
-    var saveAs = require('file_saver');
-    var tabifyAggResponse = Private(require('components/agg_response/tabify/tabify'));
-
-    var PER_PAGE_DEFAULT = 10;
-
-    require('components/agg_table/agg_table');
-
-    return {
-      name: 'table',
-      display: 'Table',
-      order: 1,
-      template: require('text!components/visualize/spy/_table.html'),
-      link: function tableLinkFn($scope, $el) {
-        $rootScope.$watchMulti.call($scope, [
-          'vis',
-          'esResp'
-        ], function () {
-          if (!$scope.vis || !$scope.esResp) {
-            $scope.table = null;
-          } else {
-            if (!$scope.editableVis.params.spyPerPage) {
-              $scope.editableVis.params.spyPerPage = PER_PAGE_DEFAULT;
-            }
-
-            $scope.table = tabifyAggResponse($scope.vis, $scope.esResp, {
-              canSplit: false,
-              asAggConfigResults: true,
-              partialRows: true
-            });
-          }
-        });
-      }
-    };
-  }
-
-  require('registry/spy_modes').register(VisSpyTableProvider);
-});
diff --git a/src/kibana/components/watch_multi.js b/src/kibana/components/watch_multi.js
deleted file mode 100644
index 1897fd9a3a118..0000000000000
--- a/src/kibana/components/watch_multi.js
+++ /dev/null
@@ -1,117 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  require('modules').get('kibana')
-  .config(function ($provide) {
-
-    $provide.decorator('$rootScope', function ($delegate) {
-      /**
-       * Watch multiple expressions with a single callback. Along
-       * with making code simpler it also merges all of the watcher
-       * handlers within a single tick.
-       *
-       * # expression format
-       * expressions can be specified in one of the following ways:
-       * 1. string that evaluates to a value on scope. Creates a regular $watch
-       *    expression.
-       *     'someScopeValue.prop' === $scope.$watch('someScopeValue.prop', fn);
-       *
-       * 2. #1 prefixed with '[]', which uses $watchCollection rather than $watch.
-       *     '[]expr' === $scope.$watchCollection('expr', fn);
-       *
-       * 3. #1 prefixed with '=', which uses $watch with objectEquality turned on
-       *     '=expr' === $scope.$watch('expr', fn, true);
-       *
-       * 4. a function that will be called, like a normal function water
-       *
-       * 5. an object with any of the properties:
-       *   `get`: the getter called on each itteration
-       *   `deep`: a flag to turn on objectEquality in $watch
-       *   `fn`: the watch registration function ($scope.$watch or $scope.$watchCollection)
-       *
-       * @param  {array[string|function|obj]} expressions - the list of expressions to $watch
-       * @param  {Function} fn - the callback function
-       * @return {Function} - an unwatch function, just like the return value of $watch
-       */
-      $delegate.constructor.prototype.$watchMulti = function (expressions, fn) {
-        if (!_.isArray(expressions)) throw new TypeError('expected an array of expressions to watch');
-        if (!_.isFunction(fn)) throw new TypeError('expected a function that is triggered on each watch');
-
-        var $scope = this;
-        var vals = new Array(expressions.length);
-        var prev = new Array(expressions.length);
-        var fire = false;
-        var init = 0;
-        var neededInits = expressions.length;
-
-        // first, register all of the multi-watchers
-        var unwatchers = expressions.map(function (expr, i) {
-          expr = normalizeExpression($scope, expr);
-          if (!expr) return;
-
-          return expr.fn.call($scope, expr.get, function (newVal, oldVal) {
-            if (newVal === oldVal) {
-              init += 1;
-            }
-
-            vals[i] = newVal;
-            prev[i] = oldVal;
-            fire = true;
-          }, expr.deep);
-        });
-
-        // then, the watcher that checks to see if any of
-        // the other watchers triggered this cycle
-        var flip = false;
-        unwatchers.push($scope.$watch(function () {
-          if (init < neededInits) return init;
-
-          if (fire) {
-            fire = false;
-            flip = !flip;
-          }
-          return flip;
-        }, function () {
-          if (init < neededInits) return false;
-
-          fn(vals.slice(0), prev.slice(0));
-          vals.forEach(function (v, i) {
-            prev[i] = v;
-          });
-        }));
-
-        return _.partial(_.callEach, unwatchers);
-      };
-
-      function normalizeExpression($scope, expr) {
-        if (!expr) return;
-        var norm = {
-          fn: $scope.$watch,
-          deep: false
-        };
-
-        if (_.isFunction(expr)) return _.assign(norm, { get: expr });
-        if (_.isObject(expr)) return _.assign(norm, expr);
-        if (!_.isString(expr)) return;
-
-        if (expr.substr(0, 2) === '[]') {
-          return _.assign(norm, {
-            fn: $scope.$watchCollection,
-            get: expr.substr(2)
-          });
-        }
-
-        if (expr.charAt(0) === '=') {
-          return _.assign(norm, {
-            deep: true,
-            get: expr.substr(1)
-          });
-        }
-
-        return _.assign(norm, { get: expr });
-      }
-
-      return $delegate;
-    });
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/directives/auto_select_if_only_one.js b/src/kibana/directives/auto_select_if_only_one.js
deleted file mode 100644
index 0e5d4a56bc019..0000000000000
--- a/src/kibana/directives/auto_select_if_only_one.js
+++ /dev/null
@@ -1,19 +0,0 @@
-define(function (require) {
-  var module = require('modules').get('kibana');
-
-  module.directive('autoSelectIfOnlyOne', function ($parse) {
-    return {
-      restrict: 'A',
-      require: 'ngModel',
-      link: function (scope, element, attributes, ngModelCtrl) {
-        attributes.$observe('autoSelectIfOnlyOne', function (result) {
-          var options = $parse(result)(scope);
-          if (options && options.length === 1) {
-            ngModelCtrl.$setViewValue(options[0]);
-            ngModelCtrl.$render();
-          }
-        });
-      }
-    };
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/directives/config.js b/src/kibana/directives/config.js
deleted file mode 100644
index 61bd4641acf8a..0000000000000
--- a/src/kibana/directives/config.js
+++ /dev/null
@@ -1,82 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var ConfigTemplate = require('utils/config_template');
-  var angular = require('angular');
-  var module = require('modules').get('kibana');
-
-  require('directives/input_focus');
-
-  /**
-   * config directive
-   *
-   * Creates a full width horizonal config section, usually under a nav/subnav.
-   * ```
-   * <config config-template="configTemplate" config-object="configurable"></config>
-   * ```
-   */
-
-  module.directive('config', function ($compile) {
-    return {
-      restrict: 'E',
-      scope: {
-        configTemplate: '=',
-        configClose: '=',
-        configSubmit: '=',
-        configObject: '='
-      },
-      link: function ($scope, element, attr) {
-        var tmpScope = $scope.$new();
-
-        $scope.$watch('configObject', function (newVal) {
-          $scope[attr.configObject] = $scope.configObject;
-        });
-
-        var wrapTmpl = function (tmpl) {
-          if ($scope.configSubmit) {
-            return '<form role="form" class="container-fluid" ng-submit="configSubmit()">' + tmpl + '</form>';
-          } else {
-            return '<div class="container-fluid">' + tmpl + '</div>';
-          }
-        };
-
-        var render = function (newTemplate, oldTemplate) {
-          var tmpl = $scope.configTemplate;
-          if (tmpl instanceof ConfigTemplate) {
-            tmpl = tmpl.toString();
-          }
-
-          tmpScope.$destroy();
-          tmpScope = $scope.$new();
-
-          var html = '';
-          if (tmpl) {
-            html = $compile('' +
-              '<div class="config" ng-show="configTemplate">' +
-                wrapTmpl(tmpl) +
-              '  <div class="config-close remove" ng-click="close()">' +
-              '    <i class="fa fa-chevron-up"></i>' +
-              '  </div>' +
-              '</div>' +
-              ''
-            )(tmpScope);
-          }
-
-          element.html(html);
-        };
-
-        $scope.$watch('configSubmit', render);
-        $scope.$watch('configTemplate.current || configTemplate', render);
-
-
-        $scope.close = function () {
-          if (_.isFunction($scope.configClose)) $scope.configClose();
-          if ($scope.configTemplate instanceof ConfigTemplate) {
-            $scope.configTemplate.current = null;
-          } else {
-            $scope.configTemplate = null;
-          }
-        };
-      }
-    };
-  });
-});
diff --git a/src/kibana/directives/css_truncate.js b/src/kibana/directives/css_truncate.js
deleted file mode 100644
index 778a4a2ff631c..0000000000000
--- a/src/kibana/directives/css_truncate.js
+++ /dev/null
@@ -1,48 +0,0 @@
-define(function (require) {
-  var module = require('modules').get('kibana');
-  var $ = require('jquery');
-  var _ = require('lodash');
-
-  module.directive('cssTruncate', function ($timeout) {
-    return {
-      restrict: 'A',
-      scope: {},
-      link: function ($scope, $elem, attrs) {
-
-        $elem.css({
-          overflow: 'hidden',
-          'white-space': 'nowrap',
-          'text-overflow': 'ellipsis',
-          'word-break': 'break-all',
-        });
-
-        if (attrs.cssTruncateExpandable != null) {
-          $scope.$watch(
-            function () { return $elem.html(); },
-            function () {
-              if ($elem[0].offsetWidth < $elem[0].scrollWidth) {
-                $elem.css({'cursor': 'pointer'});
-                $elem.bind('click', function () {
-                  $scope.toggle();
-                });
-              }
-            }
-          );
-        }
-
-        $scope.toggle = function () {
-          if ($elem.css('white-space') !== 'normal') {
-            $elem.css({'white-space': 'normal'});
-          } else {
-            $elem.css({'white-space': 'nowrap'});
-          }
-        };
-
-        $scope.$on('$destroy', function () {
-          $elem.unbind('click');
-          $elem.unbind('mouseenter');
-        });
-      }
-    };
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/directives/inequality.js b/src/kibana/directives/inequality.js
deleted file mode 100644
index fe1f5b3230e91..0000000000000
--- a/src/kibana/directives/inequality.js
+++ /dev/null
@@ -1,40 +0,0 @@
-define(function (require) {
-
-  function makeDirectiveDef(id, compare) {
-    return function ($parse) {
-      return {
-        require: 'ngModel',
-        link: function ($scope, $el, $attr, ngModel) {
-          var getBound = function () { return $parse($attr[id])(); };
-          var defaultVal = {
-            'greaterThan': -Infinity,
-            'lessThan': Infinity
-          }[id];
-
-          ngModel.$parsers.push(validate);
-          ngModel.$formatters.push(validate);
-
-          $scope.$watch(getBound, function () {
-            validate(ngModel.$viewValue);
-          });
-
-          function validate(val) {
-            var bound = !isNaN(getBound()) ? +getBound() : defaultVal;
-            var valid = !isNaN(bound) && !isNaN(val) && compare(val, bound);
-            ngModel.$setValidity(id, valid);
-            return val;
-          }
-        }
-      };
-    };
-  }
-
-  require('modules')
-    .get('kibana')
-    .directive('greaterThan', makeDirectiveDef('greaterThan', function (a, b) {
-      return a > b;
-    }))
-    .directive('lessThan', makeDirectiveDef('lessThan', function (a, b) {
-      return a < b;
-    }));
-});
diff --git a/src/kibana/directives/input_focus.js b/src/kibana/directives/input_focus.js
deleted file mode 100644
index a300b8ba0b06c..0000000000000
--- a/src/kibana/directives/input_focus.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(function (require) {
-  var module = require('modules').get('kibana');
-
-  module.directive('inputFocus', function ($timeout) {
-    return {
-      restrict: 'A',
-      link: function ($scope, $elem, attrs) {
-        $timeout(function () {
-          $elem.focus();
-          if (attrs.inputFocus === 'select') $elem.select();
-        });
-      }
-    };
-  });
-});
diff --git a/src/kibana/directives/input_whole_number.js b/src/kibana/directives/input_whole_number.js
deleted file mode 100644
index ac5835d1b039a..0000000000000
--- a/src/kibana/directives/input_whole_number.js
+++ /dev/null
@@ -1,19 +0,0 @@
-define(function (require) {
-  var module = require('modules').get('kibana');
-
-  module.directive('inputWholeNumber', function () {
-    return {
-      restrict: 'A',
-      require: 'ngModel',
-      link: function ($scope, $elem, attrs, ngModel) {
-        ngModel.$parsers.push(checkWholeNumber);
-        ngModel.$formatters.push(checkWholeNumber);
-
-        function checkWholeNumber(value) {
-          ngModel.$setValidity('whole', value % 1 === 0);
-          return value;
-        }
-      }
-    };
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/directives/spinner.js b/src/kibana/directives/spinner.js
deleted file mode 100644
index dea8c20981819..0000000000000
--- a/src/kibana/directives/spinner.js
+++ /dev/null
@@ -1,12 +0,0 @@
-define(function (require) {
-  var html = '<div class="bounce1"></div> <div class="bounce2"></div> <div class="bounce3"></div>';
-  var module = require('modules').get('kibana');
-
-  module.directive('spinner', function () {
-    return {
-      restrict: 'C',
-      template: html
-    };
-  });
-
-});
\ No newline at end of file
diff --git a/src/kibana/directives/validate_cidr_mask.js b/src/kibana/directives/validate_cidr_mask.js
deleted file mode 100644
index 5cccbd231fda6..0000000000000
--- a/src/kibana/directives/validate_cidr_mask.js
+++ /dev/null
@@ -1,33 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var CidrMask = require('utils/cidr_mask');
-
-  require('modules').get('kibana').directive('validateCidrMask', function () {
-    return {
-      restrict: 'A',
-      require: 'ngModel',
-      scope: {
-        'ngModel': '='
-      },
-      link: function ($scope, elem, attr, ngModel) {
-        ngModel.$parsers.unshift(validateCidrMask);
-        ngModel.$formatters.unshift(validateCidrMask);
-
-        function validateCidrMask(mask) {
-          if (mask == null || mask === '') {
-            ngModel.$setValidity('cidrMaskInput', true);
-            return null;
-          }
-
-          try {
-            mask = new CidrMask(mask);
-            ngModel.$setValidity('cidrMaskInput', true);
-            return mask.toString();
-          } catch (e) {
-            ngModel.$setValidity('cidrMaskInput', false);
-          }
-        }
-      }
-    };
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/directives/validate_date_math.js b/src/kibana/directives/validate_date_math.js
deleted file mode 100644
index 2e9446866fc36..0000000000000
--- a/src/kibana/directives/validate_date_math.js
+++ /dev/null
@@ -1,29 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var DateMath = require('utils/datemath');
-
-  require('modules').get('kibana').directive('validateDateMath', function () {
-    return {
-      restrict: 'A',
-      require: 'ngModel',
-      scope: {
-        'ngModel': '='
-      },
-      link: function ($scope, elem, attr, ngModel) {
-        ngModel.$parsers.unshift(validateDateMath);
-        ngModel.$formatters.unshift(validateDateMath);
-
-        function validateDateMath(input) {
-          if (input == null || input === '') {
-            ngModel.$setValidity('validDateMath', true);
-            return null;
-          }
-
-          var moment = DateMath.parse(input);
-          ngModel.$setValidity('validDateMath', moment != null && moment.isValid());
-          return input;
-        }
-      }
-    };
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/directives/validate_index_name.js b/src/kibana/directives/validate_index_name.js
deleted file mode 100644
index 0b91cd71c280f..0000000000000
--- a/src/kibana/directives/validate_index_name.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// See https://github.com/elastic/elasticsearch/issues/6736
-define(function (require) {
-  var _ = require('lodash');
-
-  require('modules')
-    .get('kibana')
-    .directive('validateIndexName', function () {
-      return {
-        restrict: 'A',
-        require: 'ngModel',
-        scope: {
-          'ngModel': '='
-        },
-        link: function ($scope, elem, attr, ngModel) {
-          var illegalCharacters = ['\\', '/', '?', '"', '<', '>', '|', ' ', ','];
-          var isValid = function (input) {
-            if (input == null || input === '' || input === '.' || input === '..') return false;
-
-            var match = _.find(illegalCharacters, function (character) {
-              return input.indexOf(character) >= 0;
-            });
-            return !match;
-          };
-
-          // From User
-          ngModel.$parsers.unshift(function (value) {
-            var valid = isValid(value);
-            ngModel.$setValidity('indexNameInput', valid);
-            return valid ? value : undefined;
-          });
-
-          // To user
-          ngModel.$formatters.unshift(function (value) {
-            ngModel.$setValidity('indexNameInput', isValid(value));
-            return value;
-          });
-
-        }
-      };
-    });
-});
diff --git a/src/kibana/directives/validate_ip.js b/src/kibana/directives/validate_ip.js
deleted file mode 100644
index 47a732f2793bd..0000000000000
--- a/src/kibana/directives/validate_ip.js
+++ /dev/null
@@ -1,38 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var Ipv4Address = require('utils/ipv4_address');
-
-  require('modules')
-    .get('kibana')
-    .directive('validateIp', function () {
-      return {
-        restrict: 'A',
-        require: 'ngModel',
-        scope: {
-          'ngModel': '=',
-        },
-        link: function ($scope, elem, attr, ngModel) {
-          function validateIp(ipAddress) {
-            if (ipAddress == null || ipAddress === '') {
-              ngModel.$setValidity('ipInput', true);
-              return null;
-            }
-
-            try {
-              ipAddress = new Ipv4Address(ipAddress);
-              ngModel.$setValidity('ipInput', true);
-              return ipAddress.toString();
-            } catch (e) {
-              ngModel.$setValidity('ipInput', false);
-            }
-          }
-
-          // From User
-          ngModel.$parsers.unshift(validateIp);
-
-          // To user
-          ngModel.$formatters.unshift(validateIp);
-        }
-      };
-    });
-});
\ No newline at end of file
diff --git a/src/kibana/directives/validate_json.js b/src/kibana/directives/validate_json.js
deleted file mode 100644
index ef287e7e5b3cb..0000000000000
--- a/src/kibana/directives/validate_json.js
+++ /dev/null
@@ -1,48 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-
-  var module = require('modules').get('kibana');
-
-  module.directive('validateJson', function ($compile) {
-    return {
-      restrict: 'A',
-      require: 'ngModel',
-      scope: {
-        'ngModel': '=',
-        'queryInput': '=?',
-      },
-      link: function ($scope, $elem, attr, ngModel) {
-        $scope.$watch('ngModel', validator);
-
-        function validator(newValue, oldValue) {
-          if (!newValue || newValue.length === 0) {
-            setValid();
-            return;
-          }
-
-          // We actually need a proper object in all JSON inputs
-          newValue = (newValue || '').trim();
-          if (newValue[0] === '{' || '[') {
-            try {
-              JSON.parse(newValue);
-              setValid();
-            } catch (e) {
-              setInvalid();
-            }
-          } else {
-            setInvalid();
-          }
-        }
-
-        function setValid() {
-          ngModel.$setValidity('jsonInput', true);
-        }
-
-        function setInvalid() {
-          ngModel.$setValidity('jsonInput', false);
-        }
-      }
-    };
-  });
-});
diff --git a/src/kibana/factories/events.js b/src/kibana/factories/events.js
deleted file mode 100644
index 5594ef446c29b..0000000000000
--- a/src/kibana/factories/events.js
+++ /dev/null
@@ -1,105 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return function EventsProvider(Private, Promise, Notifier) {
-    var SimpleEmitter = require('utils/SimpleEmitter');
-    var notify = new Notifier({ location: 'EventEmitter' });
-
-    _.class(Events).inherits(SimpleEmitter);
-    function Events() {
-      Events.Super.call(this);
-      this._listeners = {};
-      this._emitChain = Promise.resolve();
-    }
-
-    /**
-     * Listens for events
-     * @param {string} name - The name of the event
-     * @param {function} handler - The function to call when the event is triggered
-     * @returns {undefined}
-     */
-    Events.prototype.on = function (name, handler) {
-      if (!_.isArray(this._listeners[name])) {
-        this._listeners[name] = [];
-      }
-
-      var listener = {
-        handler: handler
-      };
-      this._listeners[name].push(listener);
-
-      (function rebuildDefer() {
-        listener.defer = Promise.defer();
-        listener.resolved = listener.defer.promise.then(function (args) {
-          rebuildDefer();
-
-          // we ignore the completion of handlers, just watch for unhandled errors
-          Promise.resolve(handler.apply(handler, args)).catch(notify.fatal);
-        });
-      }());
-
-      return this;
-    };
-
-    /**
-     * Removes an event listener
-     * @param {string} [name] - The name of the event
-     * @param {function} [handler] - The handler to remove
-     * @return {undefined}
-     */
-    Events.prototype.off = function (name, handler) {
-      if (!name && !handler) {
-        return this._listeners = {};
-      }
-
-      // exit early if there is not an event that matches
-      if (!this._listeners[name]) return;
-
-      // If no hander remove all the events
-      if (!handler) {
-        delete this._listeners[name];
-      } else {
-        this._listeners[name] = _.filter(this._listeners[name], function (listener) {
-          return handler !== listener.handler;
-        });
-      }
-
-      return this;
-    };
-
-    /**
-     * Emits the event to all listeners
-     *
-     * @param {string} name - The name of the event.
-     * @param {any} [value] - The value that will be passed to all event handlers.
-     * @returns {Promise}
-     */
-    Events.prototype.emit = function (name) {
-      var self = this;
-      var args = _.rest(arguments);
-
-      if (!self._listeners[name]) {
-        return self._emitChain;
-      }
-
-      return Promise.map(self._listeners[name], function (listener) {
-        return self._emitChain = self._emitChain.then(function () {
-          listener.defer.resolve(args);
-          return listener.resolved;
-        });
-      });
-    };
-
-    /**
-     * Get a list of the handler functions for a specific event
-     *
-     * @param  {string} name
-     * @return {array[function]}
-     */
-    Events.prototype.listeners = function (name) {
-      return _.pluck(this._listeners[name], 'handler');
-    };
-
-    return Events;
-  };
-});
diff --git a/src/kibana/filters/field_type.js b/src/kibana/filters/field_type.js
deleted file mode 100644
index 35179a3275266..0000000000000
--- a/src/kibana/filters/field_type.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Gets all fields of a given type.
-// You may also pass "*" to get all types
-// Or an array of types to get all fields of that type
-define(function (require) {
-  var _ = require('lodash');
-  var propFilter = require('filters/_prop_filter');
-
-  require('modules')
-  .get('kibana')
-  .filter('fieldType', function () {
-    return propFilter('type');
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/filters/label.js b/src/kibana/filters/label.js
deleted file mode 100644
index e5b59021e1e26..0000000000000
--- a/src/kibana/filters/label.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(function (require) {
-  require('modules')
-    .get('kibana')
-    .filter('label', function () {
-      return function (str) {
-        var words = str.split(' ');
-        return words.map(capFirst).join(' ');
-      };
-    });
-
-  function capFirst(str) {
-    var i = str[0];
-    var r = new RegExp(i, 'i');
-    return str.replace(r, i.toUpperCase());
-  }
-});
\ No newline at end of file
diff --git a/src/kibana/filters/moment.js b/src/kibana/filters/moment.js
deleted file mode 100644
index abe7c5cd619e9..0000000000000
--- a/src/kibana/filters/moment.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(function (require) {
-  var moment = require('moment');
-  var _ = require('lodash');
-
-  require('modules')
-    .get('kibana')
-    .filter('moment', function (config) {
-    return function (datetime) {
-      var format = config.get('dateFormat');
-      if (moment.isMoment(datetime)) return datetime.format(format);
-      if (_.isDate(datetime)) return moment(datetime).format(format);
-      return datetime;
-    };
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/filters/rison.js b/src/kibana/filters/rison.js
deleted file mode 100644
index 8a362ceeb0c67..0000000000000
--- a/src/kibana/filters/rison.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(function (require) {
-  var rison = require('utils/rison');
-  var module = require('modules').get('kibana');
-
-  module.filter('rison', function () {
-    return function (str) {
-      return rison.encode(str);
-    };
-  });
-
-  module.filter('risonDecode', function () {
-    return function (str) {
-      return rison.decode(str);
-    };
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/filters/short_dots.js b/src/kibana/filters/short_dots.js
deleted file mode 100644
index 12d37b4349d58..0000000000000
--- a/src/kibana/filters/short_dots.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Shorts dot notated strings
-// eg: foo.bar.baz becomes f.b.baz
-// 'foo.bar.baz'.replace(/(.+?\.)/g,function(v) {return v[0]+'.';});
-define(function (require) {
-  var _ = require('lodash');
-
-  require('modules')
-    .get('kibana')
-    .filter('shortDots', function (Private) {
-      return Private(shortDotsFilterProvider);
-    });
-
-  function shortDotsFilterProvider(config, $rootScope) {
-    var filter;
-
-    function updateFilter() {
-      filter = config.get('shortDots:enable') ? _.shortenDottedString : _.identity;
-    }
-
-    updateFilter();
-    $rootScope.$on('change:config.shortDots:enable', updateFilter);
-    $rootScope.$on('init:config', updateFilter);
-
-    return function (str) {
-      return filter(str);
-    };
-  }
-
-  return shortDotsFilterProvider;
-});
diff --git a/src/kibana/filters/start_from.js b/src/kibana/filters/start_from.js
deleted file mode 100644
index 769553bb5ee6e..0000000000000
--- a/src/kibana/filters/start_from.js
+++ /dev/null
@@ -1,11 +0,0 @@
-define(function (require) {
-  require('modules')
-    .get('kibana')
-    .filter('startFrom', function () {
-      return function (input, start) {
-        if (!input) return [];
-        start = +start; //parse to int
-        return input.slice(start);
-      };
-    });
-});
\ No newline at end of file
diff --git a/src/kibana/filters/uriescape.js b/src/kibana/filters/uriescape.js
deleted file mode 100644
index 191543d30817a..0000000000000
--- a/src/kibana/filters/uriescape.js
+++ /dev/null
@@ -1,9 +0,0 @@
-define(function (require) {
-  require('modules')
-    .get('kibana')
-    .filter('uriescape', function () {
-      return function (str) {
-        return encodeURIComponent(str);
-      };
-    });
-});
\ No newline at end of file
diff --git a/src/kibana/index.html b/src/kibana/index.html
deleted file mode 100644
index 9ae799f865355..0000000000000
--- a/src/kibana/index.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-  <!--[if IE 8]>         <html class="no-js lt-ie9" lang="en"> <![endif]-->
-  <!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width">
-    <link rel="shortcut icon" href="styles/theme/elk.ico">
-    <title>Kibana 4</title>
-    <link rel="stylesheet" href="styles/main.css?_b=@@buildNum">
-
-  </head>
-  <body kibana ng-class="'application-' + activeApp.id">
-
-    <div class="col-md-offset-4 col-md-4 page-header initial-load">
-      <center>
-        <img width="128" alt="Loading Kibana" src="images/initial_load.gif">
-        <h1>
-          <strong>Kibana</strong>
-          <small id="cache-message">is loading. Give me a moment here. I'm loading a whole bunch of code. Don't worry, all this good stuff will be cached up for next time!</small>
-        </h1>
-      </center>
-    </div>
-
-    <script>
-      window.KIBANA_VERSION='@@version';
-      window.KIBANA_BUILD_NUM='@@buildNum';
-      window.KIBANA_COMMIT_SHA='@@commitSha';
-    </script>
-
-    <script src="bower_components/requirejs/require.js?_b=@@buildNum"></script>
-    <script src="require.config.js?_b=@@buildNum"></script>
-    <script>
-      var showCacheMessage = location.href.indexOf('?embed') < 0 && location.href.indexOf('&embed') < 0;
-      if (!showCacheMessage) document.getElementById('cache-message').style.display = 'none';
-
-      if (window.KIBANA_BUILD_NUM.substr(0, 2) !== '@@') {
-        // only cache bust if this is really the build number
-        require.config({ urlArgs: '_b=' + window.KIBANA_BUILD_NUM });
-      }
-
-      require(['kibana'], function (kibana) { kibana.init(); });
-    </script>
-
-  </body>
-</html>
diff --git a/src/kibana/index.js b/src/kibana/index.js
deleted file mode 100644
index 04c72de1e5184..0000000000000
--- a/src/kibana/index.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * main app level module
- */
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var modules = require('modules');
-  var routes = require('routes');
-
-  require('elasticsearch');
-  require('angular-route');
-  require('angular-bindonce');
-
-  var configFile = JSON.parse(require('text!config'));
-
-  var kibana = modules.get('kibana', [
-    // list external requirements here
-    'elasticsearch',
-    'pasvaz.bindonce',
-    'ngRoute',
-    'ngClipboard'
-  ]);
-
-
-  kibana
-    // This stores the Kibana revision number, @REV@ is replaced by grunt.
-    .constant('kbnVersion', window.KIBANA_VERSION)
-    // The build number is placed by grunt, represents a sequence to provide nothing really but order.
-    // If NaN, use the max value of a JS number, that way we always have a number here, even in dev
-    .constant('buildNum', _.parseInt(window.KIBANA_BUILD_NUM) || Number.MAX_SAFE_INTEGER)
-    // This stores the build number, @REV@ is replaced by grunt.
-    .constant('commitSha', window.KIBANA_COMMIT_SHA)
-    // Use this for cache busting partials
-    .constant('cacheBust', window.KIBANA_COMMIT_SHA)
-    // The minimum Elasticsearch version required to run Kibana
-    .constant('minimumElasticsearchVersion', '2.0.0.beta1')
-    // When we need to identify the current session of the app, ef shard preference
-    .constant('sessionId', Date.now())
-    // attach the route manager's known routes
-    .config(routes.config)
-    .config(['ngClipProvider', function (ngClipProvider) {
-      ngClipProvider.setPath('bower_components/zeroclipboard/dist/ZeroClipboard.swf');
-    }]);
-
-  // setup routes
-  routes
-    .otherwise({
-      redirectTo: '/' + configFile.default_app_id
-    });
-
-  // tell the modules util to add it's modules as requirements for kibana
-  modules.link(kibana);
-
-  kibana.load = _.onceWithCb(function (cb) {
-    var firstLoad = [ 'plugins/kibana/index' ];
-    var thenLoad = _.difference(configFile.plugins, firstLoad);
-    require(firstLoad, function loadApps() {
-      require(thenLoad, cb);
-    });
-  });
-
-  kibana.init = _.onceWithCb(function (cb) {
-    kibana.load(function () {
-      $(function () {
-        angular
-          .bootstrap(document, ['kibana'])
-          .invoke(function () {
-            $(document.body).children(':not(style-compile)').show();
-            cb();
-          });
-      });
-    });
-  });
-
-  return kibana;
-});
diff --git a/src/kibana/plugins/dashboard/components/panel/lib/load_panel.js b/src/kibana/plugins/dashboard/components/panel/lib/load_panel.js
deleted file mode 100644
index 2deffc463b25e..0000000000000
--- a/src/kibana/plugins/dashboard/components/panel/lib/load_panel.js
+++ /dev/null
@@ -1,18 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  return function loadPanelFunction(Private) { // Inject services here
-    return function (panel, $scope) { // Function parameters here
-      var panelTypes = {
-        visualization: Private(require('plugins/dashboard/components/panel/lib/visualization')),
-        search: Private(require('plugins/dashboard/components/panel/lib/search'))
-      };
-
-      try {
-        return panelTypes[panel.type](panel, $scope);
-      } catch (e) {
-        throw new Error('Loader not found for unknown panel type: ' + panel.type);
-      }
-
-    };
-  };
-});
diff --git a/src/kibana/plugins/dashboard/index.html b/src/kibana/plugins/dashboard/index.html
deleted file mode 100644
index 175cf2a22b484..0000000000000
--- a/src/kibana/plugins/dashboard/index.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<div dashboard-app class="app-container dashboard-container">
-  <navbar ng-show="!appEmbedded">
-    <span class="name" ng-if="dash.id" bindonce bo-bind="dash.title" tooltip="{{dash.title}}"></span>
-
-    <form name="queryInput"
-      class="fill inline-form"
-      ng-submit="filterResults()"
-      role="form">
-
-      <div class="typeahead" kbn-typeahead="dashboard">
-        <div class="input-group"
-          ng-class="queryInput.$invalid ? 'has-error' : ''">
-
-          <input type="text"
-            placeholder="Filter..."
-            aria-label="Filter input"
-            class="form-control"
-            ng-model="state.query"
-            input-focus
-            kbn-typeahead-input
-            validate-query>
-          <button type="submit" class="btn btn-default" ng-disabled="queryInput.$invalid" aria-label="Filter dashboards">
-            <span aria-hidden="true" class="fa fa-search"></span>
-          </button>
-        </div>
-
-        <kbn-typeahead-items></kbn-typeahead-items>
-      </div>
-
-    </form>
-
-    <div class="button-group" role="toolbar">
-      <kbn-tooltip text="New Dashboard" placement="bottom" append-to-body="1">
-        <button ng-click="newDashboard()" aria-label="New Dashboard"><i aria-hidden="true" class="fa fa-file-new-o"></i></button>
-      </kbn-tooltip>
-      <kbn-tooltip text="Save Dashboard" placement="bottom" append-to-body="1">
-        <button
-          aria-label="Save Dashboard"
-          aria-haspopup="true"
-          aria-expanded="{{ configTemplate.is('save') }}"
-          ng-class="{active: configTemplate.is('save')}"
-          ng-click="configTemplate.toggle('save');">
-          <i aria-hidden="true" class="fa fa-save"></i>
-        </button>
-      </kbn-tooltip>
-      <kbn-tooltip text="Load Saved Dashboard" placement="bottom" append-to-body="1">
-        <button
-          aria-label="Load Saved Dashboard"
-          aria-haspopup="true"
-          aria-expanded="{{ configTemplate.is('load') }}"
-          ng-class="{active: configTemplate.is('load')}"
-          ng-click="configTemplate.toggle('load');">
-          <i aria-hidden="true" class="fa fa-folder-open-o"></i>
-        </button>
-      </kbn-tooltip>
-      <kbn-tooltip text="Share" placement="bottom" append-to-body="1">
-        <button
-          aria-label="Share Dashboard"
-          aria-haspopup="true"
-          aria-expanded="{{ configTemplate.is('share') }}"
-          ng-class="{active: configTemplate.is('share')}"
-          ng-click="configTemplate.toggle('share');">
-          <i aria-hidden="true" class="fa fa-external-link"></i>
-        </button>
-      </kbn-tooltip>
-      <kbn-tooltip text="Add Visualization" placement="bottom" append-to-body="1">
-        <button
-          aria-label="Add Visualization"
-          aria-haspopup="true"
-          aria-expanded="{{ configTemplate.is('pickVis') }}"
-          ng-class="{active: configTemplate.is('pickVis')}"
-          ng-click="configTemplate.toggle('pickVis');">
-          <i aria-hidden="true" class="fa fa-plus-circle"></i>
-        </button>
-      </kbn-tooltip>
-    </div>
-  </navbar>
-
-  <config config-template="configTemplate" config-object="opts"></config>
-
-  <filter-bar state="state"></filter-bar>
-
-  <div ng-show="!state.panels.length" class="text-center start-screen">
-    <h2>Ready to get started?</h2>
-    <p>Click the <a class="btn btn-xs navbtn-inverse" ng-click="configTemplate.open('pickVis'); toggleAddVisualization = !toggleAddVisualization" aria-label="Add visualization"><i aria-hidden="true" class="fa fa-plus-circle"></i></a> button in the menu bar above to add a visualization to the dashboard. <br/>If you haven't setup a visualization yet visit the <a href="#/visualize" title="Visualize">"Visualize"</a> tab to create your first visualization.</p>
-  </div>
-
-  <dashboard-grid></dashboard-grid>
-</div>
diff --git a/src/kibana/plugins/dashboard/index.js b/src/kibana/plugins/dashboard/index.js
deleted file mode 100644
index 1dfe49852be9c..0000000000000
--- a/src/kibana/plugins/dashboard/index.js
+++ /dev/null
@@ -1,217 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var angular = require('angular');
-  var ConfigTemplate = require('utils/config_template');
-
-  require('directives/config');
-  require('components/courier/courier');
-  require('components/config/config');
-  require('components/notify/notify');
-  require('components/typeahead/typeahead');
-  require('components/clipboard/clipboard');
-
-
-  require('plugins/dashboard/directives/grid');
-  require('plugins/dashboard/components/panel/panel');
-  require('plugins/dashboard/services/saved_dashboards');
-  require('css!plugins/dashboard/styles/main.css');
-
-  var app = require('modules').get('app/dashboard', [
-    'elasticsearch',
-    'ngRoute',
-    'kibana/courier',
-    'kibana/config',
-    'kibana/notify',
-    'kibana/typeahead'
-  ]);
-
-  require('routes')
-  .when('/dashboard', {
-    template: require('text!plugins/dashboard/index.html'),
-    resolve: {
-      dash: function (savedDashboards) {
-        return savedDashboards.get();
-      }
-    }
-  })
-  .when('/dashboard/:id', {
-    template: require('text!plugins/dashboard/index.html'),
-    resolve: {
-      dash: function (savedDashboards, Notifier, $route, $location, courier) {
-        return savedDashboards.get($route.current.params.id)
-        .catch(courier.redirectWhenMissing({
-          'dashboard' : '/dashboard'
-        }));
-      }
-    }
-  });
-
-  app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter, kbnUrl) {
-    return {
-      controller: function ($scope, $route, $routeParams, $location, configFile, Private, getAppState) {
-        var queryFilter = Private(require('components/filter_bar/query_filter'));
-
-        var notify = new Notifier({
-          location: 'Dashboard'
-        });
-
-        var dash = $scope.dash = $route.current.locals.dash;
-
-        if (dash.timeRestore && dash.timeTo && dash.timeFrom && !getAppState.previouslyStored()) {
-          timefilter.time.to = dash.timeTo;
-          timefilter.time.from = dash.timeFrom;
-        }
-
-        $scope.$on('$destroy', dash.destroy);
-
-        var matchQueryFilter = function (filter) {
-          return filter.query && filter.query.query_string && !filter.meta;
-        };
-
-        var extractQueryFromFilters = function (filters) {
-          var filter = _.find(filters, matchQueryFilter);
-          if (filter) return filter.query;
-        };
-
-        var stateDefaults = {
-          title: dash.title,
-          panels: dash.panelsJSON ? JSON.parse(dash.panelsJSON) : [],
-          query: extractQueryFromFilters(dash.searchSource.getOwn('filter')) || {query_string: {query: '*'}},
-          filters: _.reject(dash.searchSource.getOwn('filter'), matchQueryFilter)
-        };
-
-        var $state = $scope.state = new AppState(stateDefaults);
-
-        $scope.configTemplate = new ConfigTemplate({
-          save: require('text!plugins/dashboard/partials/save_dashboard.html'),
-          load: require('text!plugins/dashboard/partials/load_dashboard.html'),
-          share: require('text!plugins/dashboard/partials/share.html'),
-          pickVis: require('text!plugins/dashboard/partials/pick_visualization.html')
-        });
-
-        $scope.refresh = _.bindKey(courier, 'fetch');
-
-        timefilter.enabled = true;
-        $scope.timefilter = timefilter;
-        $scope.$listen(timefilter, 'fetch', $scope.refresh);
-
-        courier.setRootSearchSource(dash.searchSource);
-
-        function init() {
-          updateQueryOnRootSource();
-
-          var docTitle = Private(require('components/doc_title/doc_title'));
-          if (dash.id) {
-            docTitle.change(dash.title);
-          }
-
-          $scope.$emit('application.load');
-        }
-
-        function updateQueryOnRootSource() {
-          var filters = queryFilter.getFilters();
-          if ($state.query) {
-            dash.searchSource.set('filter', _.union(filters, [{
-              query: $state.query
-            }]));
-          } else {
-            dash.searchSource.set('filter', filters);
-          }
-        }
-
-        // update root source when filters update
-        $scope.$listen(queryFilter, 'update', function () {
-          updateQueryOnRootSource();
-          $state.save();
-        });
-
-        // update data when filters fire fetch event
-        $scope.$listen(queryFilter, 'fetch', $scope.refresh);
-
-        $scope.newDashboard = function () {
-          kbnUrl.change('/dashboard', {});
-        };
-
-        $scope.filterResults = function () {
-          updateQueryOnRootSource();
-          $state.save();
-          $scope.refresh();
-        };
-
-        $scope.save = function () {
-          $state.title = dash.id = dash.title;
-          $state.save();
-          dash.panelsJSON = angular.toJson($state.panels);
-          dash.timeFrom = dash.timeRestore ? timefilter.time.from : undefined;
-          dash.timeTo = dash.timeRestore ? timefilter.time.to : undefined;
-
-          dash.save()
-          .then(function (id) {
-            $scope.configTemplate.close('save');
-            if (id) {
-              notify.info('Saved Dashboard as "' + dash.title + '"');
-              if (dash.id !== $routeParams.id) {
-                kbnUrl.change('/dashboard/{{id}}', {id: dash.id});
-              }
-            }
-          })
-          .catch(notify.fatal);
-        };
-
-        var pendingVis = _.size($state.panels);
-        $scope.$on('ready:vis', function () {
-          if (pendingVis) pendingVis--;
-          if (pendingVis === 0) {
-            $state.save();
-            $scope.refresh();
-          }
-        });
-
-        // listen for notifications from the grid component that changes have
-        // been made, rather than watching the panels deeply
-        $scope.$on('change:vis', function () {
-          $state.save();
-        });
-
-        // called by the saved-object-finder when a user clicks a vis
-        $scope.addVis = function (hit) {
-          pendingVis++;
-          $state.panels.push({ id: hit.id, type: 'visualization' });
-        };
-
-        $scope.addSearch = function (hit) {
-          pendingVis++;
-          $state.panels.push({ id: hit.id, type: 'search' });
-        };
-
-        // Setup configurable values for config directive, after objects are initialized
-        $scope.opts = {
-          dashboard: dash,
-          save: $scope.save,
-          addVis: $scope.addVis,
-          addSearch: $scope.addSearch,
-          shareData: function () {
-            return {
-              link: $location.absUrl(),
-              // This sucks, but seems like the cleanest way. Uhg.
-              embed: '<iframe src="' + $location.absUrl().replace('?', '?embed&') +
-                '" height="600" width="800"></iframe>'
-            };
-          }
-        };
-
-        init();
-      }
-    };
-  });
-
-  var apps = require('registry/apps');
-  apps.register(function DashboardAppModule() {
-    return {
-      id: 'dashboard',
-      name: 'Dashboard',
-      order: 2
-    };
-  });
-});
diff --git a/src/kibana/plugins/dashboard/styles/main.less b/src/kibana/plugins/dashboard/styles/main.less
deleted file mode 100644
index bbe9cb9b3d77f..0000000000000
--- a/src/kibana/plugins/dashboard/styles/main.less
+++ /dev/null
@@ -1,124 +0,0 @@
-@import (reference) "../../../styles/_bootstrap.less";
-@import (reference) "../../../styles/theme/_theme.less";
-@import (reference) "../../../styles/_mixins.less";
-@import (reference) "lesshat.less";
-
-@dashboard-background: @gray-lighter;
-
-body.application-dashboard {
-  background-color: @dashboard-background;
-}
-
-dashboard-grid {
-  display: block;
-  margin: 0;
-  padding: 5px;
-}
-
-.start-screen {
-  margin: 20px;
-  background-color: @gray-lighter;
-  padding: 20px;
-}
-
-.gridster {
-  list-style-type: none;
-  display: block;
-  background-color: @dashboard-background;
-  margin: 0;
-  padding: 0;
-
-  .gs-resize-handle {
-    background-position: 50% 50% !important;
-    bottom: 0 !important;
-    right: 0 !important;
-    padding: 4px;
-    height: 25px;
-    width: 25px;
-  }
-
-  i.remove {
-    cursor: pointer;
-  }
-
-  dashboard-panel {
-    display: block;
-    height: 100%;
-    background: @panel-bg;
-    color: @text-color;
-    padding: 0;
-    overflow: hidden;
-    position: relative;
-
-    .panel {
-      margin: 0;
-      // maintain the 100% height of the panel
-      height: 100%;
-
-      // flex layout allows us to define the visualize element as "fill available space"
-      .display(flex);
-      .flex-direction(column);
-      .justify-content(flex-start);
-
-      .panel-heading {
-        .flex(0 0 auto);
-        white-space: nowrap;
-        .display(flex);
-
-        div.btn-group {
-          white-space: nowrap;
-          .flex(0 0 auto);
-        }
-
-        .panel-title {
-          font-size: inherit;
-
-          // flexbox fix for IE10
-          // http://stackoverflow.com/questions/22008135/internet-explorer-10-does-not-apply-flexbox-on-inline-elements
-          display: inline-block;
-
-          .ellipsis();
-          .flex(1 1 auto);
-        }
-
-        a {
-          color: @text-color;
-          border: none;
-          background: none;
-          padding: 0px 3px;
-          &:hover {
-            color: @link-hover-color;
-          }
-        }
-      }
-
-      .load-error {
-        text-align: center;
-        font-size: 1em;
-        .display(flex);
-        .flex(1 0 auto);
-        .justify-content(center);
-        .flex-direction(column);
-
-        .fa-exclamation-triangle {
-          font-size: 2em;
-          color: @btn-danger-bg;
-        }
-      }
-
-      .panel-content {
-        display: flex;
-        .flex(1, 1, 100%);
-        height: auto;
-      }
-    }
-  }
-}
-
-.dashboard-panel-picker > li.list-group-item {
-  border-top: 0px;
-}
-
-.dashboard-load {
-  margin: 10px;
-}
diff --git a/src/kibana/plugins/discover/components/field_chooser/discover_field.js b/src/kibana/plugins/discover/components/field_chooser/discover_field.js
deleted file mode 100644
index c846f33744222..0000000000000
--- a/src/kibana/plugins/discover/components/field_chooser/discover_field.js
+++ /dev/null
@@ -1,94 +0,0 @@
-define(function (require) {
-  var $ = require('jquery');
-  var app = require('modules').get('apps/discover');
-  var html = require('text!plugins/discover/components/field_chooser/discover_field.html');
-  var _ = require('lodash');
-
-  require('directives/css_truncate');
-  require('directives/field_name');
-
-
-  app.directive('discoverField', function ($compile) {
-    return {
-      restrict: 'E',
-      template: html,
-      replace: true,
-      link: function ($scope, $elem) {
-        var detailsElem;
-        var detailScope = $scope.$new();
-
-        var detailsHtml = require('text!plugins/discover/components/field_chooser/lib/detail_views/string.html');
-
-        var init = function () {
-          if ($scope.field.details) {
-            $scope.toggleDetails($scope.field, true);
-          }
-        };
-
-        var getWarnings = function (field) {
-          var warnings = [];
-
-          if (!field.scripted) {
-            if (!field.doc_values && !(field.analyzed && field.type === 'string')) {
-              warnings.push('Doc values are not enabled on this field. This may lead to excess heap consumption when visualizing.');
-            }
-
-            if (field.analyzed && field.type === 'string') {
-              warnings.push('This is an analyzed string field.' +
-                ' Analyzed strings are highly unique and can use a lot of memory to visualize.' +
-                ' Values such as foo-bar will be broken into foo and bar.');
-            }
-
-            if (!field.indexed) {
-              warnings.push('This field is not indexed and can not be visualized.');
-            }
-          }
-
-
-          if (field.scripted) {
-            warnings.push('Scripted fields can take a long time to execute.');
-          }
-
-          if (warnings.length > 1) {
-            warnings = warnings.map(function (warning, i) {
-              return (i > 0 ? '\n' : '') + (i + 1) + ' - ' + warning;
-            });
-          }
-
-          return warnings;
-
-        };
-
-        $scope.toggleDisplay = function (field) {
-          // inheritted param to fieldChooser
-          $scope.toggle(field.name);
-          if (field.display) $scope.increaseFieldCounter(field);
-
-          // we are now displaying the field, kill it's details
-          if (field.details) {
-            $scope.toggleDetails(field);
-          }
-        };
-
-        $scope.toggleDetails = function (field, recompute) {
-          if (_.isUndefined(field.details) || recompute) {
-            // This is inherited from fieldChooser
-            $scope.details(field, recompute);
-            detailScope.$destroy();
-            detailScope = $scope.$new();
-            detailScope.warnings = getWarnings(field);
-
-            detailsElem = $(detailsHtml);
-            $compile(detailsElem)(detailScope);
-            $elem.append(detailsElem);
-          } else {
-            delete field.details;
-            detailsElem.remove();
-          }
-        };
-
-        init();
-      }
-    };
-  });
-});
diff --git a/src/kibana/plugins/discover/components/field_chooser/field_chooser.js b/src/kibana/plugins/discover/components/field_chooser/field_chooser.js
deleted file mode 100644
index f9813c5b46026..0000000000000
--- a/src/kibana/plugins/discover/components/field_chooser/field_chooser.js
+++ /dev/null
@@ -1,258 +0,0 @@
-define(function (require) {
-  var app = require('modules').get('apps/discover');
-
-  require('directives/css_truncate');
-  require('directives/field_name');
-  require('filters/unique');
-  require('plugins/discover/components/field_chooser/discover_field');
-
-  app.directive('discFieldChooser', function ($location, globalState, config, $route, Private) {
-    var _ = require('lodash');
-    var rison = require('utils/rison');
-    var fieldCalculator = require('plugins/discover/components/field_chooser/lib/field_calculator');
-    var FieldList = Private(require('components/index_patterns/_field_list'));
-
-    return {
-      restrict: 'E',
-      scope: {
-        columns: '=',
-        hits: '=',
-        fieldCounts: '=',
-        state: '=',
-        indexPattern: '=',
-        indexPatternList: '=',
-        updateFilterInQuery: '=filter'
-      },
-      template: require('text!plugins/discover/components/field_chooser/field_chooser.html'),
-      link: function ($scope) {
-        $scope.setIndexPattern = function (id) {
-          $scope.state.index = id;
-          $scope.state.save();
-        };
-
-        $scope.$watch('state.index', function (id, previousId) {
-          if (previousId == null || previousId === id) return;
-          $route.reload();
-        });
-
-        var filter = $scope.filter = {
-          props: [
-            'type',
-            'indexed',
-            'analyzed',
-            'missing',
-            'name'
-          ],
-          defaults: {
-            missing: true
-          },
-          boolOpts: [
-            {label: 'any', value: undefined },
-            {label: 'yes', value: true },
-            {label: 'no', value: false }
-          ],
-          toggleVal: function (name, def) {
-            if (filter.vals[name] !== def) filter.vals[name] = def;
-            else filter.vals[name] = undefined;
-          },
-          reset: function () {
-            filter.vals = _.clone(filter.defaults);
-          },
-          isFieldSelected: function (field) {
-            return field.display;
-          },
-          isFieldFiltered: function (field) {
-            var matchFilter = (filter.vals.type == null || field.type === filter.vals.type);
-            var isAnalyzed = (filter.vals.analyzed == null || field.analyzed === filter.vals.analyzed);
-            var isIndexed = (filter.vals.indexed == null || field.indexed === filter.vals.indexed);
-            var scriptedOrMissing = (!filter.vals.missing || field.scripted || field.rowCount > 0);
-            var matchName = (!filter.vals.name || field.name.indexOf(filter.vals.name) !== -1);
-
-            return !field.display
-              && matchFilter
-              && isAnalyzed
-              && isIndexed
-              && scriptedOrMissing
-              && matchName
-            ;
-          },
-          popularity: function (field) {
-            return field.count > 0;
-          },
-          getActive: function () {
-            return _.some(filter.props, function (prop) {
-              return filter.vals[prop] !== filter.defaults[prop];
-            });
-          }
-        };
-
-        // set the initial values to the defaults
-        filter.reset();
-
-        $scope.$watchCollection('filter.vals', function () {
-          filter.active = filter.getActive();
-        });
-
-        $scope.toggle = function (fieldName) {
-          $scope.increaseFieldCounter(fieldName);
-          _.toggleInOut($scope.columns, fieldName);
-        };
-
-        $scope.$watchMulti([
-          '[]fieldCounts',
-          '[]columns',
-          '[]hits'
-        ], function (cur, prev) {
-          var newHits = cur[2] !== prev[2];
-          var fields = $scope.fields;
-          var columns = $scope.columns || [];
-          var fieldCounts = $scope.fieldCounts;
-
-          if (!fields || newHits) {
-            $scope.fields = fields = getFields();
-          }
-
-          if (!fields) return;
-
-          // group the fields into popular and up-popular lists
-          _.chain(fields)
-          .each(function (field) {
-            field.displayOrder = _.indexOf(columns, field.name) + 1;
-            field.display = !!field.displayOrder;
-            field.rowCount = fieldCounts[field.name];
-          })
-          .sortBy(function (field) {
-            return (field.count || 0) * -1;
-          })
-          .groupBy(function (field) {
-            if (field.display) return 'selected';
-            return field.count > 0 ? 'popular' : 'unpopular';
-          })
-          .tap(function (groups) {
-            groups.selected = _.sortBy(groups.selected || [], 'displayOrder');
-
-            groups.popular = groups.popular || [];
-            groups.unpopular = groups.unpopular || [];
-
-            // move excess popular fields to un-popular list
-            var extras = groups.popular.splice(config.get('fields:popularLimit'));
-            groups.unpopular = extras.concat(groups.unpopular);
-          })
-          .each(function (group, name) {
-            $scope[name + 'Fields'] = _.sortBy(group, name === 'selected' ? 'display' : 'name');
-          })
-          .commit();
-
-          // include undefined so the user can clear the filter
-          $scope.fieldTypes = _.union([undefined], _.pluck(fields, 'type'));
-        });
-
-        $scope.increaseFieldCounter = function (fieldName) {
-          $scope.indexPattern.popularizeField(fieldName, 1);
-        };
-
-        $scope.runAgg = function (field) {
-          var agg = {};
-          var isGeoPoint = field.type === 'geo_point';
-          var type = isGeoPoint ? 'tile_map' : 'histogram';
-          // If we're visualizing a date field, and our index is time based (and thus has a time filter),
-          // then run a date histogram
-          if (field.type === 'date' && $scope.indexPattern.timeFieldName === field.name) {
-            agg = {
-              type: 'date_histogram',
-              schema: 'segment',
-              params: {
-                field: field.name,
-                interval: 'auto'
-              }
-            };
-
-          } else if (isGeoPoint) {
-            agg = {
-              type: 'geohash_grid',
-              schema: 'segment',
-              params: {
-                field: field.name,
-                precision: 3
-              }
-            };
-          } else {
-            agg = {
-              type: 'terms',
-              schema: 'segment',
-              params: {
-                field: field.name,
-                size: config.get('discover:aggs:terms:size', 20),
-                orderBy: '2'
-              }
-            };
-          }
-
-          $location.path('/visualize/create').search({
-            indexPattern: $scope.state.index,
-            type: type,
-            _a: rison.encode({
-              filters: $scope.state.filters || [],
-              query: $scope.state.query || undefined,
-              vis: {
-                type: type,
-                aggs: [
-                  agg,
-                  {schema: 'metric', type: 'count', 'id': '2'}
-                ]
-              }
-            })
-          });
-        };
-
-        $scope.details = function (field, recompute) {
-          if (_.isUndefined(field.details) || recompute) {
-            field.details = fieldCalculator.getFieldValueCounts({
-              hits: $scope.hits,
-              field: field,
-              count: 5,
-              grouped: false
-            });
-            _.each(field.details.buckets, function (bucket) {
-              bucket.display = field.format.convert(bucket.value);
-            });
-            $scope.increaseFieldCounter(field, 1);
-          } else {
-            delete field.details;
-          }
-        };
-
-        function getFields() {
-          var prevFields = $scope.fields;
-          var indexPattern = $scope.indexPattern;
-          var hits = $scope.hits;
-          var fieldCounts = $scope.fieldCounts;
-
-          if (!indexPattern || !hits || !fieldCounts) return;
-
-          var fieldSpecs = indexPattern.fields.slice(0);
-          var fieldNamesInDocs = _.keys(fieldCounts);
-          var fieldNamesInIndexPattern = _.keys(indexPattern.fields.byName);
-
-          _.difference(fieldNamesInDocs, fieldNamesInIndexPattern)
-          .forEach(function (unknownFieldName) {
-            fieldSpecs.push({
-              name: unknownFieldName,
-              type: 'unknown'
-            });
-          });
-
-          var fields = new FieldList(indexPattern, fieldSpecs);
-
-          if (prevFields) {
-            fields.forEach(function (field) {
-              field.details = _.get(prevFields, ['byName', field.name, 'details']);
-            });
-          }
-
-          return fields;
-        }
-      }
-    };
-  });
-});
diff --git a/src/kibana/plugins/discover/directives/timechart.js b/src/kibana/plugins/discover/directives/timechart.js
deleted file mode 100644
index 562a55f36712b..0000000000000
--- a/src/kibana/plugins/discover/directives/timechart.js
+++ /dev/null
@@ -1,35 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var vislib = require('components/vislib/index');
-
-  var app = require('modules').get('apps/discover');
-
-  app.directive('discoverTimechart', function ($compile) {
-    return {
-      restrict: 'E',
-      scope : {
-        data: '='
-      },
-      link: function ($scope, elem) {
-
-        var init = function () {
-          // This elem should already have a height/width
-          var myChart = new vislib.Chart(elem[0], {
-
-          });
-
-          $scope.$watch('data', function (data) {
-            if (data != null) {
-              myChart.render(data);
-            }
-          });
-        };
-
-        // Start the directive
-        init();
-      }
-    };
-  });
-
-});
\ No newline at end of file
diff --git a/src/kibana/plugins/discover/index.js b/src/kibana/plugins/discover/index.js
deleted file mode 100644
index 57cb52392ea0b..0000000000000
--- a/src/kibana/plugins/discover/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-define(function (require, module, exports) {
-  require('plugins/discover/saved_searches/saved_searches');
-  require('plugins/discover/directives/timechart');
-  require('components/collapsible_sidebar/collapsible_sidebar');
-  require('plugins/discover/components/field_chooser/field_chooser');
-  require('plugins/discover/controllers/discover');
-  require('css!plugins/discover/styles/main.css');
-
-  var apps = require('registry/apps');
-  apps.register(function DiscoverAppModule() {
-    return {
-      id: 'discover',
-      name: 'Discover',
-      order: 0
-    };
-  });
-});
diff --git a/src/kibana/plugins/discover/styles/main.less b/src/kibana/plugins/discover/styles/main.less
deleted file mode 100644
index 4fe5f6dafd82c..0000000000000
--- a/src/kibana/plugins/discover/styles/main.less
+++ /dev/null
@@ -1,267 +0,0 @@
-@import (reference) "../../../styles/_bootstrap.less";
-@import (reference) "../../../styles/theme/_theme.less";
-@import (reference) "../../../styles/_variables.less";
-
-.application-discover {
-  overflow-x: hidden;
-}
-
-.discover {
-
-  &-wrapper {
-    padding-right: 0px !important;
-  }
-
-  &-content {
-    padding-right: @padding-base-horizontal;
-    clear: both;
-  }
-
-  &-timechart {
-    display: block;
-    position: relative;
-
-    header {
-      min-height: @input-height-base + 8px;
-      padding: 4px 0;
-    }
-
-    visualize {
-      height: 200px;
-      max-height: 600px;
-
-      &.only-spy {
-        height: auto;
-
-        .visualize-table {
-          height: auto;
-        }
-      }
-    }
-
-    .chartwrapper {
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 100%;
-    }
-
-    .vis-overlay {
-      display: flex;
-      align-items: center;
-    }
-  }
-
-  &-overlay {
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    z-index: 20;
-
-    opacity: 0.75;
-    text-align: center;
-    background-color: #ffffff;
-
-    // spinner and prorgess counter
-    > div {
-      text-align: center;
-    }
-  }
-
-  &-info {
-    background-color: @well-bg;
-    float: right;
-    padding: 5px 10px;
-    border-bottom-left-radius: @border-radius-base;
-
-    text-align: right;
-
-    &-title {
-      font-weight: bold;
-      margin-right: 10px;
-    }
-  }
-
-  &-table {
-    overflow-y: auto;
-    overflow-x: auto;
-    padding-left: 0px !important;
-    padding-right: 0px !important;
-
-    tbody {
-      font-family: "Lucida Console", Monaco, monospace;
-    }
-
-    &-footer {
-      background-color: @well-bg;
-      padding: 5px 10px;
-    }
-
-    &-details-toggle {
-      margin-bottom: 3px;
-    }
-
-    &-timefield {
-      white-space: nowrap;
-    }
-
-    &-open-icon {
-      // when switching between open and closed, the toggle changes size
-      // slightly which is a problem because it forces the entire table to
-      // re-render which is SLOW
-      width: 7px;
-    }
-  }
-
-  &-field {
-    &-filter {
-      background-color: @well-bg;
-      margin-right: 10px;
-
-      .form-group {
-        margin-bottom: 0px;
-      }
-
-    }
-
-    &-toggle {
-      color: @btn-success-color;
-      font-size: 9px;
-    }
-  }
-}
-
-.shard-failures {
-  color: @brand-danger;
-  background-color: lighten(@brand-danger, 40%) !important;
-  border: 1px solid @brand-danger;
-  border-radius: @border-radius-base;
-  padding: 0 20px 20px;
-  li {
-    padding-bottom: 5px;
-  }
-}
-
-.sidebar-item button.discover-field-toggle {
-  display: none;
-  font-size: 9px;
-  position: absolute;
-  right: 0;
-  top: 0;
-  margin: 5px 10px;
-}
-
-.sidebar-item:hover:hover button.discover-field-toggle {
-  display: block;
-}
-
-.discover-field-details {
-  border-top: 1px solid @well-border;
-  padding: 5px 10px;
-  background-color: @body-bg;
-  color: @text-color;
-
-  &-close {
-    text-align: center;
-    border-top: 1px solid @well-border;
-    background-color: @well-bg;
-
-    &:hover {
-      background-color: @sidebar-hover-bg;
-      color: @sidebar-hover-color;
-    }
-  }
-
-  &-count {
-    white-space: nowrap;
-  }
-
-  &-error {
-    margin-top: 5px;
-  }
-
-  &-item {
-    margin-top: 5px;
-  }
-
-  &-filter {
-    cursor: pointer;
-  }
-
-  a {
-    color: @link-color !important;
-  }
-
-  a.btn {
-    color: @text-color !important;
-  }
-
-  .progress {
-    margin-bottom: 0px;
-
-    .progress-bar {
-      padding-left: 10px;
-      text-align: right;
-      line-height: 18px;
-      max-width: 100%;
-      border-radius: 4px;
-
-      span {
-        background-color: @gray;
-        padding: 3px;
-        border-radius: 4px;
-        margin-left: 3px;
-        margin-right: 3px;
-      }
-    }
-  }
-}
-
-field-name,
-[field-name] {
-  > i {
-    margin-right: 5px;
-    text-align: center;
-    display: inline-block;
-    width: 12px;
-    color: @text-muted;
-  }
-
-  &.no-results {
-    color: @text-muted;
-  }
-}
-
-disc-field-chooser {
-  ul.discover-selected-fields {
-    /* If only _source is presend in the selected fields list, hide its toggle button */
-    li:first-child:nth-last-child(1)[field=_source] button.discover-field-toggle {
-      display: none;
-    }
-  }
-
-  .sidebar-item-title {
-    position: relative;
-  }
-}
-
-.results {
-  h3 {
-    margin: -20px 0 10px 0;
-    text-align: center;
-  }
-
-  &-interval {
-    a {
-      text-decoration: underline;;
-    }
-
-    select {
-      display: inline-block;
-      width: auto;
-    }
-  }
-}
diff --git a/src/kibana/plugins/doc/controllers/doc.js b/src/kibana/plugins/doc/controllers/doc.js
deleted file mode 100644
index 075aa87d554d6..0000000000000
--- a/src/kibana/plugins/doc/controllers/doc.js
+++ /dev/null
@@ -1,75 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
-
-  require('components/notify/notify');
-  require('components/courier/courier');
-  require('components/doc_viewer/doc_viewer');
-  require('components/index_patterns/index_patterns');
-
-  var app = require('modules').get('apps/doc', [
-    'kibana/notify',
-    'kibana/courier',
-    'kibana/index_patterns'
-  ]);
-
-  var html = require('text!plugins/doc/index.html');
-
-  var resolveIndexPattern = {
-    indexPattern: function (courier, savedSearches, $route) {
-      return courier.indexPatterns.get($route.current.params.indexPattern);
-    }
-  };
-
-  require('routes')
-  .when('/doc/:indexPattern/:index/:type/:id', {
-    template: html,
-    resolve: resolveIndexPattern
-  })
-  .when('/doc/:indexPattern/:index/:type', {
-    template: html,
-    resolve: resolveIndexPattern
-  });
-
-  app.controller('doc', function ($scope, $route, es, timefilter) {
-
-    timefilter.enabled = false;
-
-    // Pretty much only need this for formatting, not actually using it for fetching anything.
-    $scope.indexPattern = $route.current.locals.indexPattern;
-
-    var computedFields = $scope.indexPattern.getComputedFields();
-
-    es.search({
-      index: $route.current.params.index,
-      body: {
-        query: {
-          ids: {
-            type: $route.current.params.type,
-            values: [$route.current.params.id]
-          }
-        },
-        fields: computedFields.fields,
-        script_fields: computedFields.scriptFields,
-        fielddata_fields: computedFields.fielddataFields
-      }
-    }).then(function (resp) {
-      if (resp.hits) {
-        if (resp.hits.total < 1) {
-          $scope.status = 'notFound';
-        } else {
-          $scope.status = 'found';
-          $scope.hit = resp.hits.hits[0];
-        }
-      }
-    }).catch(function (err) {
-      if (err.status === 404) {
-        $scope.status = 'notFound';
-      } else {
-        $scope.status = 'error';
-        $scope.resp = err;
-      }
-    });
-
-  });
-});
diff --git a/src/kibana/plugins/doc/index.js b/src/kibana/plugins/doc/index.js
deleted file mode 100644
index 70b8ab3c75a41..0000000000000
--- a/src/kibana/plugins/doc/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-define(function (require, module, exports) {
-  require('plugins/doc/controllers/doc');
-
-  var apps = require('registry/apps');
-  apps.register(function DocAppModule() {
-    return {
-      id: 'doc',
-      name: 'Doc Viewer',
-      order: -1
-    };
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/plugins/kbn_vislib_vis_types/controls/line_interpolation_option.js b/src/kibana/plugins/kbn_vislib_vis_types/controls/line_interpolation_option.js
deleted file mode 100644
index e217f2ced5ead..0000000000000
--- a/src/kibana/plugins/kbn_vislib_vis_types/controls/line_interpolation_option.js
+++ /dev/null
@@ -1,13 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var module = require('modules').get('kibana');
-
-  module.directive('lineInterpolationOption', function ($parse, $compile) {
-    return {
-      restrict: 'E',
-      template: require('text!plugins/kbn_vislib_vis_types/controls/line_interpolation_option.html'),
-      replace: true
-    };
-  });
-});
diff --git a/src/kibana/plugins/kbn_vislib_vis_types/controls/point_series_options.js b/src/kibana/plugins/kbn_vislib_vis_types/controls/point_series_options.js
deleted file mode 100644
index bd5a2dab59b29..0000000000000
--- a/src/kibana/plugins/kbn_vislib_vis_types/controls/point_series_options.js
+++ /dev/null
@@ -1,14 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var module = require('modules').get('kibana');
-  require('directives/inequality');
-
-  module.directive('pointSeriesOptions', function ($parse, $compile) {
-    return {
-      restrict: 'E',
-      template: require('text!plugins/kbn_vislib_vis_types/controls/point_series_options.html'),
-      replace: true
-    };
-  });
-});
diff --git a/src/kibana/plugins/kbn_vislib_vis_types/controls/vislib_basic_options.js b/src/kibana/plugins/kbn_vislib_vis_types/controls/vislib_basic_options.js
deleted file mode 100644
index 70a97ca857a51..0000000000000
--- a/src/kibana/plugins/kbn_vislib_vis_types/controls/vislib_basic_options.js
+++ /dev/null
@@ -1,13 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var module = require('modules').get('kibana');
-
-  module.directive('vislibBasicOptions', function ($parse, $compile) {
-    return {
-      restrict: 'E',
-      template: require('text!plugins/kbn_vislib_vis_types/controls/vislib_basic_options.html'),
-      replace: true
-    };
-  });
-});
diff --git a/src/kibana/plugins/kbn_vislib_vis_types/histogram.js b/src/kibana/plugins/kbn_vislib_vis_types/histogram.js
deleted file mode 100644
index e81c1bd498a7d..0000000000000
--- a/src/kibana/plugins/kbn_vislib_vis_types/histogram.js
+++ /dev/null
@@ -1,67 +0,0 @@
-define(function (require) {
-  return function HistogramVisType(Private) {
-    var VislibVisType = Private(require('components/vislib_vis_type/VislibVisType'));
-    var Schemas = Private(require('components/vis/Schemas'));
-
-    return new VislibVisType({
-      name: 'histogram',
-      title: 'Vertical bar chart',
-      icon: 'fa-bar-chart',
-      description: 'The goto chart for oh-so-many needs. Great for time and non-time data. Stacked or grouped, ' +
-      'exact numbers or percentages. If you are not sure which chart your need, you could do worse than to start here.',
-      params: {
-        defaults: {
-          shareYAxis: true,
-          addTooltip: true,
-          addLegend: true,
-          scale: 'linear',
-          mode: 'stacked',
-          times: [],
-          addTimeMarker: false,
-          defaultYExtents: false,
-          setYExtents: false,
-          yAxis: {}
-        },
-        scales: ['linear', 'log', 'square root'],
-        modes: ['stacked', 'percentage', 'grouped'],
-        editor: require('text!plugins/kbn_vislib_vis_types/editors/histogram.html')
-      },
-      schemas: new Schemas([
-        {
-          group: 'metrics',
-          name: 'metric',
-          title: 'Y-Axis',
-          min: 1,
-          aggFilter: '!std_dev',
-          defaults: [
-            { schema: 'metric', type: 'count' }
-          ]
-        },
-        {
-          group: 'buckets',
-          name: 'segment',
-          title: 'X-Axis',
-          min: 0,
-          max: 1,
-          aggFilter: '!geohash_grid'
-        },
-        {
-          group: 'buckets',
-          name: 'group',
-          title: 'Split Bars',
-          min: 0,
-          max: 1,
-          aggFilter: '!geohash_grid'
-        },
-        {
-          group: 'buckets',
-          name: 'split',
-          title: 'Split Chart',
-          min: 0,
-          max: 1,
-          aggFilter: '!geohash_grid'
-        }
-      ])
-    });
-  };
-});
diff --git a/src/kibana/plugins/kbn_vislib_vis_types/index.js b/src/kibana/plugins/kbn_vislib_vis_types/index.js
deleted file mode 100644
index 1711eeca12880..0000000000000
--- a/src/kibana/plugins/kbn_vislib_vis_types/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-define(function (require) {
-  var visTypes = require('registry/vis_types');
-  visTypes.register(require('plugins/kbn_vislib_vis_types/histogram'));
-  visTypes.register(require('plugins/kbn_vislib_vis_types/line'));
-  visTypes.register(require('plugins/kbn_vislib_vis_types/pie'));
-  visTypes.register(require('plugins/kbn_vislib_vis_types/area'));
-  visTypes.register(require('plugins/kbn_vislib_vis_types/tileMap'));
-});
diff --git a/src/kibana/plugins/kbn_vislib_vis_types/pie.js b/src/kibana/plugins/kbn_vislib_vis_types/pie.js
deleted file mode 100644
index ebbc741246b90..0000000000000
--- a/src/kibana/plugins/kbn_vislib_vis_types/pie.js
+++ /dev/null
@@ -1,57 +0,0 @@
-define(function (require) {
-  return function HistogramVisType(Private) {
-    var VislibVisType = Private(require('components/vislib_vis_type/VislibVisType'));
-    var Schemas = Private(require('components/vis/Schemas'));
-
-    return new VislibVisType({
-      name: 'pie',
-      title: 'Pie chart',
-      icon: 'fa-pie-chart',
-      description: 'Pie charts are ideal for displaying the parts of some whole. For example, sales percentages by department.' +
-       'Pro Tip: Pie charts are best used sparingly, and with no more than 7 slices per pie.',
-      params: {
-        defaults: {
-          shareYAxis: true,
-          addTooltip: true,
-          addLegend: true,
-          isDonut: false
-        },
-        editor: require('text!plugins/kbn_vislib_vis_types/editors/pie.html')
-      },
-      responseConverter: false,
-      hierarchicalData: true,
-      schemas: new Schemas([
-        {
-          group: 'metrics',
-          name: 'metric',
-          title: 'Slice Size',
-          min: 1,
-          max: 1,
-          aggFilter: ['sum', 'count', 'cardinality'],
-          defaults: [
-            { schema: 'metric', type: 'count' }
-          ]
-        },
-        {
-          group: 'buckets',
-          name: 'segment',
-          icon: 'fa fa-scissors',
-          title: 'Split Slices',
-          min: 0,
-          max: Infinity,
-          aggFilter: '!geohash_grid'
-        },
-        {
-          group: 'buckets',
-          name: 'split',
-          icon: 'fa fa-th',
-          title: 'Split Chart',
-          mustBeFirst: true,
-          min: 0,
-          max: 1,
-          aggFilter: '!geohash_grid'
-        }
-      ])
-    });
-  };
-});
diff --git a/src/kibana/plugins/kibana/_apps.js b/src/kibana/plugins/kibana/_apps.js
deleted file mode 100644
index 10182f2a262f3..0000000000000
--- a/src/kibana/plugins/kibana/_apps.js
+++ /dev/null
@@ -1,47 +0,0 @@
-define(function (require) {
-  return function KbnControllerApps(Private, $rootScope, $scope, $location, globalState, sessionStorage) {
-    var _ = require('lodash');
-
-    function appKey(app) {
-      return 'lastPath:' + app.id;
-    }
-
-    function assignPaths(app) {
-      app.rootPath = '/' + app.id;
-      app.lastPath = sessionStorage.get(appKey(app)) || app.rootPath;
-      return app.lastPath;
-    }
-
-    function getShow(app) {
-      app.show = app.order >= 0 ? true : false;
-    }
-
-    function setLastPath(app, path) {
-      app.lastPath = path;
-      return sessionStorage.set(appKey(app), path);
-    }
-
-    $scope.apps = Private(require('registry/apps'));
-    // initialize each apps lastPath (fetch it from storage)
-    $scope.apps.forEach(assignPaths);
-    $scope.apps.forEach(getShow);
-
-
-    function onRouteChange() {
-      var route = $location.path().split(/\//);
-      $scope.apps.forEach(function (app) {
-        if (app.active = app.id === route[1]) {
-          $rootScope.activeApp = app;
-        }
-      });
-
-      if (!$rootScope.activeApp || $scope.appEmbedded) return;
-
-      // Record the last URL w/ state of the app, use for tab.
-      setLastPath($rootScope.activeApp, globalState.removeFromUrl($location.url()));
-    }
-
-    $rootScope.$on('$routeChangeSuccess', onRouteChange);
-    $rootScope.$on('$routeUpdate', onRouteChange);
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/plugins/kibana/_init.js b/src/kibana/plugins/kibana/_init.js
deleted file mode 100644
index fff02851b843f..0000000000000
--- a/src/kibana/plugins/kibana/_init.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(function (require) {
-  return function KibanaControllerInit($rootScope, $scope, $location, courier, $http, globalState, notify) {
-    // expose some globals
-    $rootScope.globalState = globalState;
-
-    // and some local values
-    $scope.appEmbedded = $location.search().embed || false;
-    $scope.httpActive = $http.pendingRequests;
-    $scope.notifList = notify._notifs;
-
-    // wait for the application to finish loading
-    $scope.$on('application.load', function () {
-      courier.start();
-    });
-  };
-});
diff --git a/src/kibana/plugins/kibana/_timepicker.html b/src/kibana/plugins/kibana/_timepicker.html
deleted file mode 100644
index eba7059e3db0f..0000000000000
--- a/src/kibana/plugins/kibana/_timepicker.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<kbn-timepicker
-  from="timefilter.time.from"
-  to="timefilter.time.to"
-  mode="timefilter.time.mode"
-  active-tab="timefilter.timepickerActiveTab"
-  interval="timefilter.refreshInterval">
-</kbn-timepicker>
diff --git a/src/kibana/plugins/kibana/_timepicker.js b/src/kibana/plugins/kibana/_timepicker.js
deleted file mode 100644
index 60248da3fb2e7..0000000000000
--- a/src/kibana/plugins/kibana/_timepicker.js
+++ /dev/null
@@ -1,32 +0,0 @@
-define(function (require) {
-  return function KbnControllerTimefilter(notify, $scope, timefilter, globalState, sessionStorage) {
-    var _ = require('lodash');
-
-    $scope.notifList = notify._notifs;
-    $scope.timefilter = timefilter;
-
-    $scope.$listen(timefilter, 'update', function (newVal, oldVal) {
-      globalState.time = _.clone(timefilter.time);
-      globalState.refreshInterval = _.clone(timefilter.refreshInterval);
-      globalState.save();
-    });
-
-    var timepickerHtml = require('text!plugins/kibana/_timepicker.html');
-    $scope.toggleTimepicker = function (tab) {
-      tab = tab || timefilter.timepickerActiveTab || 'filter';
-
-      // Close if already open
-      if ($scope.globalConfigTemplate === timepickerHtml && timefilter.timepickerActiveTab === tab) {
-        delete $scope.globalConfigTemplate;
-        delete timefilter.timepickerActiveTab;
-      } else {
-        timefilter.timepickerActiveTab = tab;
-        $scope.globalConfigTemplate = timepickerHtml;
-      }
-    };
-
-    $scope.toggleRefresh = function () {
-      timefilter.refreshInterval.pause = !timefilter.refreshInterval.pause;
-    };
-  };
-});
diff --git a/src/kibana/plugins/kibana/index.js b/src/kibana/plugins/kibana/index.js
deleted file mode 100644
index 4f1d6ca4ecad2..0000000000000
--- a/src/kibana/plugins/kibana/index.js
+++ /dev/null
@@ -1,65 +0,0 @@
-define(function (require) {
-  // base angular components/directives we expect to be loaded
-  require('angular-bootstrap');
-  require('services/private');
-  require('components/config/config');
-  require('components/courier/courier');
-  require('components/filter_bar/filter_bar');
-  require('components/notify/notify');
-  require('components/persisted_log/persisted_log');
-  require('components/state_management/app_state');
-  require('components/storage/storage');
-  require('components/url/url');
-  require('components/doc_title/doc_title');
-  require('components/tooltip/tooltip');
-  require('components/style_compile/style_compile');
-  require('components/watch_multi');
-  require('components/bind');
-  require('components/listen');
-  require('components/fancy_forms/fancy_forms');
-  require('components/stringify/register');
-  require('directives/click_focus');
-  require('directives/info');
-  require('directives/spinner');
-  require('directives/paginate');
-  require('directives/pretty_duration');
-  require('directives/rows');
-
-  var Notifier = require('components/notify/_notifier');
-
-  // ensure that the kibana module requires ui.bootstrap
-  require('modules')
-  .get('kibana', ['ui.bootstrap'])
-  .config(function ($tooltipProvider) {
-    $tooltipProvider.setTriggers({ 'mouseenter': 'mouseleave click' });
-  })
-  .directive('kibana', function (Private, $rootScope, $injector, Promise, config, kbnSetup) {
-    return {
-      template: require('text!plugins/kibana/kibana.html'),
-      controllerAs: 'kibana',
-      controller: function ($scope) {
-        var _ = require('lodash');
-        var self = $rootScope.kibana = this;
-        var notify = new Notifier({ location: 'Kibana' });
-
-        // this is the only way to handle uncaught route.resolve errors
-        $rootScope.$on('$routeChangeError', function (event, next, prev, err) {
-          notify.fatal(err);
-        });
-
-        // run init functions before loading the mixins, so that we can ensure that
-        // the environment is ready for them to get and use their dependencies
-        self.ready = Promise.all([ kbnSetup(), config.init() ])
-        .then(function () {
-          // load some "mixins"
-          var mixinLocals = { $scope: $scope, notify: notify };
-          $injector.invoke(require('plugins/kibana/_init'), self, mixinLocals);
-          $injector.invoke(require('plugins/kibana/_apps'), self, mixinLocals);
-          $injector.invoke(require('plugins/kibana/_timepicker'), self, mixinLocals);
-
-          $scope.setupComplete = true;
-        });
-      }
-    };
-  });
-});
diff --git a/src/kibana/plugins/kibana/kibana.html b/src/kibana/plugins/kibana/kibana.html
deleted file mode 100644
index 53ce1359c7892..0000000000000
--- a/src/kibana/plugins/kibana/kibana.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<kbn-notifications list="notifList"></kbn-notifications>
-<div class="content" style="display: none;">
-  <nav ng-class="{show: appEmbedded === false}" bindonce class="hide navbar navbar-inverse navbar-static-top">
-    <div class="navbar-header">
-      <button ng-click="showCollapsed = !showCollapsed" type="button" class="navbar-toggle">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <span class="navbar-brand visible-xs">{{ activeApp.name }}
-        <span ng-show="httpActive.length" class="spinner"></span>
-      </span>
-    </div>
-
-    <!-- Full navbar -->
-    <div collapse="!showCollapsed" class="navbar-collapse" id="kibana-primary-navbar">
-      <ul class="nav navbar-nav" role="navigation">
-        <li aria-label="Kibana Barcode Logo" class="logo hidden-xs"></li>
-        <li ng-repeat="app in apps.inOrder | filter:{show: true}" ng-class="{active: activeApp === app}">
-          <a ng-href="#{{app === activeApp ? app.rootPath : app.lastPath}}" bo-text="app.name"></a>
-        </li>
-      </ul>
-
-      <ul ng-if="setupComplete" ng-show="timefilter.enabled" class="nav navbar-nav navbar-right navbar-timepicker">
-        <li>
-          <a  ng-click="toggleRefresh()"
-              ng-show="timefilter.refreshInterval.value > 0">
-            <i class="fa" ng-class="timefilter.refreshInterval.pause ? 'fa-play' : 'fa-pause'"></i>
-          </a>
-        </li>
-
-        <li ng-class="{active: timefilter.timepickerActiveTab === 'interval'}"
-            ng-show="timefilter.refreshInterval.value > 0 || timefilter.timepickerActiveTab"
-            class="to-body">
-          <a  ng-click="toggleTimepicker('interval')"
-              class="navbar-timepicker-auto-refresh-desc">
-            <span ng-show="timefilter.refreshInterval.value === 0"><i class="fa fa-repeat"></i> Auto-refresh</span>
-            <span ng-show="timefilter.refreshInterval.value > 0">{{timefilter.refreshInterval.display}}</span>
-          </a>
-        </li>
-
-        <li class="to-body" ng-class="{active: timefilter.timepickerActiveTab === 'filter'}">
-          <a  ng-click="toggleTimepicker('filter')" aria-haspopup="true" aria-expanded="false" class="navbar-timepicker-time-desc">
-            <i aria-hidden="true" class="fa fa-clock-o"></i>
-            <pretty-duration from="timefilter.time.from" to="timefilter.time.to"></pretty-duration>
-          </a>
-        </li>
-      </ul>
-
-      <ul class="nav navbar-nav navbar-right navbar-timepicker" >
-        <li ng-show="httpActive.length" class="navbar-text hidden-xs">
-          <div class="spinner"></div>
-        </li>
-      </ul>
-      <!-- /Full navbar -->
-    </div>
-  </nav>
-
-  <config
-    ng-show="timefilter.enabled"
-    config-template="globalConfigTemplate"
-    config-object="timefilter"
-    config-close="toggleTimepicker">
-  </config>
-
-  <div class="application" ng-view></div>
-</div>
diff --git a/src/kibana/plugins/markdown_vis/index.js b/src/kibana/plugins/markdown_vis/index.js
deleted file mode 100644
index e3c521da51a64..0000000000000
--- a/src/kibana/plugins/markdown_vis/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-define(function (require) {
-  require('registry/vis_types').register(function (Private) {
-    return Private(require('plugins/markdown_vis/markdown_vis'));
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/plugins/markdown_vis/markdown_vis.js b/src/kibana/plugins/markdown_vis/markdown_vis.js
deleted file mode 100644
index 8e74efb46daea..0000000000000
--- a/src/kibana/plugins/markdown_vis/markdown_vis.js
+++ /dev/null
@@ -1,25 +0,0 @@
-define(function (require) {
-  // we need to load the css ourselves
-  require('css!plugins/markdown_vis/markdown_vis.css');
-
-  // we also need to load the controller and used by the template
-  require('plugins/markdown_vis/markdown_vis_controller');
-
-  return function (Private) {
-    var TemplateVisType = Private(require('components/template_vis_type/TemplateVisType'));
-
-    // return the visType object, which kibana will use to display and configure new
-    // Vis object of this type.
-    return new TemplateVisType({
-      name: 'markdown',
-      title: 'Markdown widget',
-      icon: 'fa-code',
-      description: 'Useful for displaying explanations or instructions for dashboards.',
-      template: require('text!plugins/markdown_vis/markdown_vis.html'),
-      params: {
-        editor: require('text!plugins/markdown_vis/markdown_vis_params.html')
-      },
-      requiresSearch: false
-    });
-  };
-});
diff --git a/src/kibana/plugins/markdown_vis/markdown_vis.less b/src/kibana/plugins/markdown_vis/markdown_vis.less
deleted file mode 100644
index 6f3660876cfce..0000000000000
--- a/src/kibana/plugins/markdown_vis/markdown_vis.less
+++ /dev/null
@@ -1,31 +0,0 @@
-@import (reference) "../../styles/_mixins.less";
-@import (reference) "lesshat.less";
-
-.markdown-vis {
-  padding: 1em;
-  width: 100%;
-}
-
-.vis-editor {
-
-  &.vis-type-markdown {
-
-    .visualization-options {
-      .flex-parent();
-      .flex(1, 1, auto);
-    }
-
-    .markdown-vis-options {
-      .flex-parent();
-      .flex(1, 1, auto);
-
-      textarea {
-        .flex(1, 1, auto);
-        resize: none;
-      }
-
-    }
-
-  }
-
-}
diff --git a/src/kibana/plugins/markdown_vis/markdown_vis_controller.js b/src/kibana/plugins/markdown_vis/markdown_vis_controller.js
deleted file mode 100644
index 591d2f8c1c352..0000000000000
--- a/src/kibana/plugins/markdown_vis/markdown_vis_controller.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(function (require) {
-  var marked = require('marked');
-  marked.setOptions({
-    gfm: true, // Github-flavored markdown
-    sanitize: true // Sanitize HTML tags
-  });
-
-  var module = require('modules').get('kibana/markdown_vis', ['kibana']);
-  module.controller('KbnMarkdownVisController', function ($scope, $sce) {
-    $scope.$watch('vis.params.markdown', function (html) {
-      if (!html) return;
-      $scope.html = $sce.trustAsHtml(marked(html));
-    });
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/plugins/metric_vis/index.js b/src/kibana/plugins/metric_vis/index.js
deleted file mode 100644
index 1fd0cfab5245a..0000000000000
--- a/src/kibana/plugins/metric_vis/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-define(function (require) {
-  require('registry/vis_types').register(function (Private) {
-    return Private(require('plugins/metric_vis/metric_vis'));
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/plugins/metric_vis/metric_vis.js b/src/kibana/plugins/metric_vis/metric_vis.js
deleted file mode 100644
index b39596c660dd6..0000000000000
--- a/src/kibana/plugins/metric_vis/metric_vis.js
+++ /dev/null
@@ -1,40 +0,0 @@
-define(function (require) {
-  // we need to load the css ourselves
-  require('css!plugins/metric_vis/metric_vis.css');
-
-  // we also need to load the controller and used by the template
-  require('plugins/metric_vis/metric_vis_controller');
-
-  return function (Private) {
-    var TemplateVisType = Private(require('components/template_vis_type/TemplateVisType'));
-    var Schemas = Private(require('components/vis/Schemas'));
-
-    // return the visType object, which kibana will use to display and configure new
-    // Vis object of this type.
-    return new TemplateVisType({
-      name: 'metric',
-      title: 'Metric',
-      description: 'One big number for all of your one big number needs. Perfect for show ' +
-        'a count of hits, or the exact average a numeric field.',
-      icon: 'fa-calculator',
-      template: require('text!plugins/metric_vis/metric_vis.html'),
-      params: {
-        defaults: {
-          fontSize: 60
-        },
-        editor: require('text!plugins/metric_vis/metric_vis_params.html')
-      },
-      schemas: new Schemas([
-        {
-          group: 'metrics',
-          name: 'metric',
-          title: 'Metric',
-          min: 1,
-          defaults: [
-            { type: 'count', schema: 'metric' }
-          ]
-        }
-      ])
-    });
-  };
-});
diff --git a/src/kibana/plugins/metric_vis/metric_vis.less b/src/kibana/plugins/metric_vis/metric_vis.less
deleted file mode 100644
index dd386e2f50eac..0000000000000
--- a/src/kibana/plugins/metric_vis/metric_vis.less
+++ /dev/null
@@ -1,23 +0,0 @@
-@import (reference) "../../styles/_mixins.less";
-@import (reference) "lesshat.less";
-
-.metric-vis {
-  width: 100%;
-  .display(flex);
-  .flex-direction(row);
-  .flex-wrap(wrap);
-  .justify-content(space-around);
-  .align-items(center);
-  .align-content(space-around);
-
-  .metric-value {
-    font-weight: bold;
-    .ellipsis();
-  }
-
-  .metric-container {
-    text-align: center;
-    padding: 1em;
-    .flex();
-  }
-}
\ No newline at end of file
diff --git a/src/kibana/plugins/metric_vis/metric_vis_controller.js b/src/kibana/plugins/metric_vis/metric_vis_controller.js
deleted file mode 100644
index 6f764dcb0a268..0000000000000
--- a/src/kibana/plugins/metric_vis/metric_vis_controller.js
+++ /dev/null
@@ -1,30 +0,0 @@
-define(function (require) {
-  // get the kibana/metric_vis module, and make sure that it requires the "kibana" module if it
-  // didn't already
-  var module = require('modules').get('kibana/metric_vis', ['kibana']);
-
-  module.controller('KbnMetricVisController', function ($scope, Private) {
-    var tabifyAggResponse = Private(require('components/agg_response/tabify/tabify'));
-
-    var metrics = $scope.metrics = [];
-
-    $scope.processTableGroups = function (tableGroups) {
-      tableGroups.tables.forEach(function (table) {
-        table.columns.forEach(function (column, i) {
-          var fieldFormatter = table.aggConfig(column).fieldFormatter();
-          metrics.push({
-            label: column.title,
-            value: fieldFormatter(table.rows[0][i])
-          });
-        });
-      });
-    };
-
-    $scope.$watch('esResponse', function (resp) {
-      if (resp) {
-        metrics.length = 0;
-        $scope.processTableGroups(tabifyAggResponse($scope.vis, resp));
-      }
-    });
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/plugins/settings/index.js b/src/kibana/plugins/settings/index.js
deleted file mode 100644
index 4d1b2a30b1a21..0000000000000
--- a/src/kibana/plugins/settings/index.js
+++ /dev/null
@@ -1,41 +0,0 @@
-define(function (require, module, exports) {
-  var _ = require('lodash');
-
-  require('css!plugins/settings/styles/main.css');
-  require('filters/start_from');
-
-  require('routes')
-  .when('/settings', {
-    redirectTo: '/settings/indices'
-  });
-
-  require('modules').get('apps/settings')
-  .directive('kbnSettingsApp', function (Private, $route, timefilter) {
-    return {
-      restrict: 'E',
-      template: require('text!plugins/settings/app.html'),
-      transclude: true,
-      scope: {
-        sectionName: '@section'
-      },
-      link: function ($scope, $el) {
-        timefilter.enabled = false;
-        $scope.sections = require('plugins/settings/sections/index');
-        $scope.section = _.find($scope.sections, { name: $scope.sectionName });
-
-        $scope.sections.forEach(function (section) {
-          section.class = (section === $scope.section) ? 'active' : void 0;
-        });
-      }
-    };
-  });
-
-  var apps = require('registry/apps');
-  apps.register(function SettingsAppModule() {
-    return {
-      id: 'settings',
-      name: 'Settings',
-      order: 3
-    };
-  });
-});
diff --git a/src/kibana/plugins/settings/sections/about/index.html b/src/kibana/plugins/settings/sections/about/index.html
deleted file mode 100644
index e1793187d953b..0000000000000
--- a/src/kibana/plugins/settings/sections/about/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<kbn-settings-app section="about">
-  <div class="kbn-settings-about container" ng-controller="settingsAbout">
-    <div class="col-md-4 col-md-offset-4 jumbotron">
-      <center>
-        <img src='plugins/settings/sections/about/barcode.svg' alt="Kibana Barcode Logo" width="128" height="128"><br>
-        <h1>Kibana</h1>
-        <p>
-          <table class="table table-condensed kbn-settings-about-versions">
-            <tr>
-              <td>Version</td>
-              <td>{{kbnVersion}}</td>
-            </tr>
-
-            <tr>
-              <td>Build</td>
-              <td>{{buildNum}}</td>
-            </tr>
-
-            <tr>
-              <td>Commit SHA</td>
-              <td>{{commitSha | limitTo:7}}</td>
-            </tr>
-
-          </table>
-        </p>
-        <small>© 2015 All Rights Reserved - Elasticsearch</small>
-      </center>
-    </div>
-  </div>
-</kbn-settings-app>
\ No newline at end of file
diff --git a/src/kibana/plugins/settings/sections/about/index.js b/src/kibana/plugins/settings/sections/about/index.js
deleted file mode 100644
index 796d8101edbfe..0000000000000
--- a/src/kibana/plugins/settings/sections/about/index.js
+++ /dev/null
@@ -1,22 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  require('routes')
-  .when('/settings/about', {
-    template: require('text!plugins/settings/sections/about/index.html')
-  });
-
-  require('modules').get('apps/settings')
-  .controller('settingsAbout', function ($scope, kbnVersion, buildNum, commitSha) {
-    $scope.kbnVersion = kbnVersion;
-    $scope.buildNum = buildNum;
-    $scope.commitSha = commitSha;
-  });
-
-  return {
-    order: Infinity,
-    name: 'about',
-    display: 'About',
-    url: '#/settings/about'
-  };
-});
\ No newline at end of file
diff --git a/src/kibana/plugins/settings/sections/advanced/index.js b/src/kibana/plugins/settings/sections/advanced/index.js
deleted file mode 100644
index 46aee5da68de9..0000000000000
--- a/src/kibana/plugins/settings/sections/advanced/index.js
+++ /dev/null
@@ -1,73 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var getValType = require('plugins/settings/sections/advanced/lib/get_val_type');
-
-
-  require('plugins/settings/sections/advanced/advanced_row');
-
-  require('routes')
-  .when('/settings/advanced', {
-    template: require('text!plugins/settings/sections/advanced/index.html')
-  });
-
-  require('modules').get('apps/settings')
-  .directive('kbnSettingsAdvanced', function (config, Notifier, Private, $rootScope) {
-    return {
-      restrict: 'E',
-      link: function ($scope) {
-        var configDefaults = Private(require('components/config/defaults'));
-        var keyCodes = {
-          ESC: 27
-        };
-
-        var NAMED_EDITORS = ['json', 'array', 'boolean', 'select'];
-        var NORMAL_EDITOR = ['number', 'string', 'null', 'undefined'];
-
-        function getEditorType(conf) {
-          if (_.contains(NAMED_EDITORS, conf.type)) return conf.type;
-          if (_.contains(NORMAL_EDITOR, conf.type)) return 'normal';
-        }
-
-        function isTypeComplex(conf) {
-          return !(conf.json || conf.array || conf.bool || conf.normal);
-        }
-
-        function readConfigVals() {
-          var configVals = config._vals();
-
-          $scope.configs = _.map(configDefaults, function (def, name) {
-            var val = configVals[name];
-            var conf = {
-              name: name,
-              defVal: def.value,
-              type: getValType(def, val),
-              description: def.description,
-              options: def.options,
-              value: val,
-            };
-
-            var editor = getEditorType(conf);
-            conf.json = editor === 'json';
-            conf.select = editor === 'select';
-            conf.bool = editor === 'boolean';
-            conf.array = editor === 'array';
-            conf.normal = editor === 'normal';
-            conf.tooComplex = !editor;
-
-            return conf;
-          });
-        }
-
-        readConfigVals();
-        $rootScope.$on('change:config', readConfigVals);
-      }
-    };
-  });
-
-  return {
-    order: 2,
-    name: 'advanced',
-    display: 'Advanced',
-    url: '#/settings/advanced'
-  };
-});
diff --git a/src/kibana/plugins/settings/sections/index.js b/src/kibana/plugins/settings/sections/index.js
deleted file mode 100644
index 0f0eeaeab18a1..0000000000000
--- a/src/kibana/plugins/settings/sections/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-define(function (require) {
-  // each of these private modules returns an object defining that section, their properties
-  // are used to create the nav bar
-  return [
-    require('plugins/settings/sections/indices/index'),
-    require('plugins/settings/sections/advanced/index'),
-    require('plugins/settings/sections/objects/index'),
-    require('plugins/settings/sections/about/index')
-  ];
-});
\ No newline at end of file
diff --git a/src/kibana/plugins/settings/sections/indices/_refresh_kibana_index.js b/src/kibana/plugins/settings/sections/indices/_refresh_kibana_index.js
deleted file mode 100644
index 0c49bc9c26865..0000000000000
--- a/src/kibana/plugins/settings/sections/indices/_refresh_kibana_index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-define(function (require) {
-  return function RefreshKibanaIndexFn(es, configFile) {
-    return function () {
-      return es.indices.refresh({
-        index: configFile.kibana_index
-      });
-    };
-  };
-});
diff --git a/src/kibana/plugins/settings/sections/indices/index.js b/src/kibana/plugins/settings/sections/indices/index.js
deleted file mode 100644
index 02dab8babe119..0000000000000
--- a/src/kibana/plugins/settings/sections/indices/index.js
+++ /dev/null
@@ -1,51 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  require('plugins/settings/sections/indices/_create');
-  require('plugins/settings/sections/indices/_edit');
-  require('plugins/settings/sections/indices/_field_editor');
-
-  // add a dependency to all of the subsection routes
-  require('routes')
-  .defaults(/settings\/indices/, {
-    resolve: {
-      indexPatternIds: function (courier) {
-        return courier.indexPatterns.getIds();
-      }
-    }
-  });
-
-  // wrapper directive, which sets some global stuff up like the left nav
-  require('modules').get('apps/settings')
-  .directive('kbnSettingsIndices', function ($route, config, kbnUrl) {
-    return {
-      restrict: 'E',
-      transclude: true,
-      template: require('text!plugins/settings/sections/indices/index.html'),
-      link: function ($scope) {
-        $scope.edittingId = $route.current.params.indexPatternId;
-        config.$bind($scope, 'defaultIndex');
-
-        $scope.$watch('defaultIndex', function () {
-          var ids = $route.current.locals.indexPatternIds;
-          $scope.indexPatternList = ids.map(function (id) {
-            return {
-              id: id,
-              url: kbnUrl.eval('#/settings/indices/{{id}}', {id: id}),
-              class: 'sidebar-item-title ' + ($scope.edittingId === id ? 'active' : ''),
-              default: $scope.defaultIndex === id
-            };
-          });
-        });
-
-        $scope.$emit('application.load');
-      }
-    };
-  });
-
-  return {
-    name: 'indices',
-    display: 'Indices',
-    url: '#/settings/indices',
-  };
-});
diff --git a/src/kibana/plugins/settings/sections/objects/index.js b/src/kibana/plugins/settings/sections/objects/index.js
deleted file mode 100644
index ef85a416111be..0000000000000
--- a/src/kibana/plugins/settings/sections/objects/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-define(function (require) {
-  require('plugins/settings/sections/objects/_view');
-  require('plugins/settings/sections/objects/_objects');
-
-  require('angular-ui-ace');
-  require('angular-elastic');
-  require('directives/confirm_click');
-
-  // add the module deps to this module
-  require('modules').get('apps/settings', ['ui.ace', 'monospaced.elastic']);
-
-  return {
-    name: 'objects',
-    display: 'Objects',
-    url: '#/settings/objects'
-  };
-});
diff --git a/src/kibana/plugins/settings/styles/main.less b/src/kibana/plugins/settings/styles/main.less
deleted file mode 100644
index 87375af0e9320..0000000000000
--- a/src/kibana/plugins/settings/styles/main.less
+++ /dev/null
@@ -1,192 +0,0 @@
-@import (reference) "lesshat.less";
-@import (reference) "../../../styles/_bootstrap.less";
-@import (reference) "../../../styles/theme/_theme.less";
-@import (reference) "../../../styles/_variables.less";
-@import (reference) "../../../styles/_mixins.less";
-
-kibana-settings-app,
-kbn-settings-indices,
-kbn-settings-indices-edit,
-kbn-settings-indices-create,
-kbn-settings-advanced,
-kbn-settings-objects,
-kbn-settings-objects-view {
-  display: block;
-}
-
-.settings-nav {
-  text-transform: capitalize;
-}
-
-li.kbn-settings-tab:first-letter {
-  text-transform: capitalize;
-}
-
-kbn-settings-objects {
-  form {
-    margin-bottom: @line-height-computed;
-  }
-  .list-unstyled {
-    // border-top: 1px solid @gray-lighter;
-    // margin-top: @line-height-computed;
-    li {
-      border-bottom: 1px solid @gray-lighter;
-      padding: 8px;
-    }
-  }
-  .empty {
-    color: @gray-light;
-  }
-
-  .action-bar {
-    margin-top: 10px;
-    background-color: @gray-lighter;
-    padding: 4px 12px;
-
-    label {
-      font-size: 10px;
-      font-weight: normal;
-    }
-
-    .btn {
-      font-size: 10px;
-      margin-left: 20px;
-    }
-  }
-
-  .header {
-    .title, .controls {
-      padding-right: 1em;
-      display: inline-block;
-    }
-  }
-}
-
-kbn-settings-advanced {
-  // super specific rule to override bootstrap's equally specific rule
-  // https://github.com/twbs/bootstrap/blob/1f329f8f17aa989eabc6e94bdcab93e69ef0e463/less/tables.less#L35
-  .table > tbody > tr > td {
-    vertical-align: middle;
-  }
-}
-
-kbn-settings-objects-view {
-  label {
-    font-family: @font-family-monospace;
-  }
-  .ace_editor { height: 300px; }
-}
-
-.kbn-settings-about {
-  margin-top: 30px;
-
-  .jumbotron h1 {
-    font-weight: bold;
-  }
-
-  &-versions {
-    td {
-      width: 50%;
-    }
-
-    td:first-child {
-      font-weight: bold;
-      text-align: right;
-    }
-  }
-}
-
-.advanced-settings {
-  table {
-    width: 100%;
-
-    tr.default td.value {
-      color: @input-color-placeholder;
-    }
-
-    td {
-      font-family: @font-family-monospace;
-
-      &.actions {
-        width: 150px;
-      }
-    }
-  }
-}
-
-.objects-settings {
-  .item {
-    padding: 12px;
-
-    .item-title {
-      margin-left: 30px;
-    }
-
-    .actions {
-      margin-top: -6px;
-    }
-  }
-}
-
-.indices-settings {
-  i.active {
-    color: @btn-success-bg;
-  }
-
-  tr.field-settings {
-    .field-popularize {
-      margin-left: 5px;
-      display: none;
-    }
-    &:hover .field-popularize {
-      display: inline;
-    }
-  }
-
-  .index-pattern-name {
-    .display(flex);
-    .align-items(center);
-
-    .title {
-      .flex(1, 1, auto);
-    }
-
-    .controls {
-      .flex(4, 0, auto);
-    }
-  }
-}
-
-kbn-settings-indices {
-  .fields {
-    table {
-      .table-striped()
-    }
-
-    th:last-child,
-    td:last-child {
-      text-align: right;
-    }
-  }
-
-  .indexed-fields {
-    th:first-child,
-    td:first-child {
-      width: 35%;
-    }
-  }
-
-  .scripted-fields header {
-    margin: 5px 0;
-    text-align: right;
-  }
-
-  p.text-center {
-    padding-top: 1em;
-  }
-}
-
-
-.kbn-settings-indices-create {
-  .time-and-pattern > div {}
-}
diff --git a/src/kibana/plugins/table_vis/index.js b/src/kibana/plugins/table_vis/index.js
deleted file mode 100644
index 78d8df2ac7c26..0000000000000
--- a/src/kibana/plugins/table_vis/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-define(function (require) {
-  require('registry/vis_types').register(function TableVisPrivateModuleLoader(Private) {
-    return Private(require('plugins/table_vis/table_vis'));
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/plugins/table_vis/table_vis.less b/src/kibana/plugins/table_vis/table_vis.less
deleted file mode 100644
index ac46b81a1cc87..0000000000000
--- a/src/kibana/plugins/table_vis/table_vis.less
+++ /dev/null
@@ -1,30 +0,0 @@
-@import (reference) "lesshat.less";
-
-.table-vis {
-  .display(flex);
-  .flex-direction(column);
-  .flex(1 0 100%);
-
-  &-error {
-    .display(flex);
-    .flex-direction(column);
-    .justify-content(center);
-    .flex(1 0 100%);
-
-    text-align: center;
-  }
-
-  &-container {
-    kbn-agg-table-group > .table > tbody > tr > td {
-      border-top: 0px;
-    }
-
-    .pagination-other-pages {
-      .justify-content(flex-end);
-    }
-
-    .pagination-size {
-      display: none;
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/kibana/plugins/vis_debug_spy/index.js b/src/kibana/plugins/vis_debug_spy/index.js
deleted file mode 100644
index ac51a2e94a642..0000000000000
--- a/src/kibana/plugins/vis_debug_spy/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-define(function (require) {
-  require('registry/spy_modes').register(require('plugins/vis_debug_spy/vis_debug'));
-});
diff --git a/src/kibana/plugins/vis_debug_spy/vis_debug.js b/src/kibana/plugins/vis_debug_spy/vis_debug.js
deleted file mode 100644
index cd620b6e8729b..0000000000000
--- a/src/kibana/plugins/vis_debug_spy/vis_debug.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(function (require) {
-  return function VisDetailsSpyProvider(Notifier, $filter, $rootScope, config) {
-    return {
-      name: 'debug',
-      display: 'Debug',
-      template: require('text!plugins/vis_debug_spy/vis_debug.html'),
-      order: 5,
-      link: function ($scope, $el) {
-        $scope.$watch('vis.getState() | json', function (json) {
-          $scope.visStateJson = json;
-        });
-      }
-    };
-  };
-});
diff --git a/src/kibana/plugins/visualize/editor/agg.js b/src/kibana/plugins/visualize/editor/agg.js
deleted file mode 100644
index 784204f11a4cb..0000000000000
--- a/src/kibana/plugins/visualize/editor/agg.js
+++ /dev/null
@@ -1,92 +0,0 @@
-define(function (require) {
-  require('modules')
-  .get('app/visualize')
-  .directive('visEditorAgg', function ($compile, $parse, $filter, Private, Notifier) {
-    require('plugins/visualize/editor/agg_params');
-    require('plugins/visualize/editor/agg_add');
-
-    var _ = require('lodash');
-    var $ = require('jquery');
-    var aggTypes = Private(require('components/agg_types/index'));
-    var advancedToggleHtml = require('text!plugins/visualize/editor/advanced_toggle.html');
-
-    var notify = new Notifier({
-      location: 'visAggGroup'
-    });
-
-    return {
-      restrict: 'A',
-      template: require('text!plugins/visualize/editor/agg.html'),
-      require: 'form',
-      link: function ($scope, $el, attrs, kbnForm) {
-        $scope.$bind('outputAgg', 'outputVis.aggs.byId[agg.id]', $scope);
-        $scope.editorOpen = !!$scope.agg.brandNew;
-
-        $scope.$watch('editorOpen', function (open) {
-          // make sure that all of the form inputs are "touched"
-          // so that their errors propogate
-          if (!open) kbnForm.$setTouched();
-        });
-
-        $scope.$watchMulti([
-          '$index',
-          'group.length'
-        ], function () {
-          $scope.aggIsTooLow = calcAggIsTooLow();
-        });
-
-        /**
-         * Describe the aggregation, for display in the collapsed agg header
-         * @return {[type]} [description]
-         */
-        $scope.describe = function () {
-          if (!$scope.agg.type.makeLabel) return '';
-          var label = $scope.agg.type.makeLabel($scope.agg);
-          return label ? label : '';
-        };
-
-        function move(below, agg) {
-          _.move($scope.vis.aggs, agg, below, function (otherAgg) {
-            return otherAgg.schema.group === agg.schema.group;
-          });
-        }
-        $scope.moveUp = _.partial(move, false);
-        $scope.moveDown = _.partial(move, true);
-
-        $scope.remove = function (agg) {
-          var aggs = $scope.vis.aggs;
-
-          var index = aggs.indexOf(agg);
-          if (index === -1) return notify.log('already removed');
-
-          aggs.splice(index, 1);
-        };
-
-        $scope.canRemove = function (aggregation) {
-          var metricCount = _.reduce($scope.group, function (count, agg) {
-            return (agg.schema.name === aggregation.schema.name) ? ++count : count;
-          }, 0);
-
-          // make sure the the number of these aggs is above the min
-          return metricCount > aggregation.schema.min;
-        };
-
-        function calcAggIsTooLow() {
-          if (!$scope.agg.schema.mustBeFirst) {
-            return false;
-          }
-
-          var firstDifferentSchema = _.findIndex($scope.group, function (agg) {
-            return agg.schema !== $scope.agg.schema;
-          });
-
-          if (firstDifferentSchema === -1) {
-            return false;
-          }
-
-          return $scope.$index > firstDifferentSchema;
-        }
-      }
-    };
-  });
-});
diff --git a/src/kibana/plugins/visualize/editor/agg_filter.js b/src/kibana/plugins/visualize/editor/agg_filter.js
deleted file mode 100644
index bc0f5b6ac589d..0000000000000
--- a/src/kibana/plugins/visualize/editor/agg_filter.js
+++ /dev/null
@@ -1,10 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var propFilter = require('filters/_prop_filter');
-
-  require('modules')
-  .get('kibana')
-  .filter('aggFilter', function () {
-    return propFilter('name');
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/plugins/visualize/editor/sidebar.js b/src/kibana/plugins/visualize/editor/sidebar.js
deleted file mode 100644
index 625a09e635d8c..0000000000000
--- a/src/kibana/plugins/visualize/editor/sidebar.js
+++ /dev/null
@@ -1,22 +0,0 @@
-define(function (require) {
-  require('modules')
-  .get('app/visualize')
-  .directive('visEditorSidebar', function () {
-    var _ = require('lodash');
-
-    require('plugins/visualize/editor/agg_group');
-    require('plugins/visualize/editor/vis_options');
-
-    return {
-      restrict: 'E',
-      template: require('text!plugins/visualize/editor/sidebar.html'),
-      scope: true,
-      controllerAs: 'sidebar',
-      controller: function ($scope) {
-        $scope.$bind('vis', 'editableVis');
-        $scope.$bind('outputVis', 'vis');
-        this.section = _.get($scope, 'vis.type.requiresSearch') ? 'data' : 'options';
-      }
-    };
-  });
-});
diff --git a/src/kibana/plugins/visualize/editor/styles/editor.less b/src/kibana/plugins/visualize/editor/styles/editor.less
deleted file mode 100644
index e6c9ec04b8780..0000000000000
--- a/src/kibana/plugins/visualize/editor/styles/editor.less
+++ /dev/null
@@ -1,372 +0,0 @@
-.vis-editor {
-  .flex-parent();
-
-  @vis-editor-sidebar-basis: (100/12) * 2%; // two of twelve columns
-  @vis-editor-sidebar-min-width: 350px;
-  @vis-editor-nesting-width: 8px;
-  @vis-editor-agg-editor-spacing: 5px;
-
-  // For the vis-editor sidebar nav
-  .navbar-default .navbar-nav {
-    &> .active > a:before {
-      border: 7px solid @gray-lighter;
-      border-color: transparent transparent @gray-lighter transparent;
-    }
-
-    .danger {
-      color: @btn-danger-color;
-      background-color: @btn-danger-bg;
-    }
-  }
-
-  .btn-xs {
-    line-height: 1.3;
-  }
-
-  navbar {
-    .bitty-modal-container {
-      position: relative;
-
-      .bitty-modal {
-        position: absolute;
-        cursor: pointer;
-        top: 0px;
-        left: 0px;
-        right: 0px;
-        bottom: 0px;
-        z-index: 10;
-        background: fadeout(@navbar-default-bg, 10%);
-        color: white;
-        text-align: center;
-        padding-top: 6px;
-
-        // Don't overflow container
-        padding-left: 20px;
-        padding-right: 20px;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        .user-select(none);
-      }
-
-      a {
-        color: white;
-      }
-    }
-  }
-
-  &-content {
-    .flex-parent();
-
-    // overrides for tablet and desktop
-    @media (min-width: @screen-md-min) {
-      .flex-direction(row);
-    }
-  }
-
-  &-sidebar {
-    .flex-parent(0, 0, auto);
-
-    // overflow: auto;
-
-    // overrided for tablet and desktop
-    @media (min-width: @screen-md-min) {
-      .flex-basis(@vis-editor-sidebar-basis);
-      min-width: @vis-editor-sidebar-min-width;
-      max-width: @vis-editor-sidebar-min-width;
-      // margin-bottom: (@input-height-base * 2) - 3;
-    }
-
-    nav {
-      border-radius: 0px;
-    }
-
-    .sidebar-item {
-      border-top: 0 !important;
-    }
-
-    .sidebar-container {
-      .flex-parent(1, 1, auto);
-      background-color: @body-bg;
-      border-right-color: @sidebar-bg;
-
-      form {
-        .flex-parent(1, 1, auto);
-
-        > div.vis-editor-config {
-          @media (min-width: @screen-md-min) {
-            .flex-parent(1, 1, 1px);
-            overflow: auto;
-          }
-          @media (max-width: @screen-md-min) {
-            .flex-parent(1, 1, auto);
-          }
-        }
-
-        > .vis-edit-sidebar-buttons {
-          .flex(0, 0, auto)
-        }
-
-        label {
-          margin-bottom: 0px;
-        }
-      }
-    }
-
-    .sidebar-item-title {
-      font-size: 20px;
-      font-weight: bold;
-      border: inherit !important;
-      background-color: @gray-lighter;
-      margin-bottom: @vis-editor-agg-editor-spacing;
-      padding: 2px 5px !important;
-    }
-
-    .sidebar-item-title:hover {
-      color: @text-color !important;
-      background-color: @gray-lighter !important;
-    }
-
-    .hintbox {
-      padding: @vis-editor-agg-editor-spacing;
-      margin-bottom: @vis-editor-agg-editor-spacing;
-    }
-
-    label {
-      .flex(2 0 0);
-      white-space: nowrap;
-      text-overflow: ellipsis;
-      overflow: hidden;
-      margin-bottom: 0;
-    }
-  }
-
-  .visualization-options {
-    padding: @vis-editor-agg-editor-spacing;
-
-    .form-group {
-      margin-bottom: @vis-editor-agg-editor-spacing;
-    }
-    .form-horizontal .control-label {
-      text-align: left;
-    }
-  }
-
-  nesting-indicator {
-    .display(flex);
-    .flex(0 0 auto);
-
-    > span {
-      width: @vis-editor-nesting-width;
-      background-color: @brand-success;
-    }
-  }
-
-  &-agg {
-    .flex-parent();
-
-    //IE10/11 - prevent flex item from overflowing
-    .flex-basis(100%);
-
-    padding: @vis-editor-agg-editor-spacing;
-
-    // wraps the .vis-editor-agg and nesting-indicator ^^
-    &-wrapper {
-      .display(flex);
-    }
-
-    &-group {
-      .flex-parent(0, 1, auto);
-      color: @text-color;
-    }
-
-    &-header {
-      .display(flex);
-      .align-items(center);
-      .flex(1, 0, auto);
-      margin-bottom: @vis-editor-agg-editor-spacing;
-
-      &-toggle {
-        .flex(0, 0, auto);
-        margin-right: @vis-editor-agg-editor-spacing;
-      }
-
-      &-subagg-icon {
-        .flex(0, 1, auto);
-        padding-right: @padding-base-vertical;
-      }
-
-      &-title {
-        .flex(1, 1, auto);
-        .ellipsis();
-        font-weight: bold;
-      }
-
-      &-description {
-        font-weight: normal;
-        padding-right: @vis-editor-agg-editor-spacing;
-
-        &.danger {
-          .text-danger();
-          font-weight: bold;
-        }
-      }
-
-      &-controls {
-        .flex(0, 0, auto);
-      }
-    }
-
-    &-error {
-      margin: @vis-editor-agg-editor-spacing 0;
-      padding: @vis-editor-agg-editor-spacing;
-      text-align: center;
-      background: @btn-danger-bg;
-      color: @btn-danger-color;
-    }
-
-    &-editor {
-      &-ranges {
-        td {
-          padding: 0 @vis-editor-agg-editor-spacing @vis-editor-agg-editor-spacing 0;
-          &:last-child {
-            padding-right: 0;
-          }
-        }
-      }
-
-      .regex .flags {
-        .docs {
-          text-align: right;
-        }
-
-        a {
-          color: @link-color;
-        }
-      }
-
-      &-advanced-toggle {
-        text-align: right;
-      }
-    }
-
-    &-form-row {
-      .display(flex);
-
-      > * {
-        .flex(1, 1, auto);
-        margin-right: @vis-editor-agg-editor-spacing;
-
-        &:last-child {
-          margin-right: 0px;
-        }
-      }
-
-      > .btn {
-        .align-self(center);
-      }
-    }
-
-    &-form-value {
-      .align-self(center);
-      margin: 0 0 0 @vis-editor-agg-editor-spacing;
-      font-size: 1.2em;
-    }
-
-    &-wide-btn {
-      .border-radius(0);
-      border-top: 2px solid @gray-lighter;
-
-      &-add {
-        width: 140px;
-        margin: -2px auto 5px auto;
-        text-align: center;
-        border: 2px solid @gray-lighter;
-        border-top: 0px;
-        padding: 3px;
-        border-bottom-right-radius: @border-radius-base;
-        border-bottom-left-radius: @border-radius-base;
-        background-color: @body-bg;
-        font-weight: bold;
-      }
-
-      &-add:hover {
-        background-color: @gray-lighter;
-      }
-    }
-
-    &-add {
-      .flex-parent();
-
-      &-subagg {
-        margin-bottom: -@vis-editor-agg-editor-spacing - 1; // extra one pixel covers the aggs bottom border
-        margin-right: -@vis-editor-agg-editor-spacing;
-        margin-left: -@vis-editor-agg-editor-spacing;
-      }
-
-      &-schemas {
-        margin: @vis-editor-agg-editor-spacing * 3;
-      }
-    }
-
-    &-order-agg {
-      border: 2px solid @gray-lighter;
-      border-radius: @border-radius-base;
-      margin: @vis-editor-agg-editor-spacing;
-      padding: @vis-editor-agg-editor-spacing;
-    }
-  }
-
-  vis-editor-agg-group {
-    .flex-parent(0, 1, auto);
-  }
-
-  &-canvas {
-    .flex(1, 0, @screen-md-min - @vis-editor-sidebar-basis);
-    .display(flex);
-    .flex-direction(column);
-    overflow: auto;
-
-    &.embedded {
-      .flex-shrink(1);
-      .flex-basis(100%);
-    }
-
-    // overrided for tablet and desktop
-    @media (min-width: @screen-md-min) {
-      .flex-shrink(1);
-      .flex-basis(100%);
-    }
-
-    &-title {
-      text-align: center;
-      margin: 10px 0 0;
-    }
-
-    visualize {
-      .flex-parent();
-      .flex(1, 1, 100%);
-    }
-
-    .visualize-chart {
-      .flex(1, 1, 100%);
-      position: relative;
-    }
-  }
-}
-
-vis-editor,
-vis-editor-agg-group,
-vis-editor-agg,
-vis-editor-agg-params,
-vis-editor-agg-param,
-vis-editor-vis-options,
-vis-editor-vis-options > * {
-  .flex-parent();
-}
-
-form.vis-share {
-  div.form-control {
-    height: inherit;
-  }
-}
diff --git a/src/kibana/plugins/visualize/index.js b/src/kibana/plugins/visualize/index.js
deleted file mode 100644
index e79b172ca71c8..0000000000000
--- a/src/kibana/plugins/visualize/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-define(function (require) {
-  require('css!plugins/visualize/styles/main.css');
-
-  require('plugins/visualize/editor/editor');
-  require('plugins/visualize/wizard/wizard');
-
-  require('routes')
-  .when('/visualize', {
-    redirectTo: '/visualize/step/1'
-  });
-
-  var apps = require('registry/apps');
-  apps.register(function VisualizeAppModule() {
-    return {
-      id: 'visualize',
-      name: 'Visualize',
-      order: 1
-    };
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/plugins/visualize/styles/main.less b/src/kibana/plugins/visualize/styles/main.less
deleted file mode 100644
index 8b1b95d1662ba..0000000000000
--- a/src/kibana/plugins/visualize/styles/main.less
+++ /dev/null
@@ -1,57 +0,0 @@
-@import (reference) "../../../styles/main.less";
-
-.vis-wizard {
-  h1 {
-    margin-top: 45px;
-  }
-}
-
-.wizard-vis-type {
-  .list-group-item();
-  .list-group-menu .list-group-menu-item();
-
-  // overrided for tablet and desktop
-  @media (min-width: @screen-md-min) {
-    .display(flex);
-    .align-items(flex-start);
-  }
-
-  &-heading {
-    .flex(0 0 200px);
-    .display(flex);
-    .align-items(center);
-    font-size: 1.2em;
-
-    .fa {
-      .flex(0 0 auto);
-      margin-right: @padding-base-horizontal;
-      font-size: 1.5em;
-      text-align: center;
-    }
-
-    h4 {
-      .flex(1 0 auto);
-    }
-  }
-
-  &-description {
-    .flex(1 1 auto);
-    color: @brand-primary;
-  }
-}
-
-.visualize-info {
-  align-self: flex-end;
-
-  &-tab {
-    background-color: @well-bg;
-    padding: 5px 10px;
-    margin-left: @padding-base-horizontal;
-    border-bottom-left-radius: @border-radius-base;
-    text-align: right;
-    font-weight: bold;
-  }
-
-}
-
-@import "../editor/styles/editor.less";
diff --git a/src/kibana/registry/apps.js b/src/kibana/registry/apps.js
deleted file mode 100644
index 6017e7e97a4c6..0000000000000
--- a/src/kibana/registry/apps.js
+++ /dev/null
@@ -1,7 +0,0 @@
-define(function (require) {
-  return require('registry/_registry')({
-    name: 'apps',
-    index: ['name'],
-    order: ['order']
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/registry/spy_modes.js b/src/kibana/registry/spy_modes.js
deleted file mode 100644
index 161eeddb17b4b..0000000000000
--- a/src/kibana/registry/spy_modes.js
+++ /dev/null
@@ -1,7 +0,0 @@
-define(function (require) {
-  return require('registry/_registry')({
-    name: 'visTypes',
-    index: ['name'],
-    order: ['order']
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/registry/vis_types.js b/src/kibana/registry/vis_types.js
deleted file mode 100644
index a9acb4147318d..0000000000000
--- a/src/kibana/registry/vis_types.js
+++ /dev/null
@@ -1,7 +0,0 @@
-define(function (require) {
-  return require('registry/_registry')({
-    name: 'visTypes',
-    index: ['name'],
-    order: ['title']
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/require.config.js b/src/kibana/require.config.js
deleted file mode 100644
index b3db4faf45ac0..0000000000000
--- a/src/kibana/require.config.js
+++ /dev/null
@@ -1,70 +0,0 @@
-require.config({
-  baseUrl: './',
-  paths: {
-    kibana: 'index',
-    // special utils
-    routes: 'utils/routes/index',
-    errors: 'components/errors',
-    modules: 'utils/modules',
-    lodash: 'utils/lodash-mixins/index',
-
-    // bower_components
-    'angular-bindonce': 'bower_components/angular-bindonce/bindonce',
-    'angular-bootstrap': 'bower_components/angular-bootstrap/ui-bootstrap-tpls',
-    'angular-elastic': 'bower_components/angular-elastic/elastic',
-    'angular-route': 'bower_components/angular-route/angular-route',
-    'angular-ui-ace': 'bower_components/angular-ui-ace/ui-ace',
-    ace: 'bower_components/ace-builds/src-noconflict/ace',
-    'ace-json': 'bower_components/ace-builds/src-noconflict/mode-json',
-    angular: 'bower_components/angular/angular',
-    async: 'bower_components/async/lib/async',
-    bower_components: 'bower_components',
-    css: 'bower_components/require-css/css',
-    d3: 'bower_components/d3/d3',
-    elasticsearch: 'bower_components/elasticsearch/elasticsearch.angular',
-    faker: 'bower_components/Faker/faker',
-    file_saver: 'bower_components/FileSaver/FileSaver',
-    gridster: 'bower_components/gridster/dist/jquery.gridster',
-    'leaflet-heat': 'bower_components/Leaflet.heat/dist/leaflet-heat',
-    jquery: 'bower_components/jquery/dist/jquery',
-    leaflet: 'bower_components/leaflet/dist/leaflet',
-    'leaflet-draw': 'bower_components/leaflet-draw/dist/leaflet.draw',
-    lodash_src: 'bower_components/lodash/lodash',
-    moment: 'bower_components/moment/moment',
-    'ng-clip': 'bower_components/ng-clip/src/ngClip',
-    text: 'bower_components/requirejs-text/text',
-    zeroclipboard: 'bower_components/zeroclipboard/dist/ZeroClipboard',
-    marked: 'bower_components/marked/lib/marked',
-    numeral: 'bower_components/numeral/numeral'
-  },
-  shim: {
-    angular: {
-      deps: ['jquery'],
-      exports: 'angular'
-    },
-    gridster: ['jquery', 'css!bower_components/gridster/dist/jquery.gridster.css'],
-    'angular-route': ['angular'],
-    'elasticsearch': ['angular'],
-    'angular-bootstrap': ['angular'],
-    'angular-bindonce': ['angular'],
-    'ace-json': ['ace'],
-    'angular-ui-ace': ['angular', 'ace', 'ace-json'],
-    'ng-clip': ['angular', 'zeroclipboard'],
-    'leaflet-heat': {
-      deps: ['leaflet']
-    },
-    file_saver: {
-      exports: 'saveAs'
-    },
-    'leaflet-draw': {
-      deps: ['leaflet', 'css!bower_components/leaflet-draw/dist/leaflet.draw.css']
-    },
-    leaflet: {
-      deps: ['css!bower_components/leaflet/dist/leaflet.css']
-    },
-    marked: {
-      exports: 'marked'
-    }
-  },
-  waitSeconds: 60
-});
diff --git a/src/kibana/services/debounce.js b/src/kibana/services/debounce.js
deleted file mode 100644
index f5e1a76adf479..0000000000000
--- a/src/kibana/services/debounce.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Debounce service, angularized version of lodash debounce
-// borrowed heavily from https://github.com/shahata/angular-debounce
-
-define(function (require) {
-  var _ = require('lodash');
-  var module = require('modules').get('kibana');
-
-  module.service('debounce', ['$timeout', function ($timeout) {
-    return function (func, wait, options) {
-      var timeout, args, self, result;
-      options = _.defaults(options || {}, {
-        leading: false,
-        trailing: true
-      });
-
-      function debounce() {
-        self = this;
-        args = arguments;
-
-        var later = function () {
-          timeout = null;
-          if (!options.leading || options.trailing) {
-            result = func.apply(self, args);
-          }
-        };
-
-        var callNow = options.leading && !timeout;
-
-        if (timeout) {
-          $timeout.cancel(timeout);
-        }
-        timeout = $timeout(later, wait);
-
-        if (callNow) {
-          result = func.apply(self, args);
-        }
-
-        return result;
-      }
-
-      debounce.cancel = function () {
-        $timeout.cancel(timeout);
-        timeout = null;
-      };
-
-      return debounce;
-    };
-  }]);
-});
\ No newline at end of file
diff --git a/src/kibana/services/private.js b/src/kibana/services/private.js
deleted file mode 100644
index ac1d129ee4b34..0000000000000
--- a/src/kibana/services/private.js
+++ /dev/null
@@ -1,191 +0,0 @@
-define(function (require) {
-  /**
-   * # `Private()`
-   * Private module loader, used to merge angular and require js dependency styles
-   * by allowing a require.js module to export a single provider function that will
-   * create a value used within an angular application. This provider can declare
-   * angular dependencies by listing them as arguments, and can be require additional
-   * Private modules.
-   *
-   * ## Define a private module provider:
-   * ```js
-   * define(function (require) {
-   *   return function PingProvider($http) {
-   *     this.ping = function () {
-   *       return $http.head('/health-check');
-   *     };
-   *   };
-   * });
-   * ```
-   *
-   * ## Require a private module:
-   * ```js
-   * define(function (require) {
-   *   return function ServerHealthProvider(Private, Promise) {
-   *     var ping = Private(require('components/ping'));
-   *     return {
-   *       check: Promise.method(function () {
-   *         var attempts = 0;
-   *         return (function attempt() {
-   *           attempts += 1;
-   *           return ping.ping()
-   *           .catch(function (err) {
-   *             if (attempts < 3) return attempt();
-   *           })
-   *         }())
-   *         .then(function () {
-   *           return true;
-   *         })
-   *         .catch(function () {
-   *           return false;
-   *         });
-   *       })
-   *     }
-   *   };
-   * });
-   * ```
-   *
-   * # `Private.stub(provider, newInstance)`
-   * `Private.stub()` replaces the instance of a module with another value. This is all we have needed until now.
-   *
-   * ```js
-   * beforeEach(inject(function ($injector, Private) {
-   *   Private.stub(
-   *     // since this module just exports a function, we need to change
-   *     // what Private returns in order to modify it's behavior
-   *     require('components/agg_response/hierarchical/_build_split'),
-   *     sinon.stub().returns(fakeSplit)
-   *   );
-   * }));
-   * ```
-   *
-   * # `Private.swap(oldProvider, newProvider)`
-   * This new method does an 1-for-1 swap of module providers, unlike `stub()` which replaces a modules instance.
-   * Pass the module you want to swap out, and the one it should be replaced with, then profit.
-   *
-   * Note: even though this example shows `swap()` being called in a config
-   * function, it can be called from anywhere. It is particularly useful
-   * in this scenario though.
-   *
-   * ```js
-   * beforeEach(module('kibana', function (PrivateProvider) {
-   *   PrivateProvider.swap(
-   *     // since the courier is required automatically before the tests are loaded,
-   *     // we can't stub it's internal components unless we do so before the
-   *     // application starts. This is why angular has config functions
-   *     require('components/courier/_redirect_when_missing'),
-   *     function StubbedRedirectProvider($decorate) {
-   *       // $decorate is a function that will instantiate the original module when called
-   *       return sinon.spy($decorate());
-   *     }
-   *   );
-   * }));
-   * ```
-   *
-   * @param {[type]} prov [description]
-   */
-
-
-  var _ = require('lodash');
-  var nextId = _.partial(_.uniqueId, 'privateProvider#');
-
-  function name(fn) {
-    return fn.name || fn.toString().split('\n').shift();
-  }
-
-  require('modules').get('kibana')
-  .provider('Private', function () {
-    var provider = this;
-
-    // one cache/swaps per Provider
-    var cache = {};
-    var swaps = {};
-
-    // return the uniq id for this function
-    function identify(fn) {
-      if (typeof fn !== 'function') {
-        throw new TypeError('Expected private module "' + fn + '" to be a function');
-      }
-
-      if (fn.$$id) return fn.$$id;
-      else return (fn.$$id = nextId());
-    }
-
-    provider.stub = function (fn, instance) {
-      cache[identify(fn)] = instance;
-      return instance;
-    };
-
-    provider.swap = function (fn, prov) {
-      var id = identify(fn);
-      swaps[id] = prov;
-    };
-
-    provider.$get = ['$injector', function PrivateFactory($injector) {
-
-      // prevent circular deps by tracking where we came from
-      var privPath = [];
-      var pathToString = function () {
-        return privPath.map(name).join(' -> ');
-      };
-
-      // call a private provider and return the instance it creates
-      function instantiate(prov, locals) {
-        if (~privPath.indexOf(prov)) {
-          throw new Error(
-            'Circular refrence to "' + name(prov) + '"' +
-            ' found while resolving private deps: ' + pathToString()
-          );
-        }
-
-        privPath.push(prov);
-
-        var context = {};
-        var instance = $injector.invoke(prov, context, locals);
-        if (!_.isObject(instance)) instance = context;
-
-        privPath.pop();
-        return instance;
-      }
-
-      // retrieve an instance from cache or create and store on
-      function get(id, prov, $delegateProv, $delegateId) {
-        if (cache[id]) return cache[id];
-
-        var instance;
-
-        if ($delegateId != null && $delegateProv != null) {
-          instance = instantiate(prov, {
-            $decorate: _.partial(get, $delegateId, $delegateProv)
-          });
-        } else {
-          instance = instantiate(prov);
-        }
-
-        return (cache[id] = instance);
-      }
-
-      // main api, get the appropriate instance for a provider
-      function Private(prov) {
-        var id = identify(prov);
-        var $delegateId;
-        var $delegateProv;
-
-        if (swaps[id]) {
-          $delegateId = id;
-          $delegateProv = prov;
-
-          prov = swaps[$delegateId];
-          id = identify(prov);
-        }
-
-        return get(id, prov, $delegateId, $delegateProv);
-      }
-
-      Private.stub = provider.stub;
-      Private.swap = provider.swap;
-
-      return Private;
-    }];
-  });
-});
diff --git a/src/kibana/styles/_bootstrap.less b/src/kibana/styles/_bootstrap.less
deleted file mode 100644
index 93fc2ce58b803..0000000000000
--- a/src/kibana/styles/_bootstrap.less
+++ /dev/null
@@ -1,53 +0,0 @@
-@bs-less-dir: "../bower_components/bootstrap/less";
-
-// Core variables and mixins
-@import "theme/_variables.less";
-
-// Mixins
-@import "@{bs-less-dir}/mixins.less";
-
-// Reset
-@import "@{bs-less-dir}/normalize.less";
-@import "@{bs-less-dir}/print.less";
-
-// Core CSS
-@import "@{bs-less-dir}/scaffolding.less";
-@import "@{bs-less-dir}/type.less";
-@import "@{bs-less-dir}/code.less";
-@import "@{bs-less-dir}/grid.less";
-@import "@{bs-less-dir}/tables.less";
-@import "@{bs-less-dir}/forms.less";
-@import "@{bs-less-dir}/buttons.less";
-
-// Components
-@import "@{bs-less-dir}/component-animations.less";
-// @import "@{bs-less-dir}/glyphicons.less";
-@import "@{bs-less-dir}/dropdowns.less";
-@import "@{bs-less-dir}/button-groups.less";
-@import "@{bs-less-dir}/input-groups.less";
-@import "@{bs-less-dir}/navs.less";
-@import "@{bs-less-dir}/navbar.less";
-@import "@{bs-less-dir}/breadcrumbs.less";
-@import "@{bs-less-dir}/pagination.less";
-@import "@{bs-less-dir}/pager.less";
-@import "@{bs-less-dir}/labels.less";
-@import "@{bs-less-dir}/badges.less";
-@import "@{bs-less-dir}/jumbotron.less";
-@import "@{bs-less-dir}/thumbnails.less";
-@import "@{bs-less-dir}/alerts.less";
-@import "@{bs-less-dir}/progress-bars.less";
-@import "@{bs-less-dir}/media.less";
-@import "@{bs-less-dir}/list-group.less";
-@import "@{bs-less-dir}/panels.less";
-@import "@{bs-less-dir}/wells.less";
-@import "@{bs-less-dir}/close.less";
-
-// Components w/ JavaScript
-@import "@{bs-less-dir}/modals.less";
-@import "@{bs-less-dir}/tooltip.less";
-@import "@{bs-less-dir}/popovers.less";
-@import "@{bs-less-dir}/carousel.less";
-
-// Utility classes
-@import "@{bs-less-dir}/utilities.less";
-@import "@{bs-less-dir}/responsive-utilities.less";
diff --git a/src/kibana/styles/_callout.less b/src/kibana/styles/_callout.less
deleted file mode 100644
index bd8546f2c29b1..0000000000000
--- a/src/kibana/styles/_callout.less
+++ /dev/null
@@ -1,37 +0,0 @@
-.bs-callout(@color, @bgcolor: lighten(@color, 35%)) {
-    display: block;
-    margin: 20px 0;
-    padding: 15px 30px 15px 15px;
-    border-left: 5px solid @color;
-    background-color: @bgcolor;
-    h1, h2, h3, h4, h5, h6 {
-        margin-top: 0;
-        color: @color;
-    }
-    p:last-child {
-        margin-bottom: 0;
-    }
-    code, .highlight {
-        background-color: #fff;
-    }
-}
-
-.bs-callout-primary {
-    .bs-callout(@brand-primary, lighten(@brand-primary, 45%));
-}
-
-.bs-callout-danger {
-    .bs-callout(@brand-danger);
-}
-
-.bs-callout-warning {
-    .bs-callout(@brand-warning, lighten(@brand-warning, 30%));
-}
-
-.bs-callout-info {
-    .bs-callout(@brand-info);
-}
-
-.bs-callout-success {
-    .bs-callout(@brand-success);
-}
\ No newline at end of file
diff --git a/src/kibana/styles/_control_group.less b/src/kibana/styles/_control_group.less
deleted file mode 100644
index aafef1bf31b33..0000000000000
--- a/src/kibana/styles/_control_group.less
+++ /dev/null
@@ -1,106 +0,0 @@
-.control-group {
-  .display(flex);
-  .flex(0, 0, auto);
-  .flex-direction(row);
-  .flex-wrap(wrap);
-  .align-items(stretch);
-
-  padding: @padding-base-vertical @padding-base-horizontal;
-
-  /***
-   * components
-   ***/
-
-  > * {
-    padding-right: @padding-base-horizontal;
-    .flex(0, 0, auto);
-
-    &:last-child {
-      padding-right: 0;
-    }
-  }
-
-  // the element should take up an even share of available space
-  > .fill {
-    .flex(1, 1, 1%);
-  }
-
-  button {
-    padding: @padding-base-vertical @padding-base-horizontal;
-    font-size: @font-size-base;
-    color: @control-group-link-color;
-    background-color: @control-group-bg;
-
-    &:hover {
-      color: @control-group-link-hover-color;
-      background-color: @control-group-link-hover-bg;
-    }
-
-    .active, &:active, &:focus {
-      color: @control-group-link-active-color;
-      background-color: @control-group-link-active-bg;
-    }
-
-    &[disabled] {
-      color: @control-group-link-disabled-color;
-      background-color: @control-group-link-disabled-bg;
-    }
-
-    &:focus {
-      // because some buttons are all side-to-side, the browser's outline
-      // is cut off by the next button. This causes the outline to be
-      // drawn inside the button. Appplied to all buttons so that it's
-      // uniform within this widget
-      outline-offset: -4px;
-    }
-  }
-
-
-  // horizontal group of buttons/form elements
-  .button-group,
-  .inline-form .input-group {
-    margin-bottom: 0px;
-    .display(flex);
-
-    > * {
-      .border-radius(0);
-    }
-
-    > :first-child {
-      .border-left-radius(@input-border-radius);
-    }
-
-    > :last-child {
-      .border-right-radius(@input-border-radius);
-    }
-  }
-
-  .inline-form {
-    .flex-parent();
-    .display(flex);
-
-    > .typeahead {
-      .flex-parent();
-
-      > .input-group {
-        .display(flex);
-        .flex(1, 0, auto);
-
-        > * {
-          float: none;
-          height: auto;
-          width: auto;
-          .flex(0 0 auto);
-        }
-
-        input[type="text"] {
-          .flex(1 1 100%);
-        }
-      }
-    }
-  }
-}
-
-.nav-controls .column {
-  .flex-direction(column);
-}
diff --git a/src/kibana/styles/_font_icons.less b/src/kibana/styles/_font_icons.less
deleted file mode 100644
index bacde66ac39ca..0000000000000
--- a/src/kibana/styles/_font_icons.less
+++ /dev/null
@@ -1,5 +0,0 @@
-// shims for font-awesome
-
-// new file icon
-.@{fa-css-prefix}-file-new-o:before { content: @fa-var-file-o; }
-.@{fa-css-prefix}-file-new-o:after { content: @fa-var-plus; position: relative; margin-left: -1.0em; font-size: 0.5em; }
diff --git a/src/kibana/styles/_glyphicons.less b/src/kibana/styles/_glyphicons.less
deleted file mode 100644
index 4fe08e1b41102..0000000000000
--- a/src/kibana/styles/_glyphicons.less
+++ /dev/null
@@ -1,17 +0,0 @@
-// == Fontawesome fills for glyphicons in bootstrap components
-.glyphicon {
-  display: inline-block;
-  font-family: FontAwesome;
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.glyphicon-chevron-left:before {
-  content: "\f060";
-}
-.glyphicon-chevron-right:before {
-  content: "\f061";
-}
\ No newline at end of file
diff --git a/src/kibana/styles/_hintbox.less b/src/kibana/styles/_hintbox.less
deleted file mode 100644
index ae40fccc44ea7..0000000000000
--- a/src/kibana/styles/_hintbox.less
+++ /dev/null
@@ -1,63 +0,0 @@
-@hintbox-background-color: @gray-lighter;
-@hintbox-spacing-vertical: 10px;
-@hintbox-spacing-horizontal: 12px;
-@hintbox-table-border-color: #BFC9CA;
-
-.hintbox {
-  padding: @hintbox-spacing-vertical @hintbox-spacing-horizontal;
-  border-radius: 5px;
-  margin-bottom: @hintbox-spacing-vertical;
-  background-color: @hintbox-background-color;
-
-  a {
-    color: @link-color !important;
-
-    &:hover {
-      color: @text-color !important;
-    }
-  }
-
-  pre {
-    background-color: white;
-  }
-
-  &-label,
-  &-label[ng-click] {
-    cursor: help;
-  }
-
-  ul, ol {
-    padding-left: 25px;
-  }
-
-  // inspired by Bootstrap alerts component
-  // https://github.com/twbs/bootstrap/blob/063c1b0780ea0240e4adce4c88d57fc23e099475/less/alerts.less#L27-L35
-  > * {
-    margin: 0;
-  }
-
-  > * + * {
-    margin-top: @hintbox-spacing-vertical;
-  }
-
-  // https://github.com/twbs/bootstrap/blob/2aa102bfd40859d15790febed1939e0111a6fb1a/less/tables.less#L88-L106
-  .table-bordered {
-    border: 1px solid @hintbox-table-border-color;
-    > thead,
-    > tbody,
-    > tfoot {
-      > tr {
-        > th,
-        > td {
-          border: 1px solid @hintbox-table-border-color;
-        }
-      }
-    }
-    > thead > tr {
-      > th,
-      > td {
-        border-bottom-width: 2px;
-      }
-    }
-  }
-}
diff --git a/src/kibana/styles/_input.less b/src/kibana/styles/_input.less
deleted file mode 100644
index a92ebfda5d6e2..0000000000000
--- a/src/kibana/styles/_input.less
+++ /dev/null
@@ -1,7 +0,0 @@
-i.input-error {
-  position: absolute;
-  margin-left: -25px;
-  color: @brand-danger;
-  margin-top: 10px;
-  z-index: 5;
-}
\ No newline at end of file
diff --git a/src/kibana/styles/_mixins.less b/src/kibana/styles/_mixins.less
deleted file mode 100644
index 34bbeea7af33f..0000000000000
--- a/src/kibana/styles/_mixins.less
+++ /dev/null
@@ -1,38 +0,0 @@
-.flex-parent(@grow: 1, @shrink: 1, @basis: auto) {
-  .flex(@grow, @shrink, @basis);
-  .display(flex);
-  .flex-direction(column);
-
-  > * {
-    .flex-shrink(0);
-  }
-}
-
-.ellipsis() {
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
-}
-
-.nav-active-arrow (@color: @body-bg) {
-
-  @media (max-width: @screen-sm-min) {
-    &:before {
-      display: none !important;
-    }
-  }
-
-  &:before {
-    content:"";
-    display:inline-block;
-    position:absolute;
-    border:@navbar-arrow-size solid @color;
-    border-color:transparent transparent @color transparent;
-    top:(@navbar-height - @navbar-arrow-size*2);
-    left: 0;
-    right: 0;
-    margin: 0 auto;
-    width: 0;
-    height: 0;
-  }
-}
\ No newline at end of file
diff --git a/src/kibana/styles/_navbar.less b/src/kibana/styles/_navbar.less
deleted file mode 100644
index cba09fc3d86ca..0000000000000
--- a/src/kibana/styles/_navbar.less
+++ /dev/null
@@ -1,89 +0,0 @@
-navbar {
-  .control-group;
-
-  max-height: @navbar-collapse-max-height;
-  margin-bottom: @navbar-margin-bottom;
-  // top and bottom padding are normally calcuated and stored in @navbar-padding-vertical, but flexbox
-  padding: @padding-base-vertical @navbar-padding-horizontal;
-  color: @navbar-default-color;
-  background-color: @navbar-default-bg;
-  border-style: solid;
-  border-color: @navbar-default-border;
-  border-width: 0 0 1px;
-  z-index: @zindex-navbar;
-
-  /***
-   * components
-   ***/
-
-  > * {
-    padding-right: @navbar-padding-horizontal;
-  }
-
-  // the "brand" that is displayed, usually on the left of the navbar
-  > .name {
-    .align-self(center);
-
-    font-size: @font-size-large;
-    .ellipsis();
-  }
-
-  button {
-    color: @navbar-default-link-color;
-    background-color: transparent;
-
-    &:hover {
-      color: @navbar-default-link-hover-color;
-      background-color: @navbar-default-link-hover-bg;
-    }
-
-    &:focus {
-      color: @navbar-default-link-color;
-      background-color: transparent;
-    }
-
-    &:active, &.active {
-      color: @navbar-default-link-active-color;
-      background-color: @navbar-default-link-active-bg;
-    }
-
-    &[disabled] {
-      color: @navbar-default-link-disabled-color;
-      background-color: @navbar-default-link-disabled-bg;
-    }
-  }
-
-  .inline-form .input-group {
-    button {
-      color: @brand-primary;
-      background-color: @input-group-addon-bg;
-      border: 1px solid @input-group-addon-border-color;
-    }
-  }
-
-  /***
-   * responsive modifications
-   ***/
-
-  // desktop
-  @media (min-width: @screen-md-min) {
-    > .name {
-      // 500px is sort of arbitrary, not sure how to deal with lots of buttons
-      max-width: 500px;
-    }
-  }
-
-  // tablets/phones
-  @media (max-width: @screen-md-min) {
-    > .fill {
-      .flex(1, 1, @screen-md);
-    }
-  }
-
-  // phones
-  @media (max-width: @screen-sm-min) {
-    > .name {
-      max-width: 100%;
-    }
-  }
-}
diff --git a/src/kibana/styles/_notify.less b/src/kibana/styles/_notify.less
deleted file mode 100644
index 47243f0b1dbb2..0000000000000
--- a/src/kibana/styles/_notify.less
+++ /dev/null
@@ -1,73 +0,0 @@
-.toaster-container {
-  visibility: visible;
-  width: 100%;
-
-  .toaster {
-    margin: 0;
-    padding: 0;
-    list-style: none;
-  }
-
-  .alert {
-    padding: 0 15px;
-    margin: 0;
-    border-radius: 0;
-    border: 0px;
-  }
-
-  .toast {
-    .display(flex);
-    .align-items(center);
-
-    > * {
-      .flex(0 0 auto);
-      &:not(:last-child) {
-        margin-right: 4px;
-      }
-    }
-
-    &-message {
-      .flex(1 1 auto);
-      .ellipsis();
-      line-height: normal;
-    }
-
-    &-stack {
-      padding-bottom: 10px;
-
-      pre {
-        display: inline-block;
-        width: 100%;
-        margin: 10px 0;
-        word-break: normal;
-        word-wrap: normal;
-        white-space: pre-wrap;
-      }
-    }
-
-    &-controls {
-      .display(flex);
-
-      button {
-        .flex(0 0 auto);
-        border: 0;
-        border-radius: 0;
-        padding: 10px 15px;
-      }
-    }
-  }
-
-  // add darkened background to the different badges
-  .alert-success .badge {
-    background: darken(@alert-success-bg, 25%);
-  }
-  .alert-info .badge {
-    background: darken(@alert-info-bg, 25%);
-  }
-  .alert-warning .badge {
-    background: darken(@alert-warning-bg, 25%);
-  }
-  .alert-danger .badge {
-    background: darken(@alert-danger-bg, 25%);
-  }
-}
\ No newline at end of file
diff --git a/src/kibana/styles/_pagination.less b/src/kibana/styles/_pagination.less
deleted file mode 100644
index 22440da942dbe..0000000000000
--- a/src/kibana/styles/_pagination.less
+++ /dev/null
@@ -1,53 +0,0 @@
-paginate {
-  display: block;
-
-  paginate-controls {
-    .display(flex);
-    .align-items(center);
-
-    padding: 5px 5px 10px;
-    text-align: center;
-
-    .pagination-other-pages {
-      .flex(1, 0, auto);
-      .display(flex);
-      .justify-content(center);
-
-      &-list {
-        .flex(0, 0, auto);
-        .display(flex);
-        .justify-content(center);
-        padding: 0;
-        margin: 0;
-        list-style: none;
-
-        > li {
-          .flex(0, 0, auto);
-          .user-select(none);
-
-          a {
-            text-decoration: none;
-          }
-
-          a:hover {
-            text-decoration: underline;
-          }
-
-          &.active a {
-            text-decoration: none !important;
-            font-weight: bold;
-            color: @text-color;
-          }
-        }
-      }
-    }
-
-    .pagination-size {
-      .flex(0, 0, auto);
-
-      input[type=number] {
-        width: 3em;
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/kibana/styles/_sidebar.less b/src/kibana/styles/_sidebar.less
deleted file mode 100644
index c7972cbac006f..0000000000000
--- a/src/kibana/styles/_sidebar.less
+++ /dev/null
@@ -1,136 +0,0 @@
-.sidebar-container {
-  padding-left: 0px !important;
-  padding-right: 0px !important;
-  background-color: @sidebar-bg;
-  border-right: 1px solid @sidebar-border;
-  border-bottom: 1px solid @sidebar-border;
-
-  .sidebar-well {
-    background-color: darken(@sidebar-bg, 5%);
-  }
-
-  .sidebar-list {
-    ul {
-      list-style: none;
-      margin-bottom: 0px;
-    }
-
-    &-header {
-      padding-left: 10px;
-      padding-right: 10px;
-      color: @sidebar-header-color;
-      border: 1px solid rgba(0, 0, 0, 0);
-    }
-
-    .sidebar-item {
-      border-top: 1px solid @sidebar-border;
-      font-size: @sidebar-item-font-size;
-
-      a {
-        color: @text-color;
-
-        &:hover {
-          color: @text-color;
-          text-decoration: none;
-        }
-      }
-
-      &-title,
-      &-text,
-      &-button {
-        margin: 0;
-        padding: 5px 10px;
-        text-align: center;
-        width: 100%;
-        border: none;
-        border-radius: 0;
-      }
-
-      &-title {
-        text-align: left;
-        white-space: nowrap;
-        .ellipsis();
-
-        &.full-title {
-          white-space: normal;
-        }
-
-        &:hover,
-        &:hover .text-muted {
-          color: @sidebar-hover-color;
-          background-color: @sidebar-hover-bg;
-        }
-      }
-
-      &-text {
-        background: white;
-      }
-
-      &-button {
-        font-size: inherit;
-
-        &[disabled] {
-          opacity: 0.65;
-          cursor: default;
-        }
-
-        &.primary {
-          background-color: @btn-primary-bg;
-          color: @btn-primary-color
-        }
-
-        &.info {
-          background-color: @btn-info-bg;
-          color: @btn-info-color
-        }
-
-        &.success {
-          background-color: @btn-success-bg;
-          color: @btn-success-color
-        }
-
-        &.warning {
-          background-color: @btn-warning-bg;
-          color: @btn-warning-color
-        }
-
-        &.danger {
-          background-color: @btn-danger-bg;
-          color: @btn-danger-color
-        }
-
-        &.default {
-          .btn-default();
-        }
-      }
-
-      .active {
-        background-color: @sidebar-active-bg !important;
-        color: @sidebar-active-color;
-
-        &:hover,
-        &:hover .text-muted {
-          color: @sidebar-active-hover-color;
-          background-color: @sidebar-active-hover-bg;
-        }
-      }
-    }
-  }
-
-  .index-pattern {
-    background-color: @sidebar-active-bg;
-    font-weight: bold;
-    padding: 5px 10px;
-    color: @sidebar-active-color;
-    .display(flex);
-    .justify-content(space-between);
-
-    > * {
-      .flex;
-    }
-  }
-
-  .index-pattern-selection .sidebar-item-title {
-    background-color: white;
-  }
-}
diff --git a/src/kibana/styles/_spinner.less b/src/kibana/styles/_spinner.less
deleted file mode 100644
index 1ababd2b76de9..0000000000000
--- a/src/kibana/styles/_spinner.less
+++ /dev/null
@@ -1,53 +0,0 @@
-.spinner {
-  margin: 0px auto 0;
-  white-space: nowrap;
-  text-align: center;
-  display: inline;
-}
-
-.spinner > div {
-  width: 10px;
-  height: 10px;
-  background-color: @text-color;
-  border-radius: 100%;
-  display: inline-block;
-  -webkit-animation: bouncedelay 1s infinite ease-in-out;
-  animation: bouncedelay 1s infinite ease-in-out;
-  /* Prevent first frame from flickering when animation starts */
-  -webkit-animation-fill-mode: both;
-  animation-fill-mode: both;
-}
-
-.navbar .spinner > div {
-  background-color: @navbar-default-link-color;
-}
-
-.spinner.large > div {
-  width: 24px;
-  height: 24px;
-}
-
-.spinner .bounce1 {
-  -webkit-animation-delay: -0.32s;
-  animation-delay: -0.32s;
-}
-
-.spinner .bounce2 {
-  -webkit-animation-delay: -0.16s;
-  animation-delay: -0.16s;
-}
-
-@-webkit-keyframes bouncedelay {
-  0%, 80%, 100% { -webkit-transform: scale(0.0) }
-  40% { -webkit-transform: scale(1.0) }
-}
-
-@keyframes bouncedelay {
-  0%, 80%, 100% {
-    transform: scale(0.0);
-    -webkit-transform: scale(0.0);
-  } 40% {
-    transform: scale(1.0);
-    -webkit-transform: scale(1.0);
-  }
-}
\ No newline at end of file
diff --git a/src/kibana/styles/_table.less b/src/kibana/styles/_table.less
deleted file mode 100644
index 5dfea79362dc5..0000000000000
--- a/src/kibana/styles/_table.less
+++ /dev/null
@@ -1,33 +0,0 @@
-kbn-table, .kbn-table, tbody[kbn-rows] {
-  // sub tables should not have a leading border
-  .table .table {
-    margin-bottom: 0px;
-
-    tr:first-child > td {
-      border-top: none;
-    }
-
-    td.field-name {
-      font-weight: bold;
-    }
-  }
-
-  dl.source {
-    margin-bottom: 0;
-    line-height: 2em;
-    word-break: break-all;
-
-    dt, dd {
-      display: inline;
-    }
-
-    dt {
-      background: @gray-lighter;
-      padding: @padding-xs-vertical @padding-xs-horizontal;
-      margin-right: @padding-xs-horizontal;
-      font-family: monospace;
-      word-break: normal;
-    }
-  }
-
-}
diff --git a/src/kibana/styles/_truncate.less b/src/kibana/styles/_truncate.less
deleted file mode 100644
index c7e4503e598d9..0000000000000
--- a/src/kibana/styles/_truncate.less
+++ /dev/null
@@ -1,19 +0,0 @@
-.truncate-by-height {
-  position: relative;
-  overflow: hidden;
-
-  &:before {
-    content: " ";
-    width: 100%;
-    height: 15px; // copied into index.html!
-    position: absolute;
-    left: 0;
-
-    background: -moz-linear-gradient(top,  rgba(255,255,255,0) 0%, rgba(255,255,255,0.01) 1%, rgba(255,255,255,0.99) 99%, rgba(255,255,255,1) 100%); /* FF3.6+ */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,0)), color-stop(1%,rgba(255,255,255,0.01)), color-stop(99%,rgba(255,255,255,0.99)), color-stop(100%,rgba(255,255,255,1))); /* Chrome,Safari4+ */
-    background: -webkit-linear-gradient(top,  rgba(255,255,255,0) 0%,rgba(255,255,255,0.01) 1%,rgba(255,255,255,0.99) 99%,rgba(255,255,255,1) 100%); /* Chrome10+,Safari5.1+ */
-    background: -o-linear-gradient(top,  rgba(255,255,255,0) 0%,rgba(255,255,255,0.01) 1%,rgba(255,255,255,0.99) 99%,rgba(255,255,255,1) 100%); /* Opera 11.10+ */
-    background: -ms-linear-gradient(top,  rgba(255,255,255,0) 0%,rgba(255,255,255,0.01) 1%,rgba(255,255,255,0.99) 99%,rgba(255,255,255,1) 100%); /* IE10+ */
-    background: linear-gradient(to bottom,  rgba(255,255,255,0) 0%,rgba(255,255,255,0.01) 1%,rgba(255,255,255,0.99) 99%,rgba(255,255,255,1) 100%); /* W3C */
-  }
-}
\ No newline at end of file
diff --git a/src/kibana/styles/_variables.less b/src/kibana/styles/_variables.less
deleted file mode 100644
index ea45a10130019..0000000000000
--- a/src/kibana/styles/_variables.less
+++ /dev/null
@@ -1,22 +0,0 @@
-@fa-font-path: "../bower_components/font-awesome/fonts";
-@font-size-smaller: ceil((@font-size-base * 0.75));
-
-//** input boxes get a slick border thanks to flatly, this controls it's size
-@input-border-width: 2px;
-
-@sidebar-color: @text-color;
-@sidebar-bg: @well-bg;
-@sidebar-border: @well-border;
-@sidebar-header-color: @brand-primary;
-@sidebar-item-font-size: @font-size-small;
-
-@sidebar-hover-color: @sidebar-color;
-@sidebar-hover-bg: darken(@sidebar-bg, 10%);
-
-@sidebar-active-color: @component-active-color;
-@sidebar-active-bg: @component-active-bg;
-@sidebar-active-hover-bg: @component-active-bg;
-@sidebar-active-hover-color: @component-active-color;
-
-@action-add: desaturate(@btn-success-bg, 30%);
-@action-remove: desaturate(@btn-danger-bg, 30%);
diff --git a/src/kibana/styles/main.less b/src/kibana/styles/main.less
deleted file mode 100644
index bb9b7151a9448..0000000000000
--- a/src/kibana/styles/main.less
+++ /dev/null
@@ -1,538 +0,0 @@
-@import "../bower_components/font-awesome/less/font-awesome.less";
-@import (reference) "lesshat.less";
-
-// generic mixins
-@import (reference) "./_mixins.less";
-
-// Import variable files
-@import "./_variables.less";
-
-// custom bootstrap build
-@import "./_bootstrap.less";
-
-// bootstrap modifications
-@import "./theme/_theme.less";
-
-// call outs
-@import "./_callout.less";
-
-// font icons
-@import "./_font_icons.less";
-
-// FontAwesome fills for glyphicons in bootstrap components
-@import "./_glyphicons.less";
-
-@import "./_spinner.less";
-@import "./_pagination.less";
-
-// custom control style
-@import "./_input.less";
-@import "./_navbar.less";
-@import "./_sidebar.less";
-@import "./_truncate.less";
-@import "./_control_group.less";
-@import "./_hintbox.less";
-
-html,
-body {
-  .flex-parent();
-  height: 100%;
-  margin: 0px;
-}
-
-label > small {
-  font-weight: normal;
-}
-
-button {
-  // buttons have a stupid 1990's default look which should be disabled
-  .btn();
-}
-
-.small {
-  font-size: 0.9em !important;
-}
-.smaller {
-  font-size: 0.8em !important;
-}
-.smallest {
-  font-size: 0.7em !important;
-}
-// Colors available for font awesome icons, these might not look good with normal text
-.text-color-primary {
-  color: @brand-primary;
-}
-
-.text-color-info {
-  color: @brand-info;
-}
-
-.text-color-success {
-  color: @brand-success;
-}
-
-.text-color-warning {
-  color: @brand-warning;
-}
-
-.text-color-danger {
-  color: @brand-danger;
-}
-
-.text-monospace {
-  font-family: @font-family-monospace;
-}
-
-code {
-  word-break: break-all;
-  word-wrap: break-word;
-}
-
-// alias for alert types - allows class="fa fa-{{alertType}}"
-.fa-success:before { content: @fa-var-check; }
-.fa-danger:before { content: @fa-var-exclamation-circle; }
-
-ul.navbar-inline li {
-  display: inline;
-}
-
-.tooltip {
-  font-size: 8pt;
-  font-weight: normal;
-  opacity: 90%;
-
-  &-inner {
-    word-break: normal;
-    word-wrap: break-word;
-    white-space: normal;
-  }
-}
-
-.content {
-  .flex-parent();
-  position: relative;
-  z-index: 0;
-
-  > .navbar {
-    position: relative;
-    z-index: 1;
-  }
-}
-
-.application {
-  .flex-parent();
-  position: relative;
-  z-index: 0;
-}
-
-.top-fixed {
-  position: fixed;
-  bottom: 0px;
-}
-
-.checkbox label {
-  .display(flex);
-  .align-items(center);
-  padding-left: 0;
-
-  input[type="checkbox"] {
-    float: none;
-    margin: 0 4px;
-    position: static;
-  }
-}
-
-notifications {
-  z-index: 1;
-}
-
-//== Subnav
-//
-// Use for adding a subnav to your app
-
-.navbar-nav li a {
-  cursor: pointer;
-}
-
-.navbar {
-  margin-bottom: 0px!important;
-}
-
-#kibana-primary-navbar {
-  margin-right: 15px;
-}
-
-[ng-click], [clip-copy], [href], [confirm-click] {
-  cursor: pointer;
-}
-
-//== Config
-.config {
-  .navbar;
-  .navbar-default;
-  .navbar-static-top;
-  border-bottom: 1px solid darken(@body-bg, 10%);
-
-  .config-close {
-    width: 100%;
-    background-color: @well-bg;
-    border-radius: 0;
-    @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
-    .box-shadow(@shadow);
-    text-align: center;
-  }
-
-  .container-fluid {
-    padding: 10px 10px;
-    background-color: @body-bg;
-  }
-}
-
-.app-container {
-  > * {
-    position: relative;
-    z-index: 0;
-  }
-
-  > config {
-    z-index: 1;
-  }
-
-  > nav,
-  > navbar {
-    z-index: 2 !important;
-  }
-}
-
-@import "./_table.less";
-@import "./_notify.less";
-
-//== Nav tweaks
-.nav-condensed > li > a {
-   padding-top: 2px;
-   padding-bottom: 2px;
-}
-
-.navbar > .container-fluid {
-  > .navbar-nav,
-  > .navbar-form {
-    &:not(.pull-right):first-child {
-      // This is how .navbar-brand accomplishes it's solid placement
-      margin-left: -15px;
-    }
-  }
-}
-
-.list-group-menu {
-
-  &.select-mode a{
-     outline: none;
-     color: @link-color;
-  }
-
-  .list-group-menu-item {
-    list-style: none;
-    color: @link-color;
-
-    &.active {
-      font-weight: bold;
-      background-color: @well-bg;
-    }
-    &:hover {
-      background-color: @well-bg;
-    }
-    li {
-      list-style: none;
-      color: @link-color;
-    }
-  }
-}
-
-.navbtn {
-  .button-variant(@navbar-default-color; @navbar-default-bg; @navbar-default-border);
-}
-
-.navbtn-inverse {
-  .button-variant(@navbar-default-color; @navbar-default-bg; @navbar-default-border);
-}
-
-// right section of the main nav base
-.navbar-static-top .navbar-right {
-  font-size: @font-size-small;
-
-  .loading-spinner {
-    color: @navbar-inverse-brand-hover-color;
-    vertical-align: middle;
-  }
-}
-
-.navbar-timepicker {
-  > li > a {
-    padding-left: 7px !important;
-    padding-right: 7px !important;
-  }
-
-  &-time-desc > .fa-clock-o {
-    padding-right: 5px;
-  }
-
-  .fa {
-    font-size: 16px;
-    vertical-align: middle;
-  }
-}
-
-kbn-info i {
-  cursor: help;
-}
-
-.kbn-timepicker .btn-default {
-  background: transparent;
-  color: @text-color;
-  border: 0px;
-  box-shadow: none;
-  text-shadow: none;
-}
-
-.kbn-timepicker .btn-info {
-  .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);
-  text-shadow: none;
-}
-
-.kbn-timepicker .refresh-interval {
-  padding: 0.2em 0.4em;
-  border-radius: @border-radius-small;
-}
-
-.kbn-timepicker .refresh-interval-active {
-  background-color: @btn-info-bg;
-  color: @btn-info-color;
-}
-
-//== Table
-
-kbn-table, .kbn-table {
-  font-size: @font-size-small;
-
-  th {
-    white-space: nowrap;
-    padding-right: 10px;
-
-    .table-header-move, .table-header-sortchange {
-      visibility: hidden;
-    }
-
-    .fa {
-      font-size: 1.1em;
-    }
-
-  }
-
-  th:hover {
-    .table-header-move, .table-header-sortchange {
-      visibility: visible;
-    }
-  }
-
-}
-
-//== Generic Table
-table {
-  td .fa {
-    // font-awesome's override of the line-height usually doesn't
-    // cauase problems, but in the table it pushes the icon to the
-    // top of the row
-    line-height: @line-height-base;
-  }
-}
-
-//== SavedObjectFinder
-saved-object-finder {
-  .form-group {
-    margin-bottom: 0;
-    input {
-      .border-bottom-radius(0);
-    }
-  }
-
-  .list-group-item {
-    &:first-child {
-      .border-top-radius(0) !important;
-    }
-
-    &.list-group-no-results p {
-      margin-bottom: 0 !important;
-    }
-  }
-
-  div.finder-form {
-    position: relative;
-
-    &-options {
-      .flex-parent();
-      .flex-direction(row);
-      .justify-content(flex-end);
-    }
-  }
-
-  span.finder-hit-count {
-    position: absolute;
-    right: 10px;
-    top: 25px;
-    font-size: 0.85em;
-  }
-
-  .finder-options {
-    max-height: 300px;
-    overflow: auto;
-    padding: 0;
-    .border-top-radius(0);
-
-    // replace the padding that was originally on the outer well
-    > * {
-      padding: @padding-base-vertical @padding-base-horizontal;
-      margin: 0;
-    }
-
-    // enable bigger backgrounds for "active" elements
-    > li {
-      margin-top: -ceil(@padding-base-vertical / 2);
-
-      &:first-child {
-        margin: 0;
-      }
-      &.active {
-        background-color: @component-active-bg;
-        color: @component-active-color;
-        a {
-          color: @component-active-color;
-        }
-      }
-    }
-  }
-}
-
-// when rendered within a config dropdown, don't use a bottom margin
-.config saved-object-finder .finder-options {
-  margin-bottom: 0;
-  background: @body-bg;
-}
-
-//== Generic Media List
-.media-object {
-  // image in result list
-  width: 65px;
-  height: 65px;
-}
-
-
-//== inputDatetime
-.input-datetime-format {
-  font-size: @font-size-small;
-  color: @text-muted;
-  padding: @padding-base-vertical @padding-base-horizontal;
-}
-
-//== clicking disabled buttons should not cause the whole page to get selected
-button[disabled] {
-  .user-select(none);
-}
-
-//== override the disabled cursor that doesn't work everywhere
-.form-control{
-  &[disabled],
-  &[readonly],
-  fieldset[disabled] & {
-    cursor: default;
-    opacity: .8;
-  }
-}
-
-.fatal-body {
-  white-space: pre-wrap;
-}
-
-.ng-dirty, .ng-touched {
-  input.ng-invalid&,
-  textarea.ng-invalid&,
-  select.ng-invalid& {
-    border-color: @state-danger-bg !important;
-  }
-}
-
-
-input[type="radio"],
-input[type="checkbox"],
-.radio,
-.radio-inline,
-.checkbox,
-.checkbox-inline {
-  &[disabled],
-  fieldset[disabled] & {
-    cursor: default;
-    opacity: .8;
-  }
-}
-
-textarea {
-  resize: vertical;
-}
-
-.initial-load {
-  margin-top: 60px;
-}
-
-.field-collapse-toggle {
-  color: #999;
-  margin-left: 10px !important;
-}
-
-style-compile {
-  display: none;
-}
-
-.tooltip-inner {
-  white-space: pre-wrap !important;
-}
-
-@import '../components/filter_bar/filter_bar.less';
-
-
-.cell-hover {
-  background-color: white;
-  &-show {
-    // so that the cell doesn't change size on hover
-    visibility: hidden;
-  }
-}
-.cell-hover:hover {
-  background-color: @gray-lighter;
-  cursor: cell;
-
-  .cell-hover-show {
-    visibility: visible;
-  }
-}
-
-mark, .mark {
-  background-color: rgba(252, 229, 113, 1);
-}
-
-fieldset {
-  margin: @form-group-margin-bottom;
-  padding: @form-group-margin-bottom;
-  border: 1px solid @input-border;
-  border-radius: @input-border-radius;
-}
-
-[fixed-scroll] {
-  overflow-x: auto;
-  padding-bottom: 0px;
-
-  + .fixed-scroll-scroller {
-    position: fixed;
-    bottom: 0px;
-    overflow-x: auto;
-    overflow-y: hidden;
-  }
-}
diff --git a/src/kibana/styles/theme/_theme.less b/src/kibana/styles/theme/_theme.less
deleted file mode 100644
index 035339c24151e..0000000000000
--- a/src/kibana/styles/theme/_theme.less
+++ /dev/null
@@ -1,319 +0,0 @@
-// Flatly 3.1.1
-// Bootswatch
-// -----------------------------------------------------
-
-//@import url("//fonts.googleapis.com/css?family=Lato:400,700,400italic");
-
-@import (reference) "../_mixins.less";
-
-
-// Navbar =====================================================================
-
-.navbar {
-  border-width: 0;
-
-  box-shadow: inset 0 -10px 10px -12px #333;
-  -moz-box-shadow: inset 0 -10px 10px -12px #333;
-  -webkit-box-shadow: inset 0 -10px 10px -12px #333;
-
-  &-btn-link {
-    height: @navbar-height;
-    margin: 0;
-    border-radius: 0;
-
-    @media (max-width: @screen-sm-min) {
-      width: 100%;
-      text-align: left;
-    }
-  }
-
-  &-default {
-
-    .badge {
-      background-color: #fff;
-      color: @navbar-default-bg;
-    }
-
-    .navbar-nav > .active > a {
-      .nav-active-arrow(@body-bg);
-    }
-
-  }
-
-  &-inverse {
-    .logo {
-
-      @media (max-width: @screen-md-max) {
-        width: 45px
-      }
-
-      background-image: url('../images/no_border.png');
-      height: @navbar-height;
-      width: 252px;
-    }
-
-    .badge {
-      background-color: #fff;
-      color: lighten(@navbar-inverse-bg, 10%);
-    }
-
-
-    .navbar-nav {
-      > .active > a {
-        .nav-active-arrow(@navbar-default-bg);
-      }
-
-      > .active.to-body > a {
-        .nav-active-arrow(@body-bg);
-      }
-    }
-
-  }
-
-  &-brand {
-    cursor: default;
-    font-size: 1.8em;
-    background-color: @navbar-inverse-brand-bg;
-    .user-select(none);
-  }
-
-  &-nav {
-    font-size: @font-size-small;
-  }
-
-  &-toggle {
-    margin-top: 4px;
-  }
-}
-
-// Buttons ====================================================================
-
-.btn:active {
-  .box-shadow(none);
-}
-
-.btn-group.open .dropdown-toggle {
-  .box-shadow(none);
-}
-
-/* Small devices (tablets, 768px and smaller) */
-@media (max-width: @screen-sm-min) {
-  .btn {
-    /* Fixes an issue with buttons not respecting the bounds of the screen */
-    white-space: normal;
-  }
-}
-
-// Typography =================================================================
-
-.text-primary,
-.text-primary:hover {
-  color: @brand-primary;
-}
-
-.text-success,
-.text-success:hover {
-  color: @brand-success;
-}
-
-.text-danger,
-.text-danger:hover {
-  color: @brand-danger;
-}
-
-.text-warning,
-.text-warning:hover {
-  color: @brand-warning;
-}
-
-.text-info,
-.text-info:hover {
-  color: @brand-info;
-}
-
-// Tables =====================================================================
-
-table,
-.table {
-
-  a {
-    text-decoration: underline;
-  }
-
-  .success,
-  .warning,
-  .danger,
-  .info {
-    color: #fff;
-
-    a {
-      color: #fff;
-    }
-  }
-
-  // > thead > tr > th,
-  // > tbody > tr > th,
-  // > tfoot > tr > th,
-  // > thead > tr > td,
-  // > tbody > tr > td,
-  // > tfoot > tr > td {
-  //   border: none;
-  // }
-
-  &-bordered > thead > tr > th,
-  &-bordered > tbody > tr > th,
-  &-bordered > tfoot > tr > th,
-  &-bordered > thead > tr > td,
-  &-bordered > tbody > tr > td,
-  &-bordered > tfoot > tr > td {
-    border: 1px solid @table-border-color;
-  }
-}
-
-// Forms ======================================================================
-
-.form-control,
-input, {
-  border-width: @input-border-width;
-  .box-shadow(none);
-
-  &:focus {
-    .box-shadow(none);
-  }
-}
-
-.has-warning {
-  .help-block,
-  .control-label,
-  .radio,
-  .checkbox,
-  .radio-inline,
-  .checkbox-inline,
-  .form-control-feedback {
-    color: @brand-warning;
-  }
-
-  .form-control,
-  .form-control:focus {
-    border: @input-border-width solid @brand-warning;
-  }
-
-  .input-group-addon {
-    border-color: @brand-warning;
-  }
-}
-
-.has-error {
-  .help-block,
-  .control-label,
-  .radio,
-  .checkbox,
-  .radio-inline,
-  .checkbox-inline,
-  .form-control-feedback {
-    color: @brand-danger;
-  }
-
-  .form-control,
-  .form-control:focus {
-    border: @input-border-width solid @brand-danger;
-  }
-
-  .input-group-addon {
-    border-color: @brand-danger;
-  }
-}
-
-.has-success {
-  .help-block,
-  .control-label,
-  .radio,
-  .checkbox,
-  .radio-inline,
-  .checkbox-inline,
-  .form-control-feedback {
-    color: @brand-success;
-  }
-
-  .form-control,
-  .form-control:focus {
-    border: solid @brand-success;
-  }
-
-  .input-group-addon {
-    border-color: @brand-success;
-  }
-}
-
-// Navs =======================================================================
-
-.nav {
-  .open > a,
-  .open > a:hover,
-  .open > a:focus {
-    border-color: transparent;
-  }
-}
-
-.pager {
-  a,
-  a:hover {
-    color: #fff;
-  }
-
-  .disabled {
-    &>a,
-    &>a:hover,
-    &>a:focus,
-    &>span {
-      background-color: @pagination-disabled-bg;
-    }
-  }
-}
-
-
-// Panel =================================================================
-
-.panel {
-  border-radius: 0;
-  .box-shadow(0 0 0 rgba(0,0,0,0));
-}
-
-// Indicators =================================================================
-
-.alert {
-
-  a,
-  .alert-link {
-    color: #fff;
-    text-decoration: underline;
-  }
-
-  .close {
-    color: #fff;
-    text-decoration: none;
-    opacity: 0.4;
-
-    &:hover,
-    &:focus {
-      color: #fff;
-      opacity: 1;
-    }
-  }
-}
-
-// Progress bars ==============================================================
-
-.progress {
-  .box-shadow(none);
-  .progress-bar {
-    font-size: 10px;
-    line-height: 10px;
-  }
-}
-
-// Containers =================================================================
-
-.well {
-  .box-shadow(none);
-}
diff --git a/src/kibana/styles/theme/_variables.less b/src/kibana/styles/theme/_variables.less
deleted file mode 100644
index ab995077beeef..0000000000000
--- a/src/kibana/styles/theme/_variables.less
+++ /dev/null
@@ -1,881 +0,0 @@
-@import "../_variables.less";
-
-// Flatly 3.1.1
-// Variables
-// --------------------------------------------------
-
-
-//== Colors
-//
-//## Gray and brand colors for use across Bootstrap.
-
-@gray-base:              #000;
-@gray-darker:            lighten(@gray-base, 13.5%);
-@gray-dark:              #7b8a8b;
-@gray:                   #95a5a6;
-@gray-light:             #b4bcc2;
-@gray-lighter:           #ecf0f1;
-
-@brand-primary:         #444444;
-@brand-success:         #31C471; // #18BC9C
-@brand-info:            #1F6B7A;
-@brand-warning:         #F39C12;
-@brand-danger:          #E74C3C;
-
-
-//== Scaffolding
-//
-// ## Settings for some of the most global styles.
-
-//** Background color for `<body>`.
-@body-bg:               #fff;
-//** Global text color on `<body>`.
-@text-color:            @brand-primary;
-
-//** Global textual link color.
-@link-color:            #1F6B7A;
-//** Link hover color set via `darken()` function.
-@link-hover-color:      lighten(@link-color, 10%);
-@link-hover-decoration: none;
-
-
-@dl-horizontal-offset:        @component-offset-horizontal;
-
-//** Disabled cursor for form controls and buttons.
-@cursor-disabled:                not-allowed;
-
-//== Typography
-//
-//## Font, line-height, and color for body text, headings, and more.
-
-@font-family-sans-serif:  "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
-@font-family-serif:       Georgia, "Times New Roman", Times, serif;
-//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
-@font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
-@font-family-base:        @font-family-sans-serif;
-
-@font-size-base:          13px;
-@font-size-large:         ceil((@font-size-base * 1.25)); // ~18px
-@font-size-small:         ceil((@font-size-base * 0.85)); // ~12px
-
-@font-size-h1:            floor((@font-size-base * 2.6)); // ~36px
-@font-size-h2:            floor((@font-size-base * 2.15)); // ~30px
-@font-size-h3:            ceil((@font-size-base * 1.7)); // ~24px
-@font-size-h4:            ceil((@font-size-base * 1.25)); // ~18px
-@font-size-h5:            @font-size-base;
-@font-size-h6:            ceil((@font-size-base * 0.85)); // ~12px
-
-//** Unit-less `line-height` for use in components like buttons.
-@line-height-base:        1.428571429; // 20/14
-//@line-height-base: 1;
-//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
-@line-height-computed:    floor((@font-size-base * @line-height-base)); // ~20px
-
-//** By default, this inherits from the `<body>`.
-@headings-font-family:    @font-family-base;
-@headings-font-weight:    400;
-@headings-line-height:    1.1;
-@headings-color:          inherit;
-
-
-//-- Iconography
-//
-//## Specify custom locations of the include Glyphicons icon font. Useful for those including Bootstrap via Bower.
-
-@icon-font-path:          "../fonts/";
-@icon-font-name:          "glyphicons-halflings-regular";
-@icon-font-svg-id:        "glyphicons_halflingsregular";
-
-//== Components
-//
-//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
-
-@padding-base-vertical:     5px;
-@padding-base-horizontal:   15px;
-
-@padding-large-vertical:    18px;
-@padding-large-horizontal:  27px;
-
-@padding-small-vertical:    6px;
-@padding-small-horizontal:  9px;
-
-@padding-xs-vertical:       1px;
-@padding-xs-horizontal:     5px;
-
-@line-height-large:         1.33;
-@line-height-small:         1.5;
-
-@border-radius-base:        4px;
-@border-radius-large:       6px;
-@border-radius-small:       3px;
-
-//** Global color for active items (e.g., navs or dropdowns).
-@component-active-color:    #fff;
-//** Global background color for active items (e.g., navs or dropdowns).
-@component-active-bg:       @brand-primary;
-
-//** Width of the `border` for generating carets that indicator dropdowns.
-@caret-width-base:          4px;
-//** Carets increase slightly in size for larger components.
-@caret-width-large:         5px;
-
-
-//== Tables
-//
-//## Customizes the `.table` component with basic values, each used across all table variations.
-
-//** Padding for `<th>`s and `<td>`s.
-@table-cell-padding:            8px;
-//** Padding for cells in `.table-condensed`.
-@table-condensed-cell-padding:  5px;
-
-//** Default background color used for all tables.
-@table-bg:                      transparent;
-//** Background color used for `.table-striped`.
-@table-bg-accent:               #f9f9f9;
-//** Background color used for `.table-hover`.
-@table-bg-hover:                @gray-lighter;
-@table-bg-active:               @table-bg-hover;
-
-//** Border color for table and cell borders.
-@table-border-color:            @gray-lighter;
-
-
-//== Buttons
-//
-//## For each of Bootstrap's buttons, define text, background and border color.
-
-@btn-font-weight:                normal;
-
-@btn-default-color:              #fff;
-@btn-default-bg:                 @gray;
-@btn-default-border:             @btn-default-bg;
-
-@btn-primary-color:              @btn-default-color;
-@btn-primary-bg:                 @brand-primary;
-@btn-primary-border:             @btn-primary-bg;
-
-@btn-success-color:              @btn-default-color;
-@btn-success-bg:                 @brand-success;
-@btn-success-border:             @btn-success-bg;
-
-@btn-info-color:                 @btn-default-color;
-@btn-info-bg:                    @brand-info;
-@btn-info-border:                @btn-info-bg;
-
-@btn-warning-color:              @btn-default-color;
-@btn-warning-bg:                 @brand-warning;
-@btn-warning-border:             @btn-warning-bg;
-
-@btn-danger-color:               @btn-default-color;
-@btn-danger-bg:                  @brand-danger;
-@btn-danger-border:              @btn-danger-bg;
-
-@btn-link-disabled-color:        @gray-light;
-
-
-//== Forms
-//
-//##
-
-//** `<input>` background color
-@input-bg:                       #fff;
-//** `<input disabled>` background color
-@input-bg-disabled:              @gray-lighter;
-
-//** Text color for `<input>`s
-@input-color:                    @text-color;
-//** `<input>` border color
-@input-border:                   @gray-lighter;
-
-// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
-//** Default `.form-control` border radius
-@input-border-radius:            @border-radius-base;
-//** Large `.form-control` border radius
-@input-border-radius-large:      @border-radius-large;
-//** Small `.form-control` border radius
-@input-border-radius-small:      @border-radius-small;
-
-//** Border color for inputs on focus
-@input-border-focus:             @gray-light;
-
-//** Placeholder text color
-@input-color-placeholder:        #acb6c0;
-
-//** Default `.form-control` height
-@input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);
-//** Large `.form-control` height
-@input-height-large:             (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
-//** Small `.form-control` height
-@input-height-small:             (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
-
-//** `.form-group` margin
-@form-group-margin-bottom:       15px;
-
-@legend-color:                   @text-color;
-@legend-border-color:            transparent;
-
-//** Background color for textual input addons
-@input-group-addon-bg:           @gray-lighter;
-//** Border color for textual input addons
-@input-group-addon-border-color: @input-border;
-
-
-//== Dropdowns
-//
-//## Dropdown menu container and contents.
-
-//** Background for the dropdown menu.
-@dropdown-bg:                    #fff;
-//** Dropdown menu `border-color`.
-@dropdown-border:                rgba(0,0,0,.15);
-//** Dropdown menu `border-color` **for IE8**.
-@dropdown-fallback-border:       #ccc;
-//** Divider color for between dropdown items.
-@dropdown-divider-bg:            #e5e5e5;
-
-//** Dropdown link text color.
-@dropdown-link-color:            @gray-dark;
-//** Hover color for dropdown links.
-@dropdown-link-hover-color:      #fff;
-//** Hover background for dropdown links.
-@dropdown-link-hover-bg:         @dropdown-link-active-bg;
-
-//** Active dropdown menu item text color.
-@dropdown-link-active-color:     #fff;
-//** Active dropdown menu item background color.
-@dropdown-link-active-bg:        @component-active-bg;
-
-//** Disabled dropdown menu item background color.
-@dropdown-link-disabled-color:   @text-muted;
-
-//** Text color for headers within dropdown menus.
-@dropdown-header-color:          @text-muted;
-
-// Note: Deprecated @dropdown-caret-color as of v3.1.0
-@dropdown-caret-color:           #000;
-
-
-//-- Z-index master list
-//
-// Warning: Avoid customizing these values. They're used for a bird's eye view
-// of components dependent on the z-axis and are designed to all work together.
-//
-// Note: These variables are not generated into the Customizer.
-
-@zindex-navbar:            1000;
-@zindex-dropdown:          1000;
-@zindex-popover:           1010;
-@zindex-tooltip:           1020;
-@zindex-typeahead:         1030;
-@zindex-tooltip:           1040;
-@zindex-navbar-fixed:      1050;
-@zindex-modal-background:  1060;
-@zindex-modal:             1070;
-
-
-//== Media queries breakpoints
-//
-//## Define the breakpoints at which your layout will change, adapting to different screen sizes.
-
-// Extra small screen / phone
-// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1
-@screen-xs:                  480px;
-@screen-xs-min:              @screen-xs;
-@screen-phone:               @screen-xs-min;
-
-// Small screen / tablet
-// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1
-@screen-sm:                  768px;
-@screen-sm-min:              @screen-sm;
-@screen-tablet:              @screen-sm-min;
-
-// Medium screen / desktop
-// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1
-@screen-md:                  992px;
-@screen-md-min:              @screen-md;
-@screen-desktop:             @screen-md-min;
-
-// Large screen / wide desktop
-// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1
-@screen-lg:                  1200px;
-@screen-lg-min:              @screen-lg;
-@screen-lg-desktop:          @screen-lg-min;
-
-// So media queries don't overlap when required, provide a maximum
-@screen-xs-max:              (@screen-sm-min - 1);
-@screen-sm-max:              (@screen-md-min - 1);
-@screen-md-max:              (@screen-lg-min - 1);
-
-
-//== Grid system
-//
-//## Define your custom responsive grid.
-
-//** Number of columns in the grid.
-@grid-columns:              12;
-//** Padding between columns. Gets divided in half for the left and right.
-@grid-gutter-width:         30px;
-// Navbar collapse
-//** Point at which the navbar becomes uncollapsed.
-@grid-float-breakpoint:     @screen-sm-min;
-//** Point at which the navbar begins collapsing.
-@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
-
-
-//== Container sizes
-//
-//## Define the maximum width of `.container` for different screen sizes.
-
-// Small screen / tablet
-@container-tablet:             ((720px + @grid-gutter-width));
-//** For `@screen-sm-min` and up.
-@container-sm:                 @container-tablet;
-
-// Medium screen / desktop
-@container-desktop:            ((940px + @grid-gutter-width));
-//** For `@screen-md-min` and up.
-@container-md:                 @container-desktop;
-
-// Large screen / wide desktop
-@container-large-desktop:      ((1140px + @grid-gutter-width));
-//** For `@screen-lg-min` and up.
-@container-lg:                 @container-large-desktop;
-
-
-//== Control Group
-@control-group-color:                  @text-color;
-@control-group-bg:                     inherit;
-@control-group-border:                 @gray-dark;
-@control-group-link-color:             @link-color;
-@control-group-link-hover-color:       @gray-lighter;
-@control-group-link-hover-bg:          lighten(@brand-primary, 10%);
-@control-group-link-active-color:      @gray-light;
-@control-group-link-active-bg:         lighten(@brand-primary, 10%);
-@control-group-link-disabled-color:    @gray-light;
-@control-group-link-disabled-bg:       transparent;
-
-//== Navbar
-//
-//##
-
-// Basics of a navbar
-@navbar-height:                    45px;
-@navbar-margin-bottom:             0px;
-@navbar-border-radius:             @border-radius-base;
-@navbar-padding-horizontal:        floor((@grid-gutter-width / 2));
-@navbar-padding-vertical:          ((@navbar-height - @line-height-computed) / 2);
-@navbar-collapse-max-height:       340px;
-
-@navbar-arrow-size:                7px;
-
-// Default theme
-@navbar-default-color:               #fff;
-@navbar-default-bg:                  #656A76;
-@navbar-default-border:              darken(@navbar-default-bg, 10%);
-@navbar-default-link-color:          @gray-lighter;
-@navbar-default-link-hover-color:    #fff;
-@navbar-default-link-hover-bg:       transparent;
-@navbar-default-link-active-color:   #fff;
-@navbar-default-link-active-bg:      darken(@navbar-default-bg, 10%);
-@navbar-default-link-disabled-color: #ccc;
-@navbar-default-link-disabled-bg:    transparent;
-
-// Navbar brand label
-@navbar-default-brand-color:               @navbar-default-link-color;
-@navbar-default-brand-hover-color:         @navbar-default-link-hover-color;
-@navbar-default-brand-hover-bg:            transparent;
-
-// Navbar toggle
-@navbar-default-toggle-hover-bg:           darken(@navbar-default-bg, 10%);
-@navbar-default-toggle-icon-bar-bg:        #fff;
-@navbar-default-toggle-border-color:       darken(@navbar-default-bg, 10%);
-
-
-// Inverted navbar
-// Reset inverted navbar basics
-@navbar-inverse-color:                      #fff;
-@navbar-inverse-bg:                         @gray-darker;
-@navbar-inverse-border:                     darken(@navbar-inverse-bg, 10%);
-
-// Inverted navbar links
-@navbar-inverse-link-color:                 @gray-lighter;
-@navbar-inverse-link-hover-color:           #fff;
-@navbar-inverse-link-hover-bg:              lighten(@navbar-inverse-bg, 20%);
-@navbar-inverse-link-active-color:          #fff;
-@navbar-inverse-link-active-bg:             #41454c;
-@navbar-inverse-link-disabled-color:        @gray-light;
-@navbar-inverse-link-disabled-bg:           transparent;
-
-// Inverted navbar brand label
-@navbar-inverse-brand-color:                white;
-@navbar-inverse-brand-bg:                   lighten(@navbar-inverse-bg, 10%);
-@navbar-inverse-brand-hover-color:          @navbar-inverse-brand-color;
-@navbar-inverse-brand-hover-bg:             @navbar-inverse-brand-bg;
-
-// Inverted navbar toggle
-@navbar-inverse-toggle-hover-bg:            darken(@navbar-inverse-bg, 10%);
-@navbar-inverse-toggle-icon-bar-bg:         #fff;
-@navbar-inverse-toggle-border-color:        darken(@navbar-inverse-bg, 10%);
-
-
-//== Navs
-//
-//##
-
-//=== Shared nav styles
-@nav-link-padding:                          10px 15px;
-@nav-link-hover-bg:                         @gray-lighter;
-
-@nav-disabled-link-color:                   @gray-light;
-@nav-disabled-link-hover-color:             @gray-light;
-
-@nav-open-link-hover-color:                 #fff;
-
-//== Tabs
-@nav-tabs-border-color:                     @gray-lighter;
-
-@nav-tabs-link-hover-border-color:          @gray-lighter;
-
-@nav-tabs-active-link-hover-bg:             @body-bg;
-@nav-tabs-active-link-hover-color:          @brand-primary;
-@nav-tabs-active-link-hover-border-color:   @gray-lighter;
-
-@nav-tabs-justified-link-border-color:            @gray-lighter;
-@nav-tabs-justified-active-link-border-color:     @body-bg;
-
-//== Pills
-@nav-pills-border-radius:                   @border-radius-base;
-@nav-pills-active-link-hover-bg:            @component-active-bg;
-@nav-pills-active-link-hover-color:         @component-active-color;
-
-
-//== Pagination
-//
-//##
-
-@pagination-color:                     @link-color;
-@pagination-bg:                        transparent;
-@pagination-border:                    transparent;
-
-@pagination-hover-color:               @link-color;
-@pagination-hover-bg:                  darken(transparent, 15%);
-@pagination-hover-border:              transparent;
-
-@pagination-active-color:              @text-color;
-@pagination-active-bg:                 darken(transparent, 15%);
-@pagination-active-border:             transparent;
-
-@pagination-disabled-color:            @gray-darker;
-@pagination-disabled-bg:               lighten(transparent, 15%);;
-@pagination-disabled-border:           transparent;
-
-
-//== Pager
-//
-//##
-
-@pager-bg:                             @pagination-bg;
-@pager-border:                         @pagination-border;
-@pager-border-radius:                  0px;
-
-@pager-hover-bg:                       @pagination-hover-bg;
-
-@pager-active-bg:                      @pagination-active-bg;
-@pager-active-color:                   @pagination-active-color;
-
-@pager-disabled-color:                 #fff;
-
-
-//== Jumbotron
-//
-//##
-
-@jumbotron-padding:              30px;
-@jumbotron-color:                inherit;
-@jumbotron-bg:                   @gray-lighter;
-@jumbotron-heading-color:        inherit;
-@jumbotron-font-size:            ceil((@font-size-base * 1.5));
-
-
-//== Form states and alerts
-//
-//## Define colors for form feedback states and, by default, alerts.
-
-@state-success-text:             #fff;
-@state-success-bg:               @brand-success;
-@state-success-border:           darken(@brand-success, 10%);
-
-@state-info-text:                #fff;
-@state-info-bg:                  @brand-info;
-@state-info-border:              darken(@brand-info, 10%);
-
-@state-warning-text:             #fff;
-@state-warning-bg:               @brand-warning;
-@state-warning-border:           darken(@brand-warning, 10%);
-
-@state-danger-text:              #fff;
-@state-danger-bg:                @brand-danger;
-@state-danger-border:            darken(@brand-danger, 10%);
-
-
-//== Tooltips
-//
-//##
-
-//** Tooltip max width
-@tooltip-max-width:           200px;
-//** Tooltip text color
-@tooltip-color:               #fff;
-//** Tooltip background color
-@tooltip-bg:                  rgba(0,0,0,.9);
-@tooltip-opacity:             .9;
-
-//** Tooltip arrow width
-@tooltip-arrow-width:         5px;
-//** Tooltip arrow color
-@tooltip-arrow-color:         @tooltip-bg;
-
-
-//== Popovers
-//
-//##
-
-//** Popover body background color
-@popover-bg:                          #fff;
-//** Popover maximum width
-@popover-max-width:                   276px;
-//** Popover border color
-@popover-border-color:                rgba(0,0,0,.2);
-//** Popover fallback border color
-@popover-fallback-border-color:       #ccc;
-
-//** Popover title background color
-@popover-title-bg:                    darken(@popover-bg, 3%);
-
-//** Popover arrow width
-@popover-arrow-width:                 10px;
-//** Popover arrow color
-@popover-arrow-color:                 #fff;
-
-//** Popover outer arrow width
-@popover-arrow-outer-width:           (@popover-arrow-width + 1);
-//** Popover outer arrow color
-@popover-arrow-outer-color:           fadein(@popover-border-color, 5%);
-//** Popover outer arrow fallback color
-@popover-arrow-outer-fallback-color:  darken(@popover-fallback-border-color, 20%);
-
-
-//== Labels
-//
-//##
-
-//** Default label background color
-@label-default-bg:            @btn-default-bg;
-//** Primary label background color
-@label-primary-bg:            @brand-primary;
-//** Success label background color
-@label-success-bg:            @brand-success;
-//** Info label background color
-@label-info-bg:               @brand-info;
-//** Warning label background color
-@label-warning-bg:            @brand-warning;
-//** Danger label background color
-@label-danger-bg:             @brand-danger;
-
-//** Default label text color
-@label-color:                 #fff;
-//** Default text color of a linked label
-@label-link-hover-color:      #fff;
-
-
-//== Modals
-//
-//##
-
-//** Padding applied to the modal body
-@modal-inner-padding:         20px;
-
-//** Padding applied to the modal title
-@modal-title-padding:         15px;
-//** Modal title line-height
-@modal-title-line-height:     @line-height-base;
-
-//** Background color of modal content area
-@modal-content-bg:                             #fff;
-//** Modal content border color
-@modal-content-border-color:                   rgba(0,0,0,.2);
-//** Modal content border color **for IE8**
-@modal-content-fallback-border-color:          #999;
-
-//** Modal backdrop background color
-@modal-backdrop-bg:           #000;
-//** Modal backdrop opacity
-@modal-backdrop-opacity:      .5;
-//** Modal header border color
-@modal-header-border-color:   #e5e5e5;
-//** Modal footer border color
-@modal-footer-border-color:   @modal-header-border-color;
-
-@modal-lg:                    900px;
-@modal-md:                    600px;
-@modal-sm:                    300px;
-
-
-//== Alerts
-//
-//## Define alert colors, border radius, and padding.
-
-@alert-padding:               15px;
-@alert-border-radius:         @border-radius-base;
-@alert-link-font-weight:      bold;
-
-@alert-success-bg:            @state-success-bg;
-@alert-success-text:          @state-success-text;
-@alert-success-border:        @state-success-border;
-
-@alert-info-bg:               @state-info-bg;
-@alert-info-text:             @state-info-text;
-@alert-info-border:           @state-info-border;
-
-@alert-warning-bg:            @state-warning-bg;
-@alert-warning-text:          @state-warning-text;
-@alert-warning-border:        @state-warning-border;
-
-@alert-danger-bg:             @state-danger-bg;
-@alert-danger-text:           @state-danger-text;
-@alert-danger-border:         @state-danger-border;
-
-
-//== Progress bars
-//
-//##
-
-//** Background color of the whole progress component
-@progress-bg:                 @gray-lighter;
-//** Progress bar text color
-@progress-bar-color:          #fff;
-
-//** Variable for setting rounded corners on progress bar.
-@progress-border-radius:      @border-radius-base;
-
-//** Default progress bar color
-@progress-bar-bg:             @brand-primary;
-//** Success progress bar color
-@progress-bar-success-bg:     @brand-success;
-//** Warning progress bar color
-@progress-bar-warning-bg:     @brand-warning;
-//** Danger progress bar color
-@progress-bar-danger-bg:      @brand-danger;
-//** Info progress bar color
-@progress-bar-info-bg:        @brand-info;
-
-
-//== List group
-//
-//##
-
-//** Background color on `.list-group-item`
-@list-group-bg:                 #fff;
-//** `.list-group-item` border color
-@list-group-border:             #ddd;
-//** List group border radius
-@list-group-border-radius:      @border-radius-base;
-
-//** Background color of single list items on hover
-@list-group-hover-bg:           #f5f5f5;
-//** Text color of active list items
-@list-group-active-color:       @text-color;
-//** Background color of active list items
-@list-group-active-bg:          @component-active-bg;
-//** Border color of active list elements
-@list-group-active-border:      @list-group-active-bg;
-//** Text color for content within active list items
-@list-group-active-text-color:  lighten(@list-group-active-bg, 40%);
-
-//** Text color of disabled list items
-@list-group-disabled-color:      @gray-light;
-//** Background color of disabled list items
-@list-group-disabled-bg:         @gray-lighter;
-//** Text color for content within disabled list items
-@list-group-disabled-text-color: @list-group-disabled-color;
-
-@list-group-link-color:         #555;
-@list-group-link-hover-color:   @list-group-link-color;
-@list-group-link-heading-color: #333;
-
-
-//== Panels
-//
-//##
-
-@panel-bg:                    #fff;
-@panel-body-padding:          15px;
-@panel-heading-padding:       10px 15px;
-@panel-footer-padding:        @panel-heading-padding;
-@panel-border-radius:         @border-radius-base;
-
-//** Border color for elements within panels
-@panel-inner-border:          #ddd;
-@panel-footer-bg:             #f5f5f5;
-
-@panel-default-text:          @gray-dark;
-@panel-default-border:        #ddd;
-@panel-default-heading-bg:    #f5f5f5;
-
-@panel-primary-text:          #fff;
-@panel-primary-border:        @brand-primary;
-@panel-primary-heading-bg:    @brand-primary;
-
-@panel-success-text:          @state-success-text;
-@panel-success-border:        @state-success-border;
-@panel-success-heading-bg:    @state-success-bg;
-
-@panel-info-text:             @state-info-text;
-@panel-info-border:           @state-info-border;
-@panel-info-heading-bg:       @state-info-bg;
-
-@panel-warning-text:          @state-warning-text;
-@panel-warning-border:        @state-warning-border;
-@panel-warning-heading-bg:    @state-warning-bg;
-
-@panel-danger-text:           @state-danger-text;
-@panel-danger-border:         @state-danger-border;
-@panel-danger-heading-bg:     @state-danger-bg;
-
-
-//== Thumbnails
-//
-//##
-
-//** Padding around the thumbnail image
-@thumbnail-padding:           4px;
-//** Thumbnail background color
-@thumbnail-bg:                @body-bg;
-//** Thumbnail border color
-@thumbnail-border:            @gray-lighter;
-//** Thumbnail border radius
-@thumbnail-border-radius:     @border-radius-base;
-
-//** Custom text color for thumbnail captions
-@thumbnail-caption-color:     @text-color;
-//** Padding around the thumbnail caption
-@thumbnail-caption-padding:   9px;
-
-
-//== Wells
-//
-//##
-
-@well-bg:                     @gray-lighter;
-@well-border:                 transparent;
-
-
-//== Badges
-//
-//##
-
-@badge-color:                 #fff;
-//** Linked badge text color on hover
-@badge-link-hover-color:      #fff;
-@badge-bg:                    @brand-primary;
-
-//** Badge text color in active nav link
-@badge-active-color:          @brand-primary;
-//** Badge background color in active nav link
-@badge-active-bg:             #fff;
-
-@badge-font-weight:           bold;
-@badge-line-height:           1;
-@badge-border-radius:         10px;
-
-
-//== Breadcrumbs
-//
-//##
-
-@breadcrumb-padding-vertical:   8px;
-@breadcrumb-padding-horizontal: 15px;
-//** Breadcrumb background color
-@breadcrumb-bg:                 @gray-lighter;
-//** Breadcrumb text color
-@breadcrumb-color:              #ccc;
-//** Text color of current page in the breadcrumb
-@breadcrumb-active-color:       @gray;
-//** Textual separator for between breadcrumb elements
-@breadcrumb-separator:          "/";
-
-
-//== Carousel
-//
-//##
-
-@carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6);
-
-@carousel-control-color:                      #fff;
-@carousel-control-width:                      15%;
-@carousel-control-opacity:                    .5;
-@carousel-control-font-size:                  20px;
-
-@carousel-indicator-active-bg:                #fff;
-@carousel-indicator-border-color:             #fff;
-
-@carousel-caption-color:                      #fff;
-
-
-//== Close
-//
-//##
-
-@close-font-weight:           bold;
-@close-color:                 #000;
-@close-text-shadow:           none;
-
-
-//== Code
-//
-//##
-
-@code-color:                  #c7254e;
-@code-bg:                     #f9f2f4;
-
-@kbd-color:                   #fff;
-@kbd-bg:                      #333;
-
-@pre-bg:                      @gray-lighter;
-@pre-color:                   @gray-dark;
-@pre-border-color:            #ccc;
-@pre-scrollable-max-height:   340px;
-
-
-//== Type
-//
-//##
-
-//** Text muted color
-@text-muted:                  @gray-light;
-//** Abbreviations and acronyms border color
-@abbr-border-color:           @gray-light;
-//** Headings small color
-@headings-small-color:        @gray-light;
-//** Blockquote small color
-@blockquote-small-color:      @gray-light;
-//** Blockquote font size
-@blockquote-font-size:        (@font-size-base * 1.25);
-//** Blockquote border color
-@blockquote-border-color:     @gray-lighter;
-//** Page header border color
-@page-header-border-color:    transparent;
-
-
-//== Miscellaneous
-//
-//##
-
-//** Horizontal line color.
-@hr-border:                   @gray-lighter;
-
-//** Horizontal offset for forms and lists.
-@component-offset-horizontal: 180px;
-
-@loading-opacity:             0.5;
diff --git a/src/kibana/utils/SimpleEmitter.js b/src/kibana/utils/SimpleEmitter.js
deleted file mode 100644
index 500b883cfc8cb..0000000000000
--- a/src/kibana/utils/SimpleEmitter.js
+++ /dev/null
@@ -1,121 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var BaseObject = require('utils/BaseObject');
-
-  /**
-   * Simple event emitter class used in the vislib. Calls
-   * handlers synchronously and implements a chainable api
-   *
-   * @class
-   */
-  _.class(SimpleEmitter).inherits(BaseObject);
-  function SimpleEmitter() {
-    this._listeners = {};
-  }
-
-  /**
-   * Add an event handler
-   *
-   * @param  {string} name
-   * @param  {function} handler
-   * @return {SimpleEmitter} - this, for chaining
-   */
-  SimpleEmitter.prototype.on = function (name, handler) {
-    var handlers = this._listeners[name];
-    if (!handlers) handlers = this._listeners[name] = [];
-
-    handlers.push(handler);
-
-    return this;
-  };
-
-  /**
-   * Remove an event handler
-   *
-   * @param  {string} name
-   * @param  {function} [handler] - optional handler to remove, if no handler is
-   *                              passed then all are removed
-   * @return {SimpleEmitter} - this, for chaining
-   */
-  SimpleEmitter.prototype.off = function (name, handler) {
-    if (!this._listeners[name]) {
-      return this;
-    }
-
-    // remove a specific handler
-    if (handler) _.pull(this._listeners[name], handler);
-    // or remove all listeners
-    else this._listeners[name] = null;
-
-    return this;
-  };
-
-  /**
-   * Remove all event listeners bound to this emitter.
-   *
-   * @return {SimpleEmitter} - this, for chaining
-   */
-  SimpleEmitter.prototype.removeAllListeners = function () {
-    this._listeners = {};
-    return this;
-  };
-
-  /**
-   * Emit an event and all arguments to all listeners for an event name
-   *
-   * @param  {string} name
-   * @param  {*} [arg...] - any number of arguments that will be applied to each handler
-   * @return {SimpleEmitter} - this, for chaining
-   */
-  SimpleEmitter.prototype.emit = _.restParam(function (name, args) {
-    if (!this._listeners[name]) return this;
-    var listeners = this.listeners(name);
-    var i = -1;
-
-    while (++i < listeners.length) {
-      listeners[i].apply(this, args);
-    }
-
-    return this;
-  });
-
-  /**
-   * Get a list of the event names that currently have listeners
-   *
-   * @return {array[string]}
-   */
-  SimpleEmitter.prototype.activeEvents = function () {
-    return _.reduce(this._listeners, function (active, listeners, name) {
-      return active.concat(_.size(listeners) ? name : []);
-    }, []);
-  };
-
-  /**
-   * Get a list of the handler functions for a specific event
-   *
-   * @param  {string} name
-   * @return {array[function]}
-   */
-  SimpleEmitter.prototype.listeners = function (name) {
-    return this._listeners[name] ? this._listeners[name].slice(0) : [];
-  };
-
-  /**
-   * Get the count of handlers for a specific event
-   *
-   * @param  {string} [name] - optional event name to filter by
-   * @return {number}
-   */
-  SimpleEmitter.prototype.listenerCount = function (name) {
-    if (name) {
-      return _.size(this._listeners[name]);
-    }
-
-    return _.reduce(this._listeners, function (count, handlers) {
-      return count + _.size(handlers);
-    }, 0);
-  };
-
-
-  return SimpleEmitter;
-});
diff --git a/src/kibana/utils/cidr_mask.js b/src/kibana/utils/cidr_mask.js
deleted file mode 100644
index 22dd66a408a0c..0000000000000
--- a/src/kibana/utils/cidr_mask.js
+++ /dev/null
@@ -1,32 +0,0 @@
-define(function (require) {
-  var Ipv4Address = require('utils/ipv4_address');
-  var NUM_BITS = 32;
-
-  function throwError(mask) {
-    throw Error('Invalid CIDR mask: ' + mask);
-  }
-
-  function CidrMask(mask) {
-    var splits = mask.split('\/');
-    if (splits.length !== 2) throwError(mask);
-    this.initialAddress = new Ipv4Address(splits[0]);
-    this.prefixLength = Number(splits[1]);
-    if (this.prefixLength < 1 || this.prefixLength > NUM_BITS) throwError(mask);
-  }
-
-  CidrMask.prototype.getRange = function () {
-    var variableBits = NUM_BITS - this.prefixLength;
-    var fromAddress = this.initialAddress.valueOf() >> variableBits << variableBits >>> 0; // >>> 0 coerces to unsigned
-    var numAddresses = Math.pow(2, variableBits);
-    return {
-      from: new Ipv4Address(fromAddress).toString(),
-      to: new Ipv4Address(fromAddress + numAddresses - 1).toString()
-    };
-  };
-
-  CidrMask.prototype.toString = function () {
-    return this.initialAddress.toString() + '/' + this.prefixLength;
-  };
-
-  return CidrMask;
-});
\ No newline at end of file
diff --git a/src/kibana/utils/config_template.js b/src/kibana/utils/config_template.js
deleted file mode 100644
index eff806a981a8c..0000000000000
--- a/src/kibana/utils/config_template.js
+++ /dev/null
@@ -1,36 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  function ConfigTemplate(templates) {
-    var template = this;
-    template.current = null;
-    template.toggle = _.partial(update, null);
-    template.open = _.partial(update, true);
-    template.close = _.partial(update, false);
-
-    function update(newState, name) {
-      var toUpdate = templates[name];
-      var curState = template.is(name);
-      if (newState == null) newState = !curState;
-
-      if (newState) {
-        template.current = toUpdate;
-      } else {
-        template.current = null;
-      }
-
-      return newState;
-    }
-
-    template.is = function (name) {
-      return template.current === templates[name];
-    };
-
-    template.toString = function () {
-      return template.current;
-    };
-  }
-
-  return ConfigTemplate;
-
-});
\ No newline at end of file
diff --git a/src/kibana/utils/indexed_array/_path_getter.js b/src/kibana/utils/indexed_array/_path_getter.js
deleted file mode 100644
index 62f82cfe6ae0c..0000000000000
--- a/src/kibana/utils/indexed_array/_path_getter.js
+++ /dev/null
@@ -1,21 +0,0 @@
-define(function (require) {
-  function pathGetter(path) {
-    path = path.split('.');
-    if (path.length === 1) {
-      // shortcut for non-path based get
-      path = path.pop();
-      return function (obj) {
-        return obj[path];
-      };
-    }
-
-    return function (obj) {
-      for (var i = 0; obj != null && i < path.length; i++) {
-        obj = obj[path[i]];
-      }
-      return obj;
-    };
-  }
-
-  return pathGetter;
-});
\ No newline at end of file
diff --git a/src/kibana/utils/indexed_array/index.js b/src/kibana/utils/indexed_array/index.js
deleted file mode 100644
index ddaad666683c7..0000000000000
--- a/src/kibana/utils/indexed_array/index.js
+++ /dev/null
@@ -1,161 +0,0 @@
-define(function (require) {
-
-  var _ = require('lodash');
-
-  var pathGetter = require('utils/indexed_array/_path_getter');
-  var inflector = require('utils/indexed_array/_inflector');
-
-  var inflectIndex = inflector('by');
-  var inflectOrder = inflector('in', 'Order');
-
-  var CLEAR_CACHE = {};
-  var OPT_NAMES = IndexedArray.OPT_NAMES = ['index', 'group', 'order', 'initialSet', 'immutable'];
-
-  /**
-   * Generic extension of Array class, which will index (and reindex) the
-   * objects it contains based on their properties.
-   *
-   * @class  IndexedArray
-   * @module utils
-   * @constructor
-   * @param {object}   [config]            - describes the properties of this registry object
-   * @param {string[]} [config.index]      - a list of props/paths that should be used to index the docs.
-   * @param {string[]} [config.group]      - a list of keys/paths to group docs by.
-   * @param {string[]} [config.order]      - a list of keys/paths to order the keys by.
-   * @param {object[]} [config.initialSet] - the initial dataset the IndexedArray should contain.
-   * @param {boolean}  [config.immutable]  - a flag that hints to people reading the implementation
-   *                                       that this IndexedArray should not be modified. It's modification
-   *                                       methods are also removed
-   */
-  _.class(IndexedArray).inherits(Array);
-  function IndexedArray(config) {
-    IndexedArray.Super.call(this);
-
-    // just to remind future us that this list is important
-    config = _.pick(config || {}, OPT_NAMES);
-
-    this.raw = [];
-
-    // setup indices
-    this._indexNames = _.union(
-      this._setupIndices(config.group, inflectIndex, _.organizeBy),
-      this._setupIndices(config.index, inflectIndex, _.indexBy),
-      this._setupIndices(config.order, inflectOrder, _.sortBy)
-    );
-
-    if (config.initialSet) {
-      this.push.apply(this, config.initialSet);
-    }
-
-    if (config.immutable) {
-      // just a hint, bugs caused by updates not propogating would be very
-      // very very hard to track down
-      this.push = this.splice = undefined;
-    }
-  }
-
-  /**
-   * Create indices for a group of object properties. getters and setters are used to
-   * read and control the indices.
-   *
-   * @param  {string[]} props   - the properties that should be used to index docs
-   * @param  {function} inflect - a function that will be called with a property name, and
-   *                            creates the public property at which the index will be exposed
-   * @param  {function} op      - the function that will be used to create the indices, it is passed
-   *                            the raw representaion of the registry, and a getter for reading the
-   *                            right prop
-   *
-   * @returns {string[]}        - the public keys of all indices created
-   */
-  IndexedArray.prototype._setupIndices = function (props, inflect, op) {
-    // shortcut for empty props
-    if (!props || props.length === 0) return;
-
-    var self = this;
-    return props.map(function (prop) {
-
-      var from = pathGetter(prop);
-      var to = inflect(prop);
-      var cache;
-
-      Object.defineProperty(self, to, {
-        enumerable: false,
-        configurable: false,
-
-        set: function (val) {
-          // can't set any value other than the CLEAR_CACHE constant
-          if (val === CLEAR_CACHE) {
-            cache = false;
-          } else {
-            throw new TypeError(to + ' can not be set, it is a computed index of values');
-          }
-        },
-        get: function () {
-          return cache || (cache = op(self.raw, from));
-        }
-      });
-
-      return to;
-    });
-
-  };
-
-  /**
-   * (Re)run index/group/order procedures to create indices of
-   * sub-objects.
-   *
-   * @return {undefined}
-   */
-  IndexedArray.prototype._clearIndices = function () {
-    var self = this;
-    self._indexNames.forEach(function (name) {
-      self[name] = CLEAR_CACHE;
-    });
-  };
-
-  /**
-   * Copy all array methods which have side-effects, and wrap them
-   * in a function that will reindex after each call, as well
-   * as duplex the operation to the .raw version of the IndexedArray.
-   *
-   * @param  {[type]} method [description]
-   * @return {[type]}        [description]
-   */
-  'pop push shift splice unshift reverse'.split(' ').forEach(function (method) {
-    var orig = Array.prototype[method];
-
-    IndexedArray.prototype[method] = function (/* args... */) {
-      // call the original method with this context
-      orig.apply(this, arguments);
-
-      // run the indexers
-      this._clearIndices();
-
-      // call the original method on our "raw" array, and return the result(s)
-      return orig.apply(this.raw, arguments);
-    };
-  });
-
-  /**
-  * Remove items from this based on a predicate
-  * @param {function|object|string} predicate - the predicate used to decide what is removed
-  * @param {object} context - this binding for predicate
-  * @return {array} - the removed data
-  */
-  IndexedArray.prototype.remove = function (predicate, context) {
-    var out = _.remove(this, predicate, context);
-    _.remove(this.raw, predicate, context);
-    this._clearIndices();
-    return out;
-  };
-
-  /**
-   * provide a hook for the JSON serializer
-   * @return {array} - a plain, vanilla array with our same data
-   */
-  IndexedArray.prototype.toJSON = function () {
-    return this.raw;
-  };
-
-  return IndexedArray;
-});
diff --git a/src/kibana/utils/lodash-mixins/index.js b/src/kibana/utils/lodash-mixins/index.js
deleted file mode 100644
index f5655d9e3bd6a..0000000000000
--- a/src/kibana/utils/lodash-mixins/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-define(function (require) {
-  /**
-   * THESE ARE AUTOMATICALLY INCLUDED IN LODASH
-   *
-   * use:
-   * var _ = require('lodash');
-   *
-   * require.js config points the 'lodash' id to
-   * this module, which provides a modified version
-   * of lodash.
-   */
-  var _ = require('lodash_src').runInContext();
-  require('utils/lodash-mixins/string')(_);
-  require('utils/lodash-mixins/lang')(_);
-  require('utils/lodash-mixins/object')(_);
-  require('utils/lodash-mixins/collection')(_);
-  require('utils/lodash-mixins/function')(_);
-  require('utils/lodash-mixins/oop')(_);
-  return _;
-});
diff --git a/src/kibana/utils/parse_interval.js b/src/kibana/utils/parse_interval.js
deleted file mode 100644
index b1613a4f8000f..0000000000000
--- a/src/kibana/utils/parse_interval.js
+++ /dev/null
@@ -1,36 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var moment = require('moment');
-  var datemath = require('utils/datemath');
-
-  // Assume interval is in the form (value)(unit), such as "1h"
-  var INTERVAL_STRING_RE = new RegExp('^([0-9\\.]*)\\s*(' + datemath.units.join('|') + ')$');
-
-  return function parseInterval(interval) {
-    var matches = String(interval).trim().match(INTERVAL_STRING_RE);
-
-    if (!matches) return null;
-
-    try {
-      var value = parseFloat(matches[1]) || 1;
-      var unit = matches[2];
-
-      var duration = moment.duration(value, unit);
-
-      // There is an error with moment, where if you have a fractional interval between 0 and 1, then when you add that
-      // interval to an existing moment object, it will remain unchanged, which causes problems in the ordered_x_keys
-      // code. To counteract this, we find the first unit that doesn't result in a value between 0 and 1.
-      // For example, if you have '0.5d', then when calculating the x-axis series, we take the start date and begin
-      // adding 0.5 days until we hit the end date. However, since there is a bug in moment, when you add 0.5 days to
-      // the start date, you get the same exact date (instead of being ahead by 12 hours). So instead of returning
-      // a duration corresponding to 0.5 hours, we return a duration corresponding to 12 hours.
-      var selectedUnit = _.find(datemath.units, function (unit) {
-        return Math.abs(duration.as(unit)) >= 1;
-      });
-
-      return moment.duration(duration.as(selectedUnit), selectedUnit);
-    } catch (e) {
-      return null;
-    }
-  };
-});
diff --git a/src/kibana/utils/routes/_setup.js b/src/kibana/utils/routes/_setup.js
deleted file mode 100644
index 9da43d135909b..0000000000000
--- a/src/kibana/utils/routes/_setup.js
+++ /dev/null
@@ -1,66 +0,0 @@
-define(function (require) {
-  return function routeSetup(Promise, kbnSetup, config, $route, kbnUrl, courier, Notifier, Private, $rootScope) {
-    var _ = require('lodash');
-    var errors = require('errors');
-    var NoDefaultIndexPattern = errors.NoDefaultIndexPattern;
-    var NoDefinedIndexPatterns = errors.NoDefinedIndexPatterns;
-    var firstNoDefaultError = true;
-
-    var rootSearchSource = Private(require('components/courier/data_source/_root_search_source'));
-    var allowedRoutesRE = /^\/settings\//;
-    var notify = new Notifier();
-
-    return {
-      routeSetupWork: function () {
-        return Promise.all([
-          kbnSetup(),
-          config.init(),
-          courier.SearchSource.ready,
-          $rootScope.kibana && $rootScope.kibana.ready
-        ])
-        .then(function () {
-          var path = $route.current.$$route.originalPath;
-          var defaultIndexRequired = !path.match(allowedRoutesRE);
-
-          return courier.indexPatterns.getIds()
-          .then(function (patterns) {
-            var defined = !!config.get('defaultIndex');
-            var exists = _.contains(patterns, config.get('defaultIndex'));
-
-            if (defined && !exists) {
-              config.clear('defaultIndex');
-              defined = false;
-            }
-
-            if (!defined) {
-              if (defaultIndexRequired) {
-                throw new NoDefaultIndexPattern();
-              } else {
-                firstNoDefaultError = false;
-              }
-            }
-
-            return rootSearchSource.loadDefault();
-          });
-        });
-      },
-      handleKnownError: function (err) {
-        if (err instanceof NoDefaultIndexPattern || err instanceof NoDefinedIndexPatterns) {
-          // .change short circuits the routes by calling $route.refresh(). We can safely swallow this error
-          // after reporting it to the user
-          kbnUrl.change('/settings/indices');
-
-          if (err instanceof NoDefaultIndexPattern) {
-            if (firstNoDefaultError) {
-              firstNoDefaultError = false;
-            } else {
-              notify.error(err);
-            }
-          }
-        } else {
-          return Promise.reject(err);
-        }
-      }
-    };
-  };
-});
diff --git a/src/kibana/utils/routes/_work_queue.js b/src/kibana/utils/routes/_work_queue.js
deleted file mode 100644
index 6556103ed5666..0000000000000
--- a/src/kibana/utils/routes/_work_queue.js
+++ /dev/null
@@ -1,52 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  function WorkQueue() {
-    var q = this;
-
-    var work = [];
-    var fullDefers = [];
-
-    q.limit = 0;
-    Object.defineProperty(q, 'length', {
-      get: function () {
-        return work.length;
-      }
-    });
-
-    var checkIfFull = function () {
-      if (work.length >= q.limit) {
-        fullDefers.length && resolve(fullDefers);
-      }
-    };
-
-    var resolve = function (defers) {
-      return defers.splice(0).map(function (defer) {
-        return defer.resolve();
-      });
-    };
-
-    q.resolveWhenFull = function (defer) {
-      fullDefers.push(defer);
-      checkIfFull();
-    };
-
-    q.doWork = function () {
-      var resps = resolve(work);
-      checkIfFull();
-      return resps;
-    };
-
-    q.empty = function () {
-      work.splice(0);
-      checkIfFull();
-    };
-
-    q.push = function (defer) {
-      work.push(defer);
-      checkIfFull();
-    };
-  }
-
-  return WorkQueue;
-});
\ No newline at end of file
diff --git a/src/kibana/utils/routes/_wrap_route_with_prep.js b/src/kibana/utils/routes/_wrap_route_with_prep.js
deleted file mode 100644
index c9b9c35a3b4a9..0000000000000
--- a/src/kibana/utils/routes/_wrap_route_with_prep.js
+++ /dev/null
@@ -1,54 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-
-  var WorkQueue = require('utils/routes/_work_queue');
-  var errors = require('errors');
-
-  function wrapRouteWithPrep(route) {
-    if (!route.resolve && route.redirectTo) return;
-
-    var userWork = new WorkQueue();
-    // the point at which we will consider the queue "full"
-    userWork.limit = _.keys(route.resolve).length;
-
-    var resolve = {
-      __prep__: function (Private, Promise, $route, $injector, Notifier) {
-        var setup = Private(require('utils/routes/_setup'));
-
-        return setup.routeSetupWork()
-        .then(function () {
-          // wait for the queue to fill up, then do all the work
-          var defer = Promise.defer();
-          userWork.resolveWhenFull(defer);
-
-          return defer.promise.then(function () {
-            return Promise.all(userWork.doWork());
-          });
-        })
-        .catch(function (err) {
-          // discard any remaining user work
-          userWork.empty();
-          return setup.handleKnownError(err);
-        });
-      }
-    };
-
-    // send each user resolve to the userWork queue, which will prevent it from running before the
-    // prep is complete
-    _.forOwn(route.resolve || {}, function (expr, name) {
-      resolve[name] = function ($injector, Promise) {
-        var defer = Promise.defer();
-        userWork.push(defer);
-        return defer.promise.then(function () {
-          return $injector[angular.isString(expr) ? 'get' : 'invoke'](expr);
-        });
-      };
-    });
-
-    // we're copied everything over so now overwrite
-    route.resolve = resolve;
-  }
-
-  return wrapRouteWithPrep;
-});
\ No newline at end of file
diff --git a/src/kibana/utils/routes/index.js b/src/kibana/utils/routes/index.js
deleted file mode 100644
index 4009cea0fc900..0000000000000
--- a/src/kibana/utils/routes/index.js
+++ /dev/null
@@ -1,58 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var wrapRouteWithPrep = require('utils/routes/_wrap_route_with_prep');
-
-  require('components/setup/setup');
-  require('services/promises');
-
-  function RouteManager() {
-    var when = [];
-    var defaults = [];
-    var otherwise;
-
-    return {
-      when: function (path, route) {
-        when.push([path, route]);
-        return this;
-      },
-      // before attaching the routes to the routeProvider, test the RE
-      // against the .when() path and add/override the resolves if there is a match
-      defaults: function (RE, def) {
-        defaults.push([RE, def]);
-        return this;
-      },
-      otherwise: function (route) {
-        otherwise = route;
-        return this;
-      },
-      config: function ($routeProvider) {
-        when.forEach(function (args) {
-          var path = args[0];
-          var route = args[1] || {};
-
-          // merge in any defaults
-          defaults.forEach(function (args) {
-            if (args[0].test(path)) {
-              _.merge(route, args[1]);
-            }
-          });
-
-          if (route.reloadOnSearch === void 0) {
-            route.reloadOnSearch = false;
-          }
-
-          wrapRouteWithPrep(route);
-          $routeProvider.when(path, route);
-        });
-
-        if (otherwise) {
-          wrapRouteWithPrep(otherwise);
-          $routeProvider.otherwise(otherwise);
-        }
-      },
-      RouteManager: RouteManager
-    };
-  }
-
-  return new RouteManager();
-});
diff --git a/src/optimize/BaseOptimizer.js b/src/optimize/BaseOptimizer.js
new file mode 100644
index 0000000000000..ad04e8f557c25
--- /dev/null
+++ b/src/optimize/BaseOptimizer.js
@@ -0,0 +1,92 @@
+'use strict';
+
+let EventEmitter = require('events').EventEmitter;
+let inherits = require('util').inherits;
+let _ = require('lodash');
+let join = require('path').join;
+let write = require('fs').writeFileSync;
+let webpack = require('webpack');
+let DirectoryNameAsMain = require('webpack-directory-name-as-main');
+let ExtractTextPlugin = require('extract-text-webpack-plugin');
+
+let utils = require('requirefrom')('src/utils');
+let fromRoot = utils('fromRoot');
+let OptmzBundles = require('./OptmzBundles');
+let OptmzUiModules = require('./OptmzUiModules');
+
+let kbnTag = `Kibana ${ utils('packageJson').version }`;
+
+class BaseOptimizer extends EventEmitter {
+  constructor(opts) {
+    super();
+
+    this.sourceMaps = opts.sourceMaps || false;
+    this.modules = new OptmzUiModules(opts.plugins);
+    this.bundles = new OptmzBundles(
+      opts,
+      `${kbnTag} ${this.constructor.name} ${ this.sourceMaps ? ' (with source maps)' : ''}`
+    );
+
+    _.bindAll(this, 'getConfig');
+  }
+
+  getConfig() {
+    let mapQ = this.sourceMaps ? '?sourceMap' : '';
+
+    return {
+      context: fromRoot('.'),
+      entry: this.bundles.getEntriesConfig(),
+
+      devtool: this.sourceMaps ? '#source-map' : false,
+
+      output: {
+        path: this.bundles.dir,
+        filename: '[name].bundle.js',
+        sourceMapFilename: '[file].map',
+        publicPath: '/bundles/',
+        devtoolModuleFilenameTemplate: '[absolute-resource-path]'
+      },
+
+      plugins: [
+        new webpack.ResolverPlugin([
+          new DirectoryNameAsMain()
+        ]),
+        new webpack.NoErrorsPlugin(),
+        new webpack.optimize.DedupePlugin(),
+        new ExtractTextPlugin('[name].style.css', {
+          allChunks: true
+        })
+      ],
+
+      module: {
+        loaders: [
+          {
+            test: /\.less$/,
+            loader: ExtractTextPlugin.extract(
+              'style',
+              `css${mapQ}!autoprefixer?{ "browsers": ["last 2 versions","> 5%"] }!less${mapQ}`
+            )
+          },
+          { test: /\.css$/, loader: ExtractTextPlugin.extract('style', `css${mapQ}`) },
+          { test: /\.jade$/, loader: 'jade' },
+          { test: /\.(html|tmpl)$/, loader: 'raw' },
+          { test: /\.png$/, loader: 'url?limit=10000&name=[path][name].[ext]' },
+          { test: /\.(woff|woff2|ttf|eot|svg|ico)(\?|$)/, loader: 'file?name=[path][name].[ext]' },
+          { test: /\/src\/(plugins|ui)\/.+\.js$/, loader: `auto-preload-rjscommon-deps${mapQ}` }
+        ].concat(this.modules.loaders),
+        noParse: this.modules.noParse,
+      },
+
+      resolve: {
+        extensions: ['.js', '.less', ''],
+        postfixes: [''],
+        modulesDirectories: ['node_modules'],
+        loaderPostfixes: ['-loader', ''],
+        root: fromRoot('.'),
+        alias: this.modules.aliases
+      }
+    };
+  }
+}
+
+module.exports = BaseOptimizer;
diff --git a/src/optimize/CachedOptimizer.js b/src/optimize/CachedOptimizer.js
new file mode 100644
index 0000000000000..797063bc1e538
--- /dev/null
+++ b/src/optimize/CachedOptimizer.js
@@ -0,0 +1,49 @@
+'use strict';
+
+let _ = require('lodash');
+let webpack = require('webpack');
+
+let BaseOptimizer = require('./BaseOptimizer');
+
+module.exports = class CachedOptimizer extends BaseOptimizer {
+  constructor(opts) {
+    super(opts);
+    _.bindAll(this, 'init', 'setupCompiler', 'run');
+  }
+
+  init(autoRun) {
+    return this.bundles.ensureAllEntriesExist().then(autoRun ? this.run : this.setupCompiler);
+  }
+
+  setupCompiler(autoRun) {
+    this.entries = this.bundles.getMissingEntries();
+    if (!this.entries.length) return;
+
+    this.compilerConfig = this.getConfig();
+    this.compiler = webpack(this.compilerConfig);
+
+    if (autoRun) this.run();
+  }
+
+  run() {
+    if (!this.compiler) {
+      return this.setupCompiler(true);
+    }
+
+    var self = this;
+    let entries = self.entries;
+
+    self.emit('build-start', entries);
+    self.compiler.run(function (err, stats) {
+      if (err) {
+        self.emit('error', entries, stats, err);
+      }
+      else if (stats.hasErrors() || stats.hasWarnings()) {
+        self.emit('error', entries, stats, new Error('Optimization must not produce errors or warnings'));
+      }
+      else {
+        self.emit('done', entries, stats);
+      }
+    });
+  }
+};
diff --git a/src/optimize/LiveOptimizer.js b/src/optimize/LiveOptimizer.js
new file mode 100644
index 0000000000000..46cdb86c051bd
--- /dev/null
+++ b/src/optimize/LiveOptimizer.js
@@ -0,0 +1,58 @@
+'use strict';
+
+let _ = require('lodash');
+let join = require('path').join;
+let promify = require('bluebird').promisify;
+let webpack = require('webpack');
+let MemoryFileSystem = require('memory-fs');
+let BaseOptimizer = require('./BaseOptimizer');
+let writeFileSync = require('fs').writeFileSync;
+
+module.exports = class LiveOptimizer extends BaseOptimizer {
+  constructor(opts) {
+    super(opts);
+
+    this.compilerConfig = this.getConfig();
+    // this.compilerConfig.profile = true;
+
+    this.compiler = webpack(this.compilerConfig);
+    this.outFs = this.compiler.outputFileSystem = new MemoryFileSystem();
+
+    _.bindAll(this, 'get', 'init');
+
+    this.compile = promify(this.compiler.run, this.compiler);
+  }
+
+  init() {
+    return this.bundles.ensureAllEntriesExist(true);
+  }
+
+  get(id) {
+    let self = this;
+    let fs = self.outFs;
+    let filename = join(self.compiler.outputPath, `${id}.bundle.js`);
+    let mapFilename = join(self.compiler.outputPath, `${id}.bundle.js.map`);
+    let styleFilename = join(self.compiler.outputPath, `${id}.style.css`);
+
+    if (!self.active) {
+      self.active = self.compile().finally(function () {
+        self.active = null;
+      });
+    }
+
+    return self.active.then(function (stats) {
+      if (stats.hasErrors() || stats.hasWarnings()) {
+        console.log(stats.toString({ colors: true }));
+        return null;
+      }
+
+      // writeFileSync('liveBuildStats.json', JSON.stringify(stats.toJson()));
+
+      return {
+        bundle: fs.readFileSync(filename),
+        sourceMap: self.sourceMaps ? fs.readFileSync(mapFilename) : false,
+        style: fs.readFileSync(styleFilename)
+      };
+    });
+  }
+};
diff --git a/src/optimize/OptmzBundles.js b/src/optimize/OptmzBundles.js
new file mode 100644
index 0000000000000..a395f9ef4631f
--- /dev/null
+++ b/src/optimize/OptmzBundles.js
@@ -0,0 +1,115 @@
+'use strict';
+
+let _ = require('lodash');
+let join = require('path').join;
+let resolve = require('bluebird').resolve;
+let promify = require('bluebird').promisify;
+let rimraf = promify(require('rimraf'));
+let mkdirp = promify(require('mkdirp'));
+
+let stat = promify(require('fs').stat);
+let read = promify(require('fs').readFile);
+let write = promify(require('fs').writeFile);
+let unlink = promify(require('fs').unlink);
+let readdir = promify(require('fs').readdir);
+let readSync = require('fs').readFileSync;
+
+let entryFileTemplate = _.template(readSync(join(__dirname, 'entry.js.tmpl')));
+
+class OptmzBundles {
+  constructor(opts, optimizerTagline) {
+    this.dir = _.get(opts, 'bundleDir');
+    if (!_.isString(this.dir)) {
+      throw new TypeError('Optimizer requires a working directory');
+    }
+
+    this.sourceMaps = _.get(opts, 'sourceMaps');
+    this.entries = _.get(opts, 'entries', []).map(function (spec) {
+      let entry = {
+        id: spec.id,
+        deps: _.get(spec, 'deps', []),
+        modules: _.get(spec, 'modules', []),
+
+        path: join(this.dir, spec.id + '.entry.js'),
+        bundlePath: join(this.dir, spec.id + '.bundle.js'),
+
+        exists: undefined,
+        content: undefined
+      };
+
+      entry.content = _.get(spec, 'template', entryFileTemplate)({
+        entry: entry,
+        optimizerTagline: optimizerTagline
+      });
+
+      return entry;
+    }, this);
+
+
+    _.bindAll(this, [
+      'ensureDir',
+      'ensureAllEntriesExist',
+      'checkIfEntryExists',
+      'writeEntryFile',
+      'clean',
+      'getMissingEntries',
+      'getEntriesConfig'
+    ]);
+  }
+
+  ensureDir() {
+    return mkdirp(this.dir);
+  }
+
+  ensureAllEntriesExist(overwrite) {
+    return this.ensureDir()
+    .return(this.entries)
+    .map(overwrite ? this.checkIfEntryExists : _.noop)
+    .return(this.entries)
+    .map(this.writeEntryFile)
+    .return(undefined);
+  }
+
+  checkIfEntryExists(entry) {
+    return resolve([
+      read(entry.path),
+      stat(entry.bundlePath)
+    ])
+    .settle()
+    .spread(function (readEntry, statBundle) {
+      let existingEntry = readEntry.isFulfilled() && readEntry.value().toString('utf8');
+      let bundleExists = statBundle.isFulfilled() && !statBundle.value().isDirectory();
+      entry.exists = existingEntry && bundleExists && (existingEntry === entry.content);
+    });
+  }
+
+  writeEntryFile(entry) {
+    return this.clean([entry.path, entry.bundlePath]).then(function () {
+      entry.exists = false;
+      return write(entry.path, entry.content, { encoding: 'utf8' });
+    });
+  }
+
+  // unlinks files, swallows missing file errors
+  clean(paths) {
+    return resolve(
+      _.flatten([paths]).map(function (path) {
+        return rimraf(path);
+      })
+    )
+    .settle()
+    .return(undefined);
+  }
+
+  getMissingEntries() {
+    return _.reject(this.entries, 'exists');
+  }
+
+  getEntriesConfig() {
+    return _.transform(this.getMissingEntries(), function (map, entry) {
+      map[entry.id] = entry.path;
+    }, {});
+  }
+}
+
+module.exports = OptmzBundles;
diff --git a/src/optimize/OptmzUiModules.js b/src/optimize/OptmzUiModules.js
new file mode 100644
index 0000000000000..619f747ca9ce8
--- /dev/null
+++ b/src/optimize/OptmzUiModules.js
@@ -0,0 +1,98 @@
+var _ = require('lodash');
+var fromRoot = require('../utils/fromRoot');
+
+var asRegExp = _.flow(
+  _.escapeRegExp,
+  function (path) {
+    return path + '(?:\\.js)?$';
+  },
+  RegExp
+);
+
+function OptmzUiExports(plugins) {
+  // regular expressions which will prevent webpack from parsing the file
+  var noParse = this.noParse = [];
+
+  // webpack aliases, like require paths, mapping a prefix to a directory
+  var aliases = this.aliases = {
+    ui: fromRoot('src/ui/public'),
+    testHarness: fromRoot('src/testHarness/public')
+  };
+
+  // webpack loaders map loader configuration to regexps
+  var loaders = this.loaders = [];
+
+  var claimedModuleIds = {};
+  _.each(plugins, function (plugin) {
+    var exports = plugin.uiExportsSpecs;
+
+    // add an alias for this plugins public directory
+    if (plugin.publicDir) {
+      aliases[`plugins/${plugin.id}`] = plugin.publicDir;
+    }
+
+    // consume the plugin's "modules" exports
+    _.forOwn(exports.modules, function (spec, id) {
+      if (claimedModuleIds[id]) {
+        throw new TypeError(`Plugin ${plugin.id} attempted to override export "${id}" from ${claimedModuleIds[id]}`);
+      } else {
+        claimedModuleIds[id] = plugin.id;
+      }
+
+      // configurable via spec
+      var path;
+      var parse = true;
+      var imports = null;
+      var exports = null;
+      var expose = null;
+
+      // basic style, just a path
+      if (_.isString(spec)) path = spec;
+
+      if (_.isArray(spec)) {
+        path = spec[0];
+        imports = spec[1];
+        exports = spec[2];
+      }
+
+      if (_.isPlainObject(spec)) {
+        path = spec.path;
+        parse = _.get(spec, 'parse', parse);
+        imports = _.get(spec, 'imports', imports);
+        exports = _.get(spec, 'exports', exports);
+        expose = _.get(spec, 'expose', expose);
+      }
+
+      if (!path) {
+        throw new TypeError('Invalid spec definition, unable to identify path');
+      }
+
+      aliases[id] = path;
+
+      var loader = [];
+      if (imports) {
+        loader.push(`imports?${imports}`);
+      }
+
+      if (exports) loader.push(`exports?${exports}`);
+      if (expose) loader.push(`expose?${expose}`);
+      if (loader.length) loaders.push({ test: asRegExp(path), loader: loader.join('!') });
+
+      if (!parse) noParse.push(asRegExp(path));
+    });
+
+    // consume the plugin's "loaders" exports
+    _.each(exports.loaders, function (loader) {
+      loaders.push(loader);
+    });
+
+
+    // consume the plugin's "noParse" exports
+    _.each(exports.noParse, function (regExp) {
+      noParse.push(regExp);
+    });
+
+  });
+}
+
+module.exports = OptmzUiExports;
diff --git a/src/optimize/WatchingOptimizer.js b/src/optimize/WatchingOptimizer.js
new file mode 100644
index 0000000000000..a7467f1999d61
--- /dev/null
+++ b/src/optimize/WatchingOptimizer.js
@@ -0,0 +1,120 @@
+'use strict';
+
+let _ = require('lodash');
+let webpack = require('webpack');
+
+let BaseOptimizer = require('./BaseOptimizer');
+
+const STATUS_BUNDLE_INVALID = 'bundle invalid';
+const STATUS_BUNDLING = 'optimizing';
+const STATUS_REBUNDLING = 'bundle invalid during optimizing';
+const STATUS_ERROR = 'error';
+const STATUS_DONE = 'done';
+
+class WatchingOptimizer extends BaseOptimizer {
+  constructor(opts) {
+    super(opts);
+
+    this.bundleStatus = null;
+    _.bindAll(this, 'init', 'setupCompiler', 'onBundlesInvalid', 'setStatus', 'enable', 'disable');
+
+    this.run = this.enable; // enable makes a bit more sense here, but alias for consistency with CachedOptimizer
+  }
+
+  init(autoEnable) {
+    return this.bundles.ensureAllEntriesExist(true).then(autoEnable ? this.enable : this.setupCompiler);
+  }
+
+  setupCompiler(autoEnable) {
+    if (!_.size(this.bundles.entries)) return;
+
+    this.compilerConfig = this.getConfig();
+    this.compiler = webpack(this.compilerConfig);
+    this.compiler.plugin('watch-run', _.partial(this.setStatus, STATUS_BUNDLING));
+    this.compiler.plugin('invalid', this.onBundlesInvalid);
+    this.compiler.plugin('failed', _.partial(this.setStatus, STATUS_ERROR));
+    this.compiler.plugin('done', _.partial(this.setStatus, STATUS_DONE));
+
+    if (autoEnable) this.enable();
+  }
+
+  onBundlesInvalid() {
+    switch (this.bundleStatus || null) {
+      case STATUS_BUNDLING:
+      case STATUS_REBUNDLING:
+        // if the source changed during building, we immediately rebuild
+        return this.setStatus(STATUS_REBUNDLING);
+      case null:
+        // the bundle has to be something before that something can be invalid
+        return;
+      default:
+        return this.setStatus(STATUS_BUNDLE_INVALID);
+    }
+  }
+
+  setStatus(status) {
+    let self = this;
+    let entries = self.bundles.entries;
+    let stats;
+    let error;
+    let shouldBeFinal = false;
+
+    switch (status) {
+      case 'done':
+        stats = self.watcher.stats;
+        error = null;
+        shouldBeFinal = true;
+
+        if (stats.hasErrors()) {
+          error = new Error('Optimization must not produce errors or warnings');
+          status = 'error';
+        }
+        break;
+
+      case 'error':
+        stats = self.watcher.stats;
+        error = self.watcher.error;
+    }
+
+    let apply = function () {
+      clearTimeout(self.tentativeStatusChange);
+      self.tentativeStatusChange = null;
+      self.emit(self.bundleStatus = status, entries, stats, error);
+    };
+
+    if (shouldBeFinal) {
+      // this looks race-y, but it's how webpack does it: https://goo.gl/ShVo2o
+      self.tentativeStatusChange = setTimeout(apply, 0);
+    } else {
+      apply();
+    }
+
+    // webpack allows some plugins to be async, we don't want to hold up webpack,
+    // so just always callback if we get a cb();
+    let cb = _.last(arguments);
+    if (typeof cb === 'function') cb();
+  }
+
+  enable() {
+    if (!this.compiler) {
+      return this.setupCompiler(true);
+    }
+
+    if (this.watcher) {
+      throw new Error('WatchingOptimizer already watching!');
+    }
+
+    this.watcher = this.compiler.watch({}, _.noop);
+  }
+
+  disable() {
+    if (!this.compiler) return;
+    if (!this.watcher) return;
+
+    this.watcher.close();
+    this.watcher = null;
+    this.compiler = null;
+  }
+}
+
+module.exports = WatchingOptimizer;
diff --git a/src/optimize/browserTests/TestBundler.js b/src/optimize/browserTests/TestBundler.js
new file mode 100644
index 0000000000000..44eb2479b5793
--- /dev/null
+++ b/src/optimize/browserTests/TestBundler.js
@@ -0,0 +1,80 @@
+'use strict';
+
+let _ = require('lodash');
+let resolve = require('path').resolve;
+let readFileSync = require('fs').readFileSync;
+
+let src = require('requirefrom')('src');
+let fromRoot = src('utils/fromRoot');
+let pathContains = src('utils/pathContains');
+let LiveOptimizer = src('optimize/LiveOptimizer');
+
+let id = 'tests';
+let globAll = require('./globAll');
+let testEntryFileTemplate = _.template(readFileSync(resolve(__dirname, './testBundleEntry.js.tmpl')));
+
+class TestBundler {
+  constructor(kbnServer) {
+    this.kbnServer = kbnServer;
+    this.init = _.once(this.init);
+    _.bindAll(this, ['init', 'findTestFiles', 'setupOptimizer', 'render']);
+  }
+
+  init() {
+    return this.findTestFiles().then(this.setupOptimizer);
+  }
+
+  findTestFiles() {
+    return globAll(fromRoot('src'), [
+      '**/public/**/__tests__/**/*.js'
+    ]);
+  }
+
+  setupOptimizer(testFiles) {
+    let plugins = this.kbnServer.plugins;
+    let bundleDir = this.kbnServer.config.get('optimize.bundleDir');
+
+    let deps = [];
+    let modules = [];
+
+    if (testFiles) {
+      modules = modules.concat(testFiles);
+    }
+
+    plugins.forEach(function (plugin) {
+      if (!plugin.app) return;
+      modules = modules.concat(plugin.app.getModules());
+      deps = deps.concat(plugin.app.getRelatedPlugins());
+    });
+
+    this.optimizer = new LiveOptimizer({
+      sourceMaps: true,
+      bundleDir: bundleDir,
+      entries: [
+        {
+          id: id,
+          deps: deps,
+          modules: modules,
+          template: testEntryFileTemplate
+        }
+      ],
+      plugins: plugins
+    });
+
+    return this.optimizer.init();
+  }
+
+  render() {
+    let self = this;
+    let first = !this.optimizer;
+    let server = this.kbnServer.server;
+
+    return self.init()
+    .then(function () {
+      server.log(['optimize', 'testHarness', first ? 'info' : 'debug'], 'Test harness built, compiling test bundle');
+      return self.optimizer.get(id);
+    });
+  }
+}
+
+module.exports = TestBundler;
diff --git a/src/optimize/browserTests/globAll.js b/src/optimize/browserTests/globAll.js
new file mode 100644
index 0000000000000..fae6c287370b8
--- /dev/null
+++ b/src/optimize/browserTests/globAll.js
@@ -0,0 +1,19 @@
+'use strict';
+
+let _ = require('lodash');
+let resolve = require('path').resolve;
+let promify = require('bluebird').promisify;
+let all = require('bluebird').all;
+let glob = promify(require('glob'));
+
+module.exports = function (path, patterns) {
+  return all([].concat(patterns || []))
+  .map(function (pattern) {
+    return glob(pattern, { cwd: path, ignore: '**/_*.js' });
+  })
+  .then(_.flatten)
+  .then(_.uniq)
+  .map(function (match) {
+    return resolve(path, match);
+  });
+};
diff --git a/src/optimize/browserTests/index.js b/src/optimize/browserTests/index.js
new file mode 100644
index 0000000000000..ab3850f904d89
--- /dev/null
+++ b/src/optimize/browserTests/index.js
@@ -0,0 +1,54 @@
+'use strict';
+
+module.exports = function (kbnServer, server, config) {
+  if (!config.get('env.dev')) return;
+
+  let Boom = require('boom');
+  let src = require('requirefrom')('src');
+  let fromRoot = src('utils/fromRoot');
+  let TestBundler = require('./TestBundler');
+
+  let bundler = new TestBundler(kbnServer, fromRoot('src'));
+  let renderPromise = false;
+  let renderComplete = false;
+
+  function send(reply, part, mimeType) {
+    if (!renderPromise || (part === 'bundle' && renderComplete)) {
+      renderPromise = bundler.render();
+      renderComplete = false;
+      renderPromise.then(function () { renderComplete = true; });
+    }
+
+    renderPromise.then(function (output) {
+      if (!output || !output.bundle) {
+        return reply(Boom.create(500, 'failed to build test bundle'));
+      }
+
+      return reply(output[part]).type(mimeType);
+    }, reply);
+  }
+
+  server.route({
+    path: '/bundles/tests.bundle.js',
+    method: 'GET',
+    handler: function (req, reply) {
+      send(reply, 'bundle', 'application/javascript');
+    }
+  });
+
+  server.route({
+    path: '/bundles/tests.bundle.js.map',
+    method: 'GET',
+    handler: function (req, reply) {
+      send(reply, 'sourceMap', 'text/plain');
+    }
+  });
+
+  server.route({
+    path: '/bundles/tests.bundle.style.css',
+    method: 'GET',
+    handler: function (req, reply) {
+      send(reply, 'style', 'text/css');
+    }
+  });
+};
diff --git a/src/optimize/browserTests/testBundleEntry.js.tmpl b/src/optimize/browserTests/testBundleEntry.js.tmpl
new file mode 100644
index 0000000000000..2396958be9fea
--- /dev/null
+++ b/src/optimize/browserTests/testBundleEntry.js.tmpl
@@ -0,0 +1,20 @@
+/**
+ * Optimized application entry file
+ *
+ * This is programatically created and updated, do not modify
+ *
+ * built using: <%= optimizerTagline %>
+ * includes code from:
+<%
+  entry.deps.sort().forEach(function (plugin) {
+    print(` *  - ${plugin}\n`);
+  })
+%> *
+ */
+
+require('ui/testHarness');
+<%
+entry.modules.slice(0).reverse().forEach(function (id) {
+  print(`require('${id}');\n`);
+});
+%>require('ui/testHarness').bootstrap();
diff --git a/src/optimize/entry.js.tmpl b/src/optimize/entry.js.tmpl
new file mode 100644
index 0000000000000..7febb3985fe3d
--- /dev/null
+++ b/src/optimize/entry.js.tmpl
@@ -0,0 +1,20 @@
+/**
+ * Optimized application entry file
+ *
+ * This is programatically created and updated, do not modify
+ *
+ * built using: <%= optimizerTagline %>
+ * includes code from:
+<%
+  entry.deps.sort().forEach(function (plugin) {
+    print(` *  - ${plugin}\n`);
+  })
+%> *
+ */
+
+require('ui/chrome');
+<%
+entry.modules.forEach(function (id) {
+  if (id !== 'ui/chrome') print(`require('${id}');\n`);
+});
+%>require('ui/chrome').bootstrap(/* xoxo */);
diff --git a/src/optimize/index.js b/src/optimize/index.js
new file mode 100644
index 0000000000000..8719608952240
--- /dev/null
+++ b/src/optimize/index.js
@@ -0,0 +1,123 @@
+'use strict';
+
+module.exports = function (kbnServer, server, config) {
+  if (!config.get('optimize.enabled')) return;
+
+  var _ = require('lodash');
+  var resolve = require('path').resolve;
+  var fromRoot = require('../utils/fromRoot');
+
+  var CachedOptimizer = require('./CachedOptimizer');
+  var WatchingOptimizer = require('./WatchingOptimizer');
+
+  var bundleDir = resolve(config.get('optimize.bundleDir'));
+  var status = kbnServer.status.create('optimize');
+
+  server.exposeStaticDir('/bundles/{path*}', bundleDir);
+
+  function logStats(tag, stats) {
+    if (config.get('logging.json')) {
+      server.log(['optimize', tag], _.pick(stats.toJson(), 'errors', 'warnings'));
+    } else {
+      server.log(['optimize', tag], `\n${ stats.toString({ colors: true }) }`);
+    }
+  }
+
+  function describeEntries(entries) {
+    let ids = _.pluck(entries, 'id').join('", "');
+    return `application${ entries.length === 1 ? '' : 's'} "${ids}"`;
+  }
+
+  function onMessage(handle, filter) {
+    filter = filter || _.constant(true);
+    process.on('message', function (msg) {
+      var optimizeMsg = msg && msg.optimizeMsg;
+      if (!optimizeMsg || !filter(optimizeMsg)) return;
+      handle(optimizeMsg);
+    });
+  }
+
+  var role = config.get('optimize._workerRole');
+  if (role === 'receive') {
+    // query for initial status
+    process.send(['WORKER_BROADCAST', { optimizeMsg: '?' }]);
+    onMessage(function (wrkrStatus) {
+      status[wrkrStatus.state](wrkrStatus.message);
+    });
+  }
+
+  if (role === 'send') {
+    let send = function () {
+      process.send(['WORKER_BROADCAST', { optimizeMsg: status }]);
+    };
+
+    status.on('change', send);
+    onMessage(send, _.partial(_.eq, '?'));
+    send();
+  }
+
+  let watching = config.get('optimize.watch');
+  let Optimizer = watching ? WatchingOptimizer : CachedOptimizer;
+  let optmzr = kbnServer.optimizer = new Optimizer({
+    sourceMaps: config.get('optimize.sourceMaps'),
+    bundleDir: bundleDir,
+    entries: _.map(
+      [].concat(
+        kbnServer.uiExports.apps,
+        kbnServer.uiExports.apps.hidden
+      ),
+      function (app) {
+        return {
+          id: app.id,
+          deps: app.getRelatedPlugins(),
+          modules: app.getModules()
+        };
+      }
+    ),
+    plugins: kbnServer.plugins
+  });
+
+  server.on('close', _.bindKey(optmzr.disable || _.noop, optmzr));
+
+  kbnServer.mixin(require('./browserTests'))
+  .then(function () {
+
+    if (role === 'receive') return;
+
+    optmzr.on('bundle invalid', function () {
+      status.yellow('Source file change detected, reoptimizing source files');
+    });
+
+    optmzr.on('done', function (entries, stats) {
+      logStats('debug', stats);
+      status.green(`Optimization of ${describeEntries(entries)} complete`);
+    });
+
+    optmzr.on('error', function (entries, stats, err) {
+      if (stats) logStats('fatal', stats);
+      status.red('Optimization failure! ' + err.message);
+    });
+
+    return optmzr.init()
+    .then(function () {
+      let entries = optmzr.bundles.getMissingEntries();
+      if (!entries.length) {
+        if (watching) {
+          status.red('No optimizable applications found');
+        } else {
+          status.green('Reusing previously cached application source files');
+        }
+        return;
+      }
+
+      if (watching) {
+        status.yellow(`Optimizing and watching all application source files`);
+      } else {
+        status.yellow(`Optimizing and caching ${describeEntries(entries)}`);
+      }
+
+      optmzr.run();
+      return null;
+    });
+  });
+};
diff --git a/src/kibana/plugins/README.txt b/src/plugins/README.txt
similarity index 100%
rename from src/kibana/plugins/README.txt
rename to src/plugins/README.txt
diff --git a/src/plugins/appSwitcher/index.js b/src/plugins/appSwitcher/index.js
new file mode 100644
index 0000000000000..c64887fb14672
--- /dev/null
+++ b/src/plugins/appSwitcher/index.js
@@ -0,0 +1,12 @@
+module.exports = function (kibana) {
+  return new kibana.Plugin({
+    uiExports: {
+      app: {
+        id: 'switcher',
+        main: 'plugins/appSwitcher/appSwitcher',
+        hidden: true,
+        autoload: kibana.autoload.styles
+      }
+    }
+  });
+};
diff --git a/src/plugins/appSwitcher/package.json b/src/plugins/appSwitcher/package.json
new file mode 100644
index 0000000000000..0483302d156de
--- /dev/null
+++ b/src/plugins/appSwitcher/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "appSwitcher",
+  "version": "1.0.0"
+}
diff --git a/src/plugins/appSwitcher/public/appSwitcher.html b/src/plugins/appSwitcher/public/appSwitcher.html
new file mode 100644
index 0000000000000..df9522d7c09b9
--- /dev/null
+++ b/src/plugins/appSwitcher/public/appSwitcher.html
@@ -0,0 +1,16 @@
+<div ng-if="switcher.loading">
+  <div class="spinner large"></div>
+</div>
+
+<div ng-if="!switcher.loading" class="app-links">
+  <a
+    ng-repeat="app in switcher.apps"
+    ng-href="/app/{{app.id}}"
+    class="app-link">
+    <span ng-style="{ 'background-image': 'url(' + app.icon + ')' }" class="app-icon"></span>
+    <span class="app-info">
+      <h2 class="app-title">{{ app.title }}</h2>
+      <h3 class="app-description">{{ app.description }}</h3>
+    </span>
+  </a>
+</li>
diff --git a/src/plugins/appSwitcher/public/appSwitcher.js b/src/plugins/appSwitcher/public/appSwitcher.js
new file mode 100644
index 0000000000000..fb5d38637ee11
--- /dev/null
+++ b/src/plugins/appSwitcher/public/appSwitcher.js
@@ -0,0 +1,28 @@
+require('plugins/appSwitcher/appSwitcher.less');
+
+var kibanaLogoUrl = require('ui/images/kibana.png');
+
+require('ui/chrome')
+.setLogo('url(' + kibanaLogoUrl + ') left no-repeat', true)
+.setShowAppsLink(false)
+.setTabs([
+  {
+    id: '',
+    title: 'Apps',
+    activeIndicatorColor: '#ecf0f1'
+  }
+])
+.setRootTemplate(require('plugins/appSwitcher/appSwitcher.html'))
+.setRootController('switcher', function SwitcherController($http) {
+  var switcher = {
+    loading: true
+  };
+
+  $http.get('/api/apps')
+  .then(function (resp) {
+    switcher.loading = false;
+    switcher.apps = resp.data;
+  });
+
+  return switcher;
+});
diff --git a/src/plugins/appSwitcher/public/appSwitcher.less b/src/plugins/appSwitcher/public/appSwitcher.less
new file mode 100644
index 0000000000000..dbd6cba6542a8
--- /dev/null
+++ b/src/plugins/appSwitcher/public/appSwitcher.less
@@ -0,0 +1,43 @@
+@import (reference) "~ui/styles/variables";
+
+.application {
+  background-color: @gray-lighter;
+}
+
+.app-links {
+  width: 700px;
+  margin: 25px auto;
+  text-align: justify;
+
+  .app-link {
+    display: inline-block;
+    vertical-align: top;
+    text-align: left;
+    background: white;
+    width: 200px;
+    margin: 0 30px 30px 0;
+
+    .app-icon {
+      display: block;
+      height: 200px;
+      background-size: cover;
+      background-position: center;
+    }
+
+    .app-info {
+      display: block;
+      padding: 15px;
+    }
+
+    .app-title {
+      margin: 0 0 10px;
+      color: @text-color;
+    }
+
+    .app-description {
+      font-size: 1em;
+      color: @gray;
+      margin: 0;
+    }
+  }
+}
diff --git a/src/plugins/bundledLibs/index.js b/src/plugins/bundledLibs/index.js
new file mode 100644
index 0000000000000..c9b1a989b1459
--- /dev/null
+++ b/src/plugins/bundledLibs/index.js
@@ -0,0 +1,27 @@
+'use strict';
+
+module.exports = function (kibana) {
+  let _ = require('lodash');
+  let resolve = require('path').resolve;
+  let basename = require('path').basename;
+  let readdir = require('fs').readdirSync;
+  let fromRoot = require('../../utils/fromRoot');
+
+  let modules = {};
+  let metaLibs = resolve(__dirname, 'metaLibs');
+  readdir(metaLibs).forEach(function (file) {
+    if (file[0] === '.') return;
+    let name = basename(file, '.js') + '$';
+    modules[name] = resolve(metaLibs, file);
+  });
+
+  return new kibana.Plugin({
+    init: false,
+    uiExports: {
+      modules: modules,
+      noParse: [
+        /node_modules\/(angular|elasticsearch-browser|mocha)\//
+      ]
+    }
+  });
+};
diff --git a/src/plugins/bundledLibs/metaLibs/ace.js b/src/plugins/bundledLibs/metaLibs/ace.js
new file mode 100644
index 0000000000000..68251531616d9
--- /dev/null
+++ b/src/plugins/bundledLibs/metaLibs/ace.js
@@ -0,0 +1,7 @@
+require('brace');
+require('brace/mode/json');
+require('node_modules/@spalger/ui-ace/ui-ace');
+
+require('ui/modules').get('kibana', ['ui.ace']);
+
+module.exports = window.ace;
diff --git a/src/plugins/bundledLibs/metaLibs/angular.js b/src/plugins/bundledLibs/metaLibs/angular.js
new file mode 100644
index 0000000000000..4823e94c300f2
--- /dev/null
+++ b/src/plugins/bundledLibs/metaLibs/angular.js
@@ -0,0 +1,9 @@
+require('jquery');
+require('node_modules/angular/angular');
+module.exports = window.angular;
+
+require('node_modules/angular-bindonce/bindonce');
+require('node_modules/angular-elastic/elastic');
+require('node_modules/angular-route/angular-route');
+
+require('ui/modules').get('kibana', ['ngRoute', 'monospaced.elastic', 'pasvaz.bindonce']);
diff --git a/src/plugins/bundledLibs/metaLibs/elasticsearch.js b/src/plugins/bundledLibs/metaLibs/elasticsearch.js
new file mode 100644
index 0000000000000..796b191673f77
--- /dev/null
+++ b/src/plugins/bundledLibs/metaLibs/elasticsearch.js
@@ -0,0 +1,3 @@
+require('angular');
+module.exports = require('node_modules/elasticsearch/elasticsearch.angular.min');
+require('ui/modules').get('kibana', ['elasticsearch']);
diff --git a/src/plugins/bundledLibs/metaLibs/gridster.js b/src/plugins/bundledLibs/metaLibs/gridster.js
new file mode 100644
index 0000000000000..381358646f616
--- /dev/null
+++ b/src/plugins/bundledLibs/metaLibs/gridster.js
@@ -0,0 +1,3 @@
+require('jquery');
+require('node_modules/gridster/dist/jquery.gridster.css');
+require('script!node_modules/gridster/dist/jquery.gridster');
diff --git a/src/plugins/bundledLibs/metaLibs/jquery.js b/src/plugins/bundledLibs/metaLibs/jquery.js
new file mode 100644
index 0000000000000..4cef6e2479f3d
--- /dev/null
+++ b/src/plugins/bundledLibs/metaLibs/jquery.js
@@ -0,0 +1 @@
+window.jQuery = window.$ = module.exports = require('node_modules/jquery/dist/jquery');
diff --git a/src/plugins/bundledLibs/metaLibs/leaflet.js b/src/plugins/bundledLibs/metaLibs/leaflet.js
new file mode 100644
index 0000000000000..b131ba10b2141
--- /dev/null
+++ b/src/plugins/bundledLibs/metaLibs/leaflet.js
@@ -0,0 +1,7 @@
+require('node_modules/leaflet/dist/leaflet.css');
+window.L = module.exports = require('node_modules/leaflet/dist/leaflet');
+
+require('node_modules/@spalger/leaflet-heat/dist/leaflet-heat.js');
+
+require('node_modules/@spalger/leaflet-draw/dist/leaflet.draw.css');
+require('node_modules/@spalger/leaflet-draw/dist/leaflet.draw.js');
diff --git a/src/plugins/bundledLibs/metaLibs/lodash.js b/src/plugins/bundledLibs/metaLibs/lodash.js
new file mode 100644
index 0000000000000..6984e0d338f2a
--- /dev/null
+++ b/src/plugins/bundledLibs/metaLibs/lodash.js
@@ -0,0 +1,15 @@
+/**
+ * THESE ARE AUTOMATICALLY INCLUDED IN LODASH
+ *
+ * use:
+ * var _ = require('lodash');
+ */
+
+var _ = require('node_modules/lodash/index.js').runInContext();
+require('ui/utils/lodash-mixins/string')(_);
+require('ui/utils/lodash-mixins/lang')(_);
+require('ui/utils/lodash-mixins/object')(_);
+require('ui/utils/lodash-mixins/collection')(_);
+require('ui/utils/lodash-mixins/function')(_);
+require('ui/utils/lodash-mixins/oop')(_);
+module.exports = _;
diff --git a/src/plugins/bundledLibs/metaLibs/ng-clip.js b/src/plugins/bundledLibs/metaLibs/ng-clip.js
new file mode 100644
index 0000000000000..155374ffd8d8d
--- /dev/null
+++ b/src/plugins/bundledLibs/metaLibs/ng-clip.js
@@ -0,0 +1,10 @@
+require('angular');
+
+// ng-clip expects ZeroClipboard to be global, but it's UMD, so it never is
+window.ZeroClipboard = require('node_modules/zeroclipboard/dist/ZeroClipboard.js');
+window.ZeroClipboard.SWF_URL = require('file!node_modules/zeroclipboard/dist/ZeroClipboard.swf');
+
+require('node_modules/ng-clip/src/ngClip');
+require('ui/modules').get('kibana', ['ngClipboard']);
+
+module.exports = window.ZeroClipboard;
diff --git a/src/plugins/bundledLibs/metaLibs/sinon.js b/src/plugins/bundledLibs/metaLibs/sinon.js
new file mode 100644
index 0000000000000..3bab26d8937d4
--- /dev/null
+++ b/src/plugins/bundledLibs/metaLibs/sinon.js
@@ -0,0 +1,2 @@
+require('script!node_modules/sinon/pkg/sinon.js');
+module.exports = window.sinon;
diff --git a/src/plugins/bundledLibs/metaLibs/ui-bootstrap.js b/src/plugins/bundledLibs/metaLibs/ui-bootstrap.js
new file mode 100644
index 0000000000000..423ef222de265
--- /dev/null
+++ b/src/plugins/bundledLibs/metaLibs/ui-bootstrap.js
@@ -0,0 +1,11 @@
+define(function (require) {
+  require('angular');
+  require('node_modules/@spalger/angular-bootstrap/ui-bootstrap-tpls');
+
+  return require('ui/modules')
+  .get('kibana', ['ui.bootstrap'])
+  .config(function ($tooltipProvider) {
+    $tooltipProvider.setTriggers({ 'mouseenter': 'mouseleave click' });
+  });
+
+});
diff --git a/src/plugins/bundledLibs/package.json b/src/plugins/bundledLibs/package.json
new file mode 100644
index 0000000000000..88a228c1ddb38
--- /dev/null
+++ b/src/plugins/bundledLibs/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "bundledLibs",
+  "version": "1.0.0"
+}
diff --git a/src/plugins/devMode/index.js b/src/plugins/devMode/index.js
new file mode 100644
index 0000000000000..f4cada5c7c84e
--- /dev/null
+++ b/src/plugins/devMode/index.js
@@ -0,0 +1,26 @@
+'use strict';
+
+module.exports = function (kibana) {
+  if (!kibana.config.get('env.dev')) return;
+
+  let utils = require('requirefrom')('src/utils');
+  let fromRoot = utils('fromRoot');
+
+  return new kibana.Plugin({
+    uiExports: {
+      spyModes: [
+        'plugins/devMode/visDebugSpyPanel'
+      ],
+
+      modules: {
+        ngMock$: fromRoot('src/plugins/devMode/public/ngMock'),
+        fixtures: fromRoot('src/fixtures'),
+        testUtils: fromRoot('src/testUtils'),
+        'angular-mocks': {
+          path: require.resolve('angular-mocks'),
+          imports: 'angular'
+        },
+      }
+    }
+  });
+};
diff --git a/src/plugins/devMode/package.json b/src/plugins/devMode/package.json
new file mode 100644
index 0000000000000..0d52e00a9094c
--- /dev/null
+++ b/src/plugins/devMode/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "devMode",
+  "version": "1.0.0"
+}
diff --git a/src/plugins/devMode/public/ngMock.js b/src/plugins/devMode/public/ngMock.js
new file mode 100644
index 0000000000000..1b884163e85a9
--- /dev/null
+++ b/src/plugins/devMode/public/ngMock.js
@@ -0,0 +1,10 @@
+var angular = require('angular');
+if (angular.mocks) {
+  throw new Error(
+    'Don\'t require angular-mocks directly or the tests ' +
+    'can\'t setup correctly, use the ngMock module instead.'
+  );
+}
+
+require('angular-mocks');
+module.exports = angular.mock;
diff --git a/src/kibana/plugins/vis_debug_spy/vis_debug.html b/src/plugins/devMode/public/visDebugSpyPanel.html
similarity index 100%
rename from src/kibana/plugins/vis_debug_spy/vis_debug.html
rename to src/plugins/devMode/public/visDebugSpyPanel.html
diff --git a/src/plugins/devMode/public/visDebugSpyPanel.js b/src/plugins/devMode/public/visDebugSpyPanel.js
new file mode 100644
index 0000000000000..294e897adda83
--- /dev/null
+++ b/src/plugins/devMode/public/visDebugSpyPanel.js
@@ -0,0 +1,22 @@
+define(function (require) {
+  // register the spy mode or it won't show up in the spys
+  require('ui/registry/spy_modes').register(VisDetailsSpyProvider);
+
+  function VisDetailsSpyProvider(Notifier, $filter, $rootScope, config) {
+    require('ui/clipboard');
+
+    return {
+      name: 'debug',
+      display: 'Debug',
+      template: require('plugins/devMode/visDebugSpyPanel.html'),
+      order: 5,
+      link: function ($scope, $el) {
+        $scope.$watch('vis.getState() | json', function (json) {
+          $scope.visStateJson = json;
+        });
+      }
+    };
+  }
+
+  return VisDetailsSpyProvider;
+});
diff --git a/src/plugins/elasticsearch/index.js b/src/plugins/elasticsearch/index.js
new file mode 100644
index 0000000000000..7a2e96f9729d7
--- /dev/null
+++ b/src/plugins/elasticsearch/index.js
@@ -0,0 +1,63 @@
+module.exports = function (kibana) {
+  var healthCheck = require('./lib/health_check');
+  var exposeClient = require('./lib/expose_client');
+  var createProxy = require('./lib/create_proxy');
+
+  return new kibana.Plugin({
+    require: ['kibana'],
+
+    config: function (Joi) {
+      return Joi.object({
+        enabled: Joi.boolean().default(true),
+        url: Joi.string().uri({ scheme: ['http', 'https'] }).default('http://localhost:9200'),
+        preserveHost: Joi.boolean().default(true),
+        username: Joi.string(),
+        password: Joi.string(),
+        shardTimeout: Joi.number().default(0),
+        requestTimeout: Joi.number().default(30000),
+        pingTimeout: Joi.number().default(30000),
+        startupTimeout: Joi.number().default(5000),
+        ssl: Joi.object({
+          verify: Joi.boolean().default(true),
+          ca: Joi.string(),
+          cert: Joi.string(),
+          key: Joi.string()
+        }).default(),
+        minimumVerison: Joi.string().default('1.4.4')
+      }).default();
+    },
+
+    init: function (server, options) {
+      var config = server.config();
+
+      // Expose the client to the server
+      exposeClient(server);
+      createProxy(server, 'GET', '/elasticsearch/{paths*}');
+      createProxy(server, 'POST', '/elasticsearch/_mget');
+      createProxy(server, 'POST', '/elasticsearch/_msearch');
+
+      function noBulkCheck(request, reply) {
+        if (/\/_bulk/.test(request.path)) {
+          return reply({
+            error: 'You can not send _bulk requests to this interface.'
+          }).code(400).takeover();
+        }
+        return reply.continue();
+      }
+
+      createProxy(
+        server,
+        ['PUT', 'POST', 'DELETE'],
+        '/elasticsearch/' + config.get('kibana.index') + '/{paths*}',
+        {
+          prefix: '/' + config.get('kibana.index'),
+          config: { pre: [ noBulkCheck ] }
+        }
+      );
+
+      // Set up the health check service and start it.
+      healthCheck(this, server).start();
+    }
+  });
+
+};
diff --git a/src/plugins/elasticsearch/lib/__tests__/_ensure_elasticsearch.js b/src/plugins/elasticsearch/lib/__tests__/_ensure_elasticsearch.js
new file mode 100644
index 0000000000000..3e0b9a840ae4c
--- /dev/null
+++ b/src/plugins/elasticsearch/lib/__tests__/_ensure_elasticsearch.js
@@ -0,0 +1,40 @@
+var portscanner = require('portscanner');
+var path = require('path');
+var Promise = require('bluebird');
+var libesvm = require('libesvm');
+
+function startEs() {
+  var options = {
+    version: '1.4.4',
+    directory: path.join(__dirname, '..', '..', 'esvm'),
+    config: {
+      'cluster.name': 'test',
+      'network.host': '127.0.0.1'
+    }
+  };
+  var cluster = libesvm.createCluster(options);
+  return cluster.install().then(function () {
+    return cluster.start();
+  }).then(function () {
+    after(function () {
+      this.timeout(120000);
+      return cluster.shutdown();
+    });
+    return cluster;
+  });
+}
+
+function maybeStartES() {
+  return new Promise(function (resolve, reject) {
+    portscanner.checkPortStatus(9200, '127.0.0.1', function (err, status) {
+      if (err) return reject(err);
+      if (status === 'closed') return startEs().then(resolve);
+      resolve();
+    });
+  });
+}
+
+module.exports = function () {
+  this.timeout(120000);
+  return maybeStartES();
+};
diff --git a/src/plugins/elasticsearch/lib/__tests__/check_es_version.js b/src/plugins/elasticsearch/lib/__tests__/check_es_version.js
new file mode 100644
index 0000000000000..ec25b906a5767
--- /dev/null
+++ b/src/plugins/elasticsearch/lib/__tests__/check_es_version.js
@@ -0,0 +1,83 @@
+var _ = require('lodash');
+var Promise = require('bluebird');
+var sinon = require('sinon');
+
+var checkEsVersion = require('../check_es_version');
+
+describe('plugins/elasticsearch', function () {
+  describe('lib/check_es_version', function () {
+    var server;
+    var plugin;
+
+    beforeEach(function () {
+      var get = sinon.stub().withArgs('elasticserach.minimumVerison').returns('1.4.3');
+      var config = function () { return { get: get }; };
+      server = {
+        config: config,
+        plugins: {
+          elasticsearch: {
+            client: {
+              nodes: {}
+            },
+            status: {
+              red: sinon.stub()
+            }
+          }
+        }
+      };
+    });
+
+    function setNodes(/* ...versions */) {
+      var versions = _.shuffle(arguments);
+      var nodes = {};
+      var i = 0;
+
+      while (versions.length) {
+        var name = 'node-' + (++i);
+        var version = versions.shift();
+
+        var node = {
+          version: version,
+          http_address: 'http_address',
+          ip: 'ip'
+        };
+
+        if (!_.isString(version)) _.assign(node, version);
+        nodes[name] = node;
+      }
+
+      var client = server.plugins.elasticsearch.client;
+      client.nodes.info = sinon.stub().returns(Promise.resolve({ nodes: nodes }));
+
+    }
+
+    it('passes with single a node that matches', function () {
+      setNodes('1.4.3');
+      return checkEsVersion(server);
+    });
+
+    it('passes with multiple nodes that satisfy', function () {
+      setNodes('1.4.3', '1.4.4', '1.4.3-Beta1');
+      return checkEsVersion(server);
+    });
+
+    it('fails with a single node that is out of date', function () {
+      setNodes('1.4.4', '1.4.2', '1.4.5');
+      return checkEsVersion(server)
+      .then(function () {
+        throw new Error('expected validation to fail');
+      }, _.noop);
+    });
+
+    it('passes if that single node is a client node', function () {
+      setNodes(
+        '1.4.4',
+        { version: '1.4.2', attributes: { client: 'true' } },
+        '1.4.5'
+      );
+
+      return checkEsVersion(server);
+    });
+
+  });
+});
diff --git a/src/plugins/elasticsearch/lib/__tests__/create_kibana_index.js b/src/plugins/elasticsearch/lib/__tests__/create_kibana_index.js
new file mode 100644
index 0000000000000..dabeb11e6351e
--- /dev/null
+++ b/src/plugins/elasticsearch/lib/__tests__/create_kibana_index.js
@@ -0,0 +1,139 @@
+var _ = require('lodash');
+var sinon = require('sinon');
+var expect = require('expect.js');
+var Promise = require('bluebird');
+
+var createKibanaIndex = require('../create_kibana_index');
+var SetupError = require('../setup_error');
+
+describe('plugins/elasticsearch', function () {
+  describe('lib/create_kibana_index', function () {
+
+    var server, client, config;
+    beforeEach(function () {
+      server = {};
+      client = {};
+      var config = { kibana: { index: '.my-kibana' } };
+      var get = sinon.stub();
+      get.returns(config);
+      get.withArgs('kibana.index').returns(config.kibana.index);
+      config = function () { return { get: get }; };
+      _.set(client, 'indices.create', sinon.stub());
+      _.set(client, 'cluster.health', sinon.stub());
+      _.set(server, 'plugins.elasticsearch.client', client);
+      _.set(server, 'config', config);
+    });
+
+    describe('successful requests', function () {
+
+      beforeEach(function () {
+        client.indices.create.returns(Promise.resolve());
+        client.cluster.health.returns(Promise.resolve());
+      });
+
+      it('should check cluster.health upon successful index creation', function () {
+        var fn = createKibanaIndex(server);
+        return fn.then(function () {
+          sinon.assert.calledOnce(client.cluster.health);
+        });
+      });
+
+      it('should be created with mappings for config.buildNum', function () {
+        var fn = createKibanaIndex(server);
+        return fn.then(function () {
+          var params = client.indices.create.args[0][0];
+          expect(params)
+            .to.have.property('body');
+          expect(params.body)
+            .to.have.property('mappings');
+          expect(params.body.mappings)
+            .to.have.property('config');
+          expect(params.body.mappings.config)
+            .to.have.property('properties');
+          expect(params.body.mappings.config.properties)
+            .to.have.property('buildNum');
+          expect(params.body.mappings.config.properties.buildNum)
+            .to.have.property('type', 'string');
+          expect(params.body.mappings.config.properties.buildNum)
+            .to.have.property('index', 'not_analyzed');
+        });
+      });
+
+      it('should be created with 1 shard and 1 replica', function () {
+        var fn = createKibanaIndex(server);
+        return fn.then(function () {
+          var params = client.indices.create.args[0][0];
+          expect(params)
+            .to.have.property('body');
+          expect(params.body)
+            .to.have.property('settings');
+          expect(params.body.settings)
+            .to.have.property('number_of_shards', 1);
+          expect(params.body.settings)
+            .to.have.property('number_of_replicas', 1);
+        });
+      });
+
+      it('should be created with 1 shard and 1 replica', function () {
+        var fn = createKibanaIndex(server);
+        return fn.then(function () {
+          var params = client.indices.create.args[0][0];
+          expect(params)
+            .to.have.property('body');
+          expect(params.body)
+            .to.have.property('settings');
+          expect(params.body.settings)
+            .to.have.property('number_of_shards', 1);
+          expect(params.body.settings)
+            .to.have.property('number_of_replicas', 1);
+        });
+      });
+
+      it('should be created with index name set in the config', function () {
+        var fn = createKibanaIndex(server);
+        return fn.then(function () {
+          var params = client.indices.create.args[0][0];
+          expect(params)
+            .to.have.property('index', '.my-kibana');
+        });
+      });
+
+
+    });
+
+    describe('failure requests', function () {
+      it('should reject with a SetupError', function () {
+        var error = new Error('Oops!');
+        client.indices.create.returns(Promise.reject(error));
+        var fn = createKibanaIndex(server);
+        return fn.catch(function (err) {
+          expect(err).to.be.a(SetupError);
+        });
+      });
+
+      it('should reject with an error if index creation fails', function () {
+        var error = new Error('Oops!');
+        client.indices.create.returns(Promise.reject(error));
+        var fn = createKibanaIndex(server);
+        return fn.catch(function (err) {
+          expect(err.message).to.be('Unable to create Kibana index ".my-kibana"');
+          expect(err).to.have.property('origError', error);
+        });
+      });
+
+
+      it('should reject with an error if health check fails', function () {
+        var error = new Error('Oops!');
+        client.indices.create.returns(Promise.resolve());
+        client.cluster.health.returns(Promise.reject(error));
+        var fn = createKibanaIndex(server);
+        return fn.catch(function (err) {
+          expect(err.message).to.be('Waiting for Kibana index ".my-kibana" to come online failed.');
+          expect(err).to.have.property('origError', error);
+        });
+      });
+    });
+
+  });
+});
+
diff --git a/src/plugins/elasticsearch/lib/__tests__/findPort.js b/src/plugins/elasticsearch/lib/__tests__/findPort.js
new file mode 100644
index 0000000000000..1448058586e68
--- /dev/null
+++ b/src/plugins/elasticsearch/lib/__tests__/findPort.js
@@ -0,0 +1,13 @@
+var Promise = require('bluebird');
+var portscanner = require('portscanner');
+
+module.exports = function findPort(start, end, host) {
+  host = host || 'localhost';
+  return new Promise(function (resolve, reject) {
+    portscanner.findAPortNotInUse(start, end, host, function (err, port) {
+      if (err) return reject(err);
+      resolve(port);
+    });
+  });
+};
+
diff --git a/src/plugins/elasticsearch/lib/__tests__/health_check.js b/src/plugins/elasticsearch/lib/__tests__/health_check.js
new file mode 100644
index 0000000000000..d20a045ef744e
--- /dev/null
+++ b/src/plugins/elasticsearch/lib/__tests__/health_check.js
@@ -0,0 +1,140 @@
+var Promise = require('bluebird');
+var sinon = require('sinon');
+var expect = require('expect.js');
+var NoConnections = require('elasticsearch').errors.NoConnections;
+
+var healthCheck = require('../health_check');
+
+describe('plugins/elasticsearch', function () {
+  describe('lib/health_check', function () {
+
+    var health, plugin, server, get, client;
+    beforeEach(function () {
+      // setup the plugin stub
+      plugin = {
+        name: 'elasticsearch',
+        status: {
+          red: sinon.stub(),
+          green: sinon.stub(),
+          yellow: sinon.stub()
+        }
+      };
+      // setup the config().get() stub
+      get = sinon.stub();
+      // set up the elasticsearch client stub
+      client = {
+        cluster: { health: sinon.stub() },
+        indices: { create: sinon.stub() },
+        nodes: { info: sinon.stub() },
+        ping: sinon.stub(),
+        create: sinon.stub(),
+        search: sinon.stub().returns(Promise.resolve({ hits: { hits: [] } })),
+      };
+      client.nodes.info.returns(Promise.resolve({
+        nodes: {
+          'node-01': {
+            version: '1.5.0',
+            http_address: 'inet[/127.0.0.1:9200]',
+            ip: '127.0.0.1'
+          }
+        }
+      }));
+      // Setup the server mock
+      server = {
+        log: sinon.stub(),
+        config: function () { return { get: get }; },
+        plugins: { elasticsearch: { client: client  } }
+      };
+
+      health = healthCheck(plugin, server);
+    });
+
+    it('should set the cluster green if everything is ready', function () {
+      get.withArgs('elasticsearch.minimumVerison').returns('1.4.4');
+      get.withArgs('kibana.index').returns('.my-kibana');
+      client.ping.returns(Promise.resolve());
+      client.cluster.health.returns(Promise.resolve({ timed_out: false, status: 'green' }));
+      return health.run()
+        .then(function () {
+          sinon.assert.calledOnce(plugin.status.yellow);
+          expect(plugin.status.yellow.args[0][0]).to.be('Waiting for Elasticsearch');
+          sinon.assert.calledOnce(client.ping);
+          sinon.assert.calledOnce(client.nodes.info);
+          sinon.assert.calledOnce(client.cluster.health);
+          sinon.assert.calledOnce(plugin.status.green);
+          expect(plugin.status.green.args[0][0]).to.be('Kibana index ready');
+        });
+    });
+
+    it('should set the cluster red if the ping fails, then to green', function () {
+      this.timeout(3000);
+      get.withArgs('elasticsearch.url').returns('http://localhost:9200');
+      get.withArgs('elasticsearch.minimumVerison').returns('1.4.4');
+      get.withArgs('kibana.index').returns('.my-kibana');
+      client.ping.onCall(0).returns(Promise.reject(new NoConnections()));
+      client.ping.onCall(1).returns(Promise.resolve());
+      client.cluster.health.returns(Promise.resolve({ timed_out: false, status: 'green' }));
+      return health.run()
+        .then(function () {
+          sinon.assert.calledOnce(plugin.status.yellow);
+          expect(plugin.status.yellow.args[0][0]).to.be('Waiting for Elasticsearch');
+          sinon.assert.calledOnce(plugin.status.red);
+          /* jscs:disable maximumLineLength */
+          expect(plugin.status.red.args[0][0]).to.be('Unable to connect to Elasticsearch at http://localhost:9200. Retrying in 2.5 seconds.');
+          /* jscs:enable maximumLineLength */
+          sinon.assert.calledTwice(client.ping);
+          sinon.assert.calledOnce(client.nodes.info);
+          sinon.assert.calledOnce(client.cluster.health);
+          sinon.assert.calledOnce(plugin.status.green);
+          expect(plugin.status.green.args[0][0]).to.be('Kibana index ready');
+        });
+
+    });
+
+    it('should set the cluster red if the health check status is red, then to green', function () {
+      this.timeout(3000);
+      get.withArgs('elasticsearch.url').returns('http://localhost:9200');
+      get.withArgs('elasticsearch.minimumVerison').returns('1.4.4');
+      get.withArgs('kibana.index').returns('.my-kibana');
+      client.ping.returns(Promise.resolve());
+      client.cluster.health.onCall(0).returns(Promise.resolve({ timed_out: false, status: 'red' }));
+      client.cluster.health.onCall(1).returns(Promise.resolve({ timed_out: false, status: 'green' }));
+      return health.run()
+        .then(function () {
+          sinon.assert.calledOnce(plugin.status.yellow);
+          expect(plugin.status.yellow.args[0][0]).to.be('Waiting for Elasticsearch');
+          sinon.assert.calledOnce(plugin.status.red);
+          /* jscs:disable maximumLineLength */
+          expect(plugin.status.red.args[0][0]).to.be('Elasticsearch is still initializing the kibana index... Trying again in 2.5 second.');
+          /* jscs:enable maximumLineLength */
+          sinon.assert.calledOnce(client.ping);
+          sinon.assert.calledOnce(client.nodes.info);
+          sinon.assert.calledTwice(client.cluster.health);
+          sinon.assert.calledOnce(plugin.status.green);
+          expect(plugin.status.green.args[0][0]).to.be('Kibana index ready');
+        });
+    });
+
+    it('should set the cluster yellow if the health check timed_out and create index', function () {
+      this.timeout(3000);
+      get.withArgs('elasticsearch.url').returns('http://localhost:9200');
+      get.withArgs('elasticsearch.minimumVerison').returns('1.4.4');
+      get.withArgs('kibana.index').returns('.my-kibana');
+      client.ping.returns(Promise.resolve());
+      client.cluster.health.onCall(0).returns(Promise.resolve({ timed_out: true, status: 'red' }));
+      client.cluster.health.onCall(1).returns(Promise.resolve({ timed_out: false, status: 'green' }));
+      client.indices.create.returns(Promise.resolve());
+      return health.run()
+        .then(function () {
+          sinon.assert.calledTwice(plugin.status.yellow);
+          expect(plugin.status.yellow.args[0][0]).to.be('Waiting for Elasticsearch');
+          expect(plugin.status.yellow.args[1][0]).to.be('No existing Kibana index found');
+          sinon.assert.calledOnce(client.ping);
+          sinon.assert.calledOnce(client.indices.create);
+          sinon.assert.calledOnce(client.nodes.info);
+          sinon.assert.calledTwice(client.cluster.health);
+        });
+    });
+
+  });
+});
diff --git a/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js b/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js
new file mode 100644
index 0000000000000..49657dd757d86
--- /dev/null
+++ b/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js
@@ -0,0 +1,79 @@
+'use strict';
+
+let _ = require('lodash');
+let expect = require('expect.js');
+let sinon = require('sinon');
+
+let isUpgradeable = require('../is_upgradeable');
+let utils = require('requirefrom')('src/utils');
+let pkg = utils('packageJson');
+let version = pkg.version;
+
+describe('plugins/elasticsearch', function () {
+  describe('lib/isUpgradeable', function () {
+    let server = {
+      config: _.constant({
+        get: function (key) {
+          switch (key) {
+            case 'pkg.version': return version;
+            default: throw new Error(`no stub for config key ${key}`);
+          }
+        }
+      })
+    };
+
+    function upgradeDoc(_id, _version, bool) {
+      describe('', function () {
+        before(function () { version = _version; });
+
+        it(`should return ${bool} for ${_id} <= ${version}`, function () {
+          expect(isUpgradeable(server, { _id: _id })).to.be(bool);
+        });
+
+        after(function () { version = pkg.version; });
+      });
+    }
+
+    upgradeDoc('1.0.0-beta1', pkg.version, false);
+    upgradeDoc(pkg.version, pkg.version, false);
+    upgradeDoc('4.0.0-RC1', '4.0.0-RC2', true);
+    upgradeDoc('4.0.0-rc2', '4.0.0-rc1', false);
+    upgradeDoc('4.0.0-rc2', '4.0.0', true);
+    upgradeDoc('4.0.0-rc2', '4.0.2', true);
+    upgradeDoc('4.0.1', '4.1.0-rc', true);
+    upgradeDoc('4.0.0-rc1', '4.0.0', true);
+    upgradeDoc('4.0.0-rc1-snapshot', '4.0.0', false);
+    upgradeDoc('4.1.0-rc1-snapshot', '4.1.0-rc1', false);
+
+    it('should handle missing _id field', function () {
+      let doc = {
+        '_index': '.kibana',
+        '_type': 'config',
+        '_score': 1,
+        '_source': {
+          'buildNum': 1.7976931348623157e+308,
+          'defaultIndex': '[logstash-]YYYY.MM.DD'
+        }
+      };
+
+      expect(isUpgradeable(server, doc)).to.be(false);
+    });
+
+    it('should handle _id of @@version', function () {
+      let doc = {
+        '_index': '.kibana',
+        '_type': 'config',
+        '_id': '@@version',
+        '_score': 1,
+        '_source': {
+          'buildNum': 1.7976931348623157e+308,
+          'defaultIndex': '[logstash-]YYYY.MM.DD'
+        }
+      };
+      expect(isUpgradeable(server, doc)).to.be(false);
+    });
+
+  });
+
+
+});
diff --git a/src/plugins/elasticsearch/lib/__tests__/routes.js b/src/plugins/elasticsearch/lib/__tests__/routes.js
new file mode 100644
index 0000000000000..d3349fad166fd
--- /dev/null
+++ b/src/plugins/elasticsearch/lib/__tests__/routes.js
@@ -0,0 +1,120 @@
+var src = require('requirefrom')('src');
+var expect = require('expect.js');
+var util = require('util');
+var format = util.format;
+
+var KbnServer = src('server/KbnServer');
+var fromRoot = src('utils/fromRoot');
+
+describe('plugins/elasticsearch', function () {
+  describe('routes', function () {
+    before(require('./_ensure_elasticsearch'));
+
+    var kbnServer;
+
+    before(function () {
+      kbnServer = new KbnServer({
+        server: { autoListen: false },
+        logging: { quiet: true },
+        plugins: {
+          scanDirs: [
+            fromRoot('src/plugins')
+          ]
+        },
+        optimize: {
+          enabled: false
+        }
+      });
+
+      return kbnServer.ready();
+    });
+
+
+    after(function () {
+      return kbnServer.close();
+    });
+
+
+    function testRoute(options) {
+      var statusCode = options.statusCode || 200;
+      describe(format('%s %s', options.method, options.url), function () {
+        it('should should return ' + statusCode, function (done) {
+          kbnServer.server.inject(options, function (res) {
+            try {
+              expect(res.statusCode).to.be(statusCode);
+            } catch (e) {
+              done(e);
+              done = null;
+            } finally {
+              done && done();
+            }
+          });
+        });
+      });
+    }
+
+
+    testRoute({
+      method: 'GET',
+      url: '/elasticsearch/_nodes'
+    });
+
+    testRoute({
+      method: 'GET',
+      url: '/elasticsearch/'
+    });
+
+    testRoute({
+      method: 'POST',
+      url: '/elasticsearch/.kibana',
+      payload: '{settings: {number_of_shards: 1, number_of_replicas: 1}}',
+      statusCode: 201
+    });
+
+    testRoute({
+      method: 'GET',
+      url: '/elasticsearch/.kibana'
+    });
+
+    testRoute({
+      method: 'POST',
+      url: '/elasticsearch/.kibana/_bulk',
+      payload: '{}',
+      statusCode: 400
+    });
+
+    testRoute({
+      method: 'GET',
+      url: '/elasticsearch/.kibana/_mapping/*/field/_source'
+    });
+
+    testRoute({
+      method: 'POST',
+      url: '/elasticsearch/.kibana/index-pattern/_search?fields=',
+      payload: '{query: {match_all: {}}, size: 2147483647}'
+    });
+
+    testRoute({
+      method: 'POST',
+      url: '/elasticsearch/.kibana/__kibanaQueryValidator/_validate/query?explain=true&ignore_unavailable=true',
+      payload: '{query: {query_string: {analyze_wildcard: true, query: "*"}}}'
+    });
+
+    testRoute({
+      method: 'POST',
+      url: '/elasticsearch/_mget?timeout=0&ignore_unavailable=true&preference=1429574531063',
+      payload: '{docs: [{_index: ".kibana", _type: "index-pattern", _id: "[logstash-]YYYY.MM.DD"}]}'
+    });
+
+    /* jscs:disable maximumLineLength */
+    testRoute({
+      method: 'POST',
+      url: '/elasticsearch/_msearch?timeout=0&ignore_unavailable=true&preference=1429577952339',
+      payload: '{"index":"logstash-2015.04.21","ignore_unavailable":true}\n{"size":500,"sort":{"@timestamp":"desc"},"query":{"filtered":{"query":{"query_string":{"analyze_wildcard":true,"query":"*"}},"filter":{"bool":{"must":[{"range":{"@timestamp":{"gte":1429577068175,"lte":1429577968175}}}],"must_not":[]}}}},"highlight":{"pre_tags":["@kibana-highlighted-field@"],"post_tags":["@/kibana-highlighted-field@"],"fields":{"*":{}}},"aggs":{"2":{"date_histogram":{"field":"@timestamp","interval":"30s","pre_zone":"-07:00","pre_zone_adjust_large_interval":true,"min_doc_count":0,"extended_bounds":{"min":1429577068175,"max":1429577968175}}}},"fields":["*","_source"],"script_fields":{},"fielddata_fields":["timestamp_offset","@timestamp","utc_time"]}\n'
+    });
+    /* jscs:enable maximumLineLength */
+
+  });
+});
+
+
diff --git a/test/unit/server/plugins/elasticsearch/setup_error.js b/src/plugins/elasticsearch/lib/__tests__/setup_error.js
similarity index 93%
rename from test/unit/server/plugins/elasticsearch/setup_error.js
rename to src/plugins/elasticsearch/lib/__tests__/setup_error.js
index df277e44007aa..15f8f73129dc7 100644
--- a/test/unit/server/plugins/elasticsearch/setup_error.js
+++ b/src/plugins/elasticsearch/lib/__tests__/setup_error.js
@@ -1,5 +1,4 @@
-var root = require('requirefrom')('');
-var SetupError = root('src/server/plugins/elasticsearch/lib/setup_error');
+var SetupError = require('../setup_error');
 var expect = require('expect.js');
 
 describe('plugins/elasticsearch', function () {
diff --git a/src/plugins/elasticsearch/lib/__tests__/upgrade_config.js b/src/plugins/elasticsearch/lib/__tests__/upgrade_config.js
new file mode 100644
index 0000000000000..fcd5903c0c631
--- /dev/null
+++ b/src/plugins/elasticsearch/lib/__tests__/upgrade_config.js
@@ -0,0 +1,143 @@
+var _ = require('lodash');
+var Promise = require('bluebird');
+var sinon = require('sinon');
+var expect = require('expect.js');
+
+var upgradeConfig = require('../upgrade_config');
+
+describe('plugins/elasticsearch', function () {
+  describe('lib/upgrade_config', function () {
+    var get;
+    var server;
+    var client;
+    var config;
+    var upgrade;
+
+    beforeEach(function () {
+      get = sinon.stub();
+      get.withArgs('kibana.index').returns('.my-kibana');
+      get.withArgs('pkg.version').returns('4.0.1');
+      get.withArgs('pkg.buildNum').returns(Math.random());
+      client = { create: sinon.stub() };
+      server = {
+        log: sinon.stub(),
+        config: function () {
+          return {
+            get: get
+          };
+        },
+        plugins: { elasticsearch: { client: client } }
+      };
+      upgrade = upgradeConfig(server);
+    });
+
+    describe('nothing is found', function () {
+      var response = { hits: { hits:[] } };
+
+      beforeEach(function () {
+        client.create.returns(Promise.resolve());
+      });
+
+      describe('production', function () {
+        beforeEach(function () {
+          get.withArgs('env.name').returns('production');
+          get.withArgs('env.prod').returns(true);
+          get.withArgs('env.dev').returns(false);
+        });
+
+        it('should resolve buildNum to pkg.buildNum config', function () {
+          return upgrade(response).then(function (resp) {
+            sinon.assert.calledOnce(client.create);
+            var params = client.create.args[0][0];
+            expect(params.body).to.have.property('buildNum', get('pkg.buildNum'));
+          });
+        });
+
+        it('should resolve version to pkg.version config', function () {
+          return upgrade(response).then(function (resp) {
+            var params = client.create.args[0][0];
+            expect(params).to.have.property('id', get('pkg.version'));
+          });
+        });
+      });
+
+      describe('development', function () {
+        beforeEach(function () {
+          get.withArgs('env.name').returns('development');
+          get.withArgs('env.prod').returns(false);
+          get.withArgs('env.dev').returns(true);
+        });
+
+        it('should resolve buildNum to pkg.buildNum config', function () {
+          return upgrade(response).then(function (resp) {
+            var params = client.create.args[0][0];
+            expect(params.body).to.have.property('buildNum', get('pkg.buildNum'));
+          });
+        });
+
+        it('should resolve version to pkg.version config', function () {
+          return upgrade(response).then(function (resp) {
+            var params = client.create.args[0][0];
+            expect(params).to.have.property('id', get('pkg.version'));
+          });
+        });
+      });
+    });
+
+    it('should resolve with undefined if the current version is found', function () {
+      var response = { hits: { hits: [ { _id: '4.0.1' } ] } };
+      return upgrade(response).then(function (resp) {
+        expect(resp).to.be(undefined);
+      });
+    });
+
+    it('should resolve with undefined if the nothing is upgradeable', function () {
+      var response = { hits: { hits: [ { _id: '4.0.1-beta1' }, { _id: '4.0.0-snapshot1' } ] } };
+      return upgrade(response).then(function (resp) {
+        expect(resp).to.be(undefined);
+      });
+    });
+
+    it('should update the build number on the new config', function () {
+      get.withArgs('pkg.buildNum').returns(5801);
+      client.create.returns(Promise.resolve());
+      var response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1 } } ] } };
+      return upgrade(response).then(function (resp) {
+        sinon.assert.calledOnce(client.create);
+        var params = client.create.args[0][0];
+        expect(params).to.have.property('body');
+        expect(params.body).to.have.property('buildNum', 5801);
+        expect(params).to.have.property('index', '.my-kibana');
+        expect(params).to.have.property('type', 'config');
+        expect(params).to.have.property('id', '4.0.1');
+      });
+    });
+
+    it('should log a message for upgrades', function () {
+      get.withArgs('pkg.buildNum').returns(5801);
+      client.create.returns(Promise.resolve());
+      var response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1 } } ] } };
+      return upgrade(response).then(function (resp) {
+        sinon.assert.calledOnce(server.log);
+        expect(server.log.args[0][0]).to.eql(['plugin', 'elasticsearch']);
+        var msg = server.log.args[0][1];
+        expect(msg).to.have.property('prevVersion', '4.0.0');
+        expect(msg).to.have.property('newVersion', '4.0.1');
+        expect(msg.tmpl).to.contain('Upgrade');
+      });
+    });
+
+    it('should copy attributes from old config', function () {
+      get.withArgs('pkg.buildNum').returns(5801);
+      client.create.returns(Promise.resolve());
+      var response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1, defaultIndex: 'logstash-*' } } ] } };
+      return upgrade(response).then(function (resp) {
+        sinon.assert.calledOnce(client.create);
+        var params = client.create.args[0][0];
+        expect(params).to.have.property('body');
+        expect(params.body).to.have.property('defaultIndex', 'logstash-*');
+      });
+    });
+
+  });
+});
diff --git a/test/unit/server/plugins/elasticsearch/validate.js b/src/plugins/elasticsearch/lib/__tests__/validate.js
similarity index 90%
rename from test/unit/server/plugins/elasticsearch/validate.js
rename to src/plugins/elasticsearch/lib/__tests__/validate.js
index df953c897fa88..322be8450647b 100644
--- a/test/unit/server/plugins/elasticsearch/validate.js
+++ b/src/plugins/elasticsearch/lib/__tests__/validate.js
@@ -1,11 +1,36 @@
 var _ = require('lodash');
-var root = require('requirefrom')('');
-var validateRequest = root('src/server/plugins/elasticsearch/lib/validate');
 var expect = require('expect.js');
-var server =  { config: root('src/server/lib/config') };
-var config = server.config();
+var src = require('requirefrom')('src');
+
+var fromRoot = src('utils/fromRoot');
+var KbnServer = src('server/KbnServer');
+var validateRequest = require('../validate');
+
 
 describe('plugins/elasticsearch', function () {
+  var kbnServer;
+  var server;
+  var config;
+
+  before(function () {
+    kbnServer = new KbnServer({
+      server: { autoListen: false },
+      plugins: { scanDirs: [ fromRoot('src/plugins') ] },
+      logging: { quiet: true },
+      optimize: { enabled: false }
+    });
+
+    return kbnServer.ready()
+    .then(function () {
+      server = kbnServer.server;
+      config = kbnServer.config;
+    });
+  });
+
+  after(function () {
+    kbnServer.close();
+  });
+
   describe('lib/validate', function () {
 
     function del(path, body, valid) {
diff --git a/test/unit/server/plugins/elasticsearch/version_math.js b/src/plugins/elasticsearch/lib/__tests__/version_math.js
similarity index 97%
rename from test/unit/server/plugins/elasticsearch/version_math.js
rename to src/plugins/elasticsearch/lib/__tests__/version_math.js
index 3ddcc541bb34c..cd6be46b3b1e3 100644
--- a/test/unit/server/plugins/elasticsearch/version_math.js
+++ b/src/plugins/elasticsearch/lib/__tests__/version_math.js
@@ -1,6 +1,5 @@
-var root = require('requirefrom')('');
 var _ = require('lodash');
-var versionMath = root('src/server/plugins/elasticsearch/lib/version_math');
+var versionMath = require('../version_math');
 var expect = require('expect.js');
 var versions = [
   '1.1.12',
diff --git a/src/plugins/elasticsearch/lib/check_es_version.js b/src/plugins/elasticsearch/lib/check_es_version.js
new file mode 100644
index 0000000000000..f7b20c797bf3a
--- /dev/null
+++ b/src/plugins/elasticsearch/lib/check_es_version.js
@@ -0,0 +1,37 @@
+var _ = require('lodash');
+var esBool = require('./es_bool');
+var versionMath = require('./version_math');
+var SetupError = require('./setup_error');
+
+module.exports = function (server) {
+  var client = server.plugins.elasticsearch.client;
+  var minimumElasticsearchVersion = server.config().get('elasticsearch.minimumVerison');
+
+  return client.nodes.info()
+  .then(function (info) {
+    var badNodes = _.filter(info.nodes, function (node) {
+      // remove client nodes (Logstash)
+      var isClient = _.get(node, 'attributes.client');
+      if (isClient != null && esBool(isClient) === true) {
+        return false;
+      }
+
+      // remove nodes that are gte the min version
+      var v = node.version.split('-')[0];
+      return !versionMath.gte(minimumElasticsearchVersion, v);
+    });
+
+    if (!badNodes.length) return true;
+
+    var badNodeNames = badNodes.map(function (node) {
+      return 'Elasticsearch v' + node.version + ' @ ' + node.http_address + ' (' + node.ip + ')';
+    });
+
+    var message = `This version of Kibana requires Elasticsearch ` +
+    `${minimumElasticsearchVersion} or higher on all nodes. I found ` +
+    `the following incompatible nodes in your cluster: ${badNodeNames.join(',')}`;
+
+    server.plugins.elasticsearch.status.red(message);
+    throw new SetupError(server, message);
+  });
+};
diff --git a/src/server/plugins/elasticsearch/lib/create_agent.js b/src/plugins/elasticsearch/lib/create_agent.js
similarity index 100%
rename from src/server/plugins/elasticsearch/lib/create_agent.js
rename to src/plugins/elasticsearch/lib/create_agent.js
diff --git a/src/server/plugins/elasticsearch/lib/create_kibana_index.js b/src/plugins/elasticsearch/lib/create_kibana_index.js
similarity index 100%
rename from src/server/plugins/elasticsearch/lib/create_kibana_index.js
rename to src/plugins/elasticsearch/lib/create_kibana_index.js
diff --git a/src/server/plugins/elasticsearch/lib/create_proxy.js b/src/plugins/elasticsearch/lib/create_proxy.js
similarity index 100%
rename from src/server/plugins/elasticsearch/lib/create_proxy.js
rename to src/plugins/elasticsearch/lib/create_proxy.js
diff --git a/src/server/plugins/elasticsearch/lib/es_bool.js b/src/plugins/elasticsearch/lib/es_bool.js
similarity index 100%
rename from src/server/plugins/elasticsearch/lib/es_bool.js
rename to src/plugins/elasticsearch/lib/es_bool.js
diff --git a/src/server/plugins/elasticsearch/lib/expose_client.js b/src/plugins/elasticsearch/lib/expose_client.js
similarity index 92%
rename from src/server/plugins/elasticsearch/lib/expose_client.js
rename to src/plugins/elasticsearch/lib/expose_client.js
index db0a8d6f74ecc..090e670303f35 100644
--- a/src/server/plugins/elasticsearch/lib/expose_client.js
+++ b/src/plugins/elasticsearch/lib/expose_client.js
@@ -36,7 +36,7 @@ module.exports = function (server) {
         server.log(['error', 'elasticsearch'], err);
       };
       this.warning = function (message) {
-        server.log(['warn', 'elasticsearch'], '[ elasticsearch ] ' + message);
+        server.log(['warning', 'elasticsearch'], message);
       };
       this.info = _.noop;
       this.debug = _.noop;
@@ -45,7 +45,9 @@ module.exports = function (server) {
     }
   });
 
+  server.on('close', _.bindKey(client, 'close'));
   server.expose('client', client);
+
   return client;
 
 };
diff --git a/src/plugins/elasticsearch/lib/health_check.js b/src/plugins/elasticsearch/lib/health_check.js
new file mode 100644
index 0000000000000..99cd497f81d2a
--- /dev/null
+++ b/src/plugins/elasticsearch/lib/health_check.js
@@ -0,0 +1,95 @@
+var _ = require('lodash');
+var Promise = require('bluebird');
+var elasticsearch = require('elasticsearch');
+var exposeClient = require('./expose_client');
+var migrateConfig = require('./migrate_config');
+var createKibanaIndex = require('./create_kibana_index');
+var checkEsVersion = require('./check_es_version');
+var NoConnections = elasticsearch.errors.NoConnections;
+var util = require('util');
+var format = util.format;
+
+module.exports = function (plugin, server) {
+  var config = server.config();
+  var client = server.plugins.elasticsearch.client;
+
+  plugin.status.yellow('Waiting for Elasticsearch');
+
+
+  function waitForPong() {
+    return client.ping({ requestTimeout: 1500 }).catch(function (err) {
+      if (!(err instanceof NoConnections)) throw err;
+
+      plugin.status.red(format('Unable to connect to Elasticsearch at %s. Retrying in 2.5 seconds.', config.get('elasticsearch.url')));
+
+      return Promise.delay(2500).then(waitForPong);
+    });
+  }
+
+  function waitForShards() {
+    return client.cluster.health({
+      timeout: '5s', // tells es to not sit around and wait forever
+      index: config.get('kibana.index')
+    })
+    .then(function (resp) {
+      // if "timed_out" === true then elasticsearch could not
+      // find any idices matching our filter within 5 seconds
+      if (resp.timed_out) {
+        plugin.status.yellow('No existing Kibana index found');
+        return createKibanaIndex(server);
+      }
+
+      // If status === "red" that means that index(es) were found
+      // but the shards are not ready for queries
+      if (resp.status === 'red') {
+        plugin.status.red('Elasticsearch is still initializing the kibana index... Trying again in 2.5 second.');
+        return Promise.delay(2500).then(waitForShards);
+      }
+
+      // otherwise we are g2g
+      plugin.status.green('Kibana index ready');
+    });
+  }
+
+  function check() {
+    return waitForPong()
+    .then(_.partial(checkEsVersion, server, plugin))
+    .then(waitForShards)
+    .then(_.partial(migrateConfig, server))
+    .catch(_.bindKey(server, 'log', 'error'));
+  }
+
+
+  var timeoutId = null;
+
+  function scheduleCheck(ms) {
+    if (timeoutId) return;
+
+    var myId = setTimeout(function () {
+      check().finally(function () {
+        if (timeoutId === myId) startorRestartChecking();
+      });
+    }, ms);
+
+    timeoutId = myId;
+  }
+
+  function startorRestartChecking() {
+    scheduleCheck(stopChecking() ? 2500 : 1);
+  }
+
+  function stopChecking() {
+    if (!timeoutId) return false;
+    clearTimeout(timeoutId);
+    timeoutId = null;
+    return true;
+  }
+
+  return {
+    run: check,
+    start: startorRestartChecking,
+    stop: stopChecking,
+    isRunning: function () { return !!timeoutId; },
+  };
+
+};
diff --git a/src/plugins/elasticsearch/lib/is_upgradeable.js b/src/plugins/elasticsearch/lib/is_upgradeable.js
new file mode 100644
index 0000000000000..3629faaa0b4ca
--- /dev/null
+++ b/src/plugins/elasticsearch/lib/is_upgradeable.js
@@ -0,0 +1,34 @@
+var semver = require('semver');
+var utils = require('requirefrom')('src/utils');
+var rcVersionRegex = /(\d+\.\d+\.\d+)\-rc(\d+)/i;
+
+module.exports = function (server, doc) {
+  var config = server.config();
+  if (/beta|snapshot/i.test(doc._id)) return false;
+  if (!doc._id) return false;
+  if (doc._id === config.get('pkg.version')) return false;
+
+  var packageRcRelease = Infinity;
+  var rcRelease = Infinity;
+  var packageVersion = config.get('pkg.version');
+  var version = doc._id;
+  var matches = doc._id.match(rcVersionRegex);
+  var packageMatches = config.get('pkg.version').match(rcVersionRegex);
+
+  if (matches) {
+    version = matches[1];
+    rcRelease = parseInt(matches[2], 10);
+  }
+
+  if (packageMatches) {
+    packageVersion = packageMatches[1];
+    packageRcRelease = parseInt(packageMatches[2], 10);
+  }
+
+  try {
+    if (semver.gte(version, packageVersion) && rcRelease >= packageRcRelease) return false;
+  } catch (e) {
+    return false;
+  }
+  return true;
+};
diff --git a/src/server/plugins/elasticsearch/lib/map_uri.js b/src/plugins/elasticsearch/lib/map_uri.js
similarity index 100%
rename from src/server/plugins/elasticsearch/lib/map_uri.js
rename to src/plugins/elasticsearch/lib/map_uri.js
diff --git a/src/plugins/elasticsearch/lib/migrate_config.js b/src/plugins/elasticsearch/lib/migrate_config.js
new file mode 100644
index 0000000000000..3d32bb2137908
--- /dev/null
+++ b/src/plugins/elasticsearch/lib/migrate_config.js
@@ -0,0 +1,18 @@
+var upgrade = require('./upgrade_config');
+
+module.exports = function (server) {
+  var config = server.config();
+  var client = server.plugins.elasticsearch.client;
+  var options =  {
+    index: config.get('kibana.index'),
+    type: 'config',
+    body: {
+      size: 1000,
+      sort: [ { buildNum: { order: 'desc', ignore_unmapped: true } } ]
+    }
+  };
+
+  return client.search(options).then(upgrade(server));
+};
+
+
diff --git a/src/server/plugins/elasticsearch/lib/setup_error.js b/src/plugins/elasticsearch/lib/setup_error.js
similarity index 100%
rename from src/server/plugins/elasticsearch/lib/setup_error.js
rename to src/plugins/elasticsearch/lib/setup_error.js
diff --git a/src/plugins/elasticsearch/lib/upgrade_config.js b/src/plugins/elasticsearch/lib/upgrade_config.js
new file mode 100644
index 0000000000000..4defb84589da5
--- /dev/null
+++ b/src/plugins/elasticsearch/lib/upgrade_config.js
@@ -0,0 +1,57 @@
+var Promise = require('bluebird');
+var isUpgradeable = require('./is_upgradeable');
+var _ = require('lodash');
+var format = require('util').format;
+
+var utils = require('requirefrom')('src/utils');
+
+module.exports = function (server) {
+  var MAX_INTEGER = Math.pow(2, 53) - 1;
+
+  var client = server.plugins.elasticsearch.client;
+  var config = server.config();
+
+  return function (response) {
+    var newConfig = {};
+
+    // Check to see if there are any doc. If not then we set the build number and id
+    if (response.hits.hits.length === 0) {
+      return client.create({
+        index: config.get('kibana.index'),
+        type: 'config',
+        body: { buildNum: config.get('pkg.buildNum') },
+        id: config.get('pkg.version')
+      });
+    }
+
+    // if we already have a the current version in the index then we need to stop
+    var devConfig = _.find(response.hits.hits, function currentVersion(hit) {
+      return hit._id !== '@@version' && hit._id === config.get('pkg.version');
+    });
+
+    if (devConfig) return Promise.resolve();
+
+    // Look for upgradeable configs. If none of them are upgradeable
+    // then resolve with null.
+    var body = _.find(response.hits.hits, isUpgradeable.bind(null, server));
+    if (!body) return Promise.resolve();
+
+    // if the build number is still the template string (which it wil be in development)
+    // then we need to set it to the max interger. Otherwise we will set it to the build num
+    body._source.buildNum = config.get('pkg.buildNum');
+
+    server.log(['plugin', 'elasticsearch'], {
+      tmpl: 'Upgrade config from <%= prevVersion %> to <%= newVersion %>',
+      prevVersion: body._id,
+      newVersion: config.get('pkg.version')
+    });
+
+    return client.create({
+      index: config.get('kibana.index'),
+      type: 'config',
+      body: body._source,
+      id: config.get('pkg.version')
+    });
+  };
+};
+
diff --git a/src/server/plugins/elasticsearch/lib/validate.js b/src/plugins/elasticsearch/lib/validate.js
similarity index 100%
rename from src/server/plugins/elasticsearch/lib/validate.js
rename to src/plugins/elasticsearch/lib/validate.js
diff --git a/src/server/plugins/elasticsearch/lib/version_math.js b/src/plugins/elasticsearch/lib/version_math.js
similarity index 100%
rename from src/server/plugins/elasticsearch/lib/version_math.js
rename to src/plugins/elasticsearch/lib/version_math.js
diff --git a/src/plugins/elasticsearch/package.json b/src/plugins/elasticsearch/package.json
new file mode 100644
index 0000000000000..7f441251c3036
--- /dev/null
+++ b/src/plugins/elasticsearch/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "elasticsearch",
+  "version": "1.0.0"
+}
diff --git a/src/plugins/kbn_vislib_vis_types/index.js b/src/plugins/kbn_vislib_vis_types/index.js
new file mode 100644
index 0000000000000..a9c8a5c0c90f9
--- /dev/null
+++ b/src/plugins/kbn_vislib_vis_types/index.js
@@ -0,0 +1,13 @@
+module.exports = function (kibana) {
+
+  return new kibana.Plugin({
+
+    uiExports: {
+      visTypes: [
+        'plugins/kbn_vislib_vis_types/kbn_vislib_vis_types'
+      ]
+    }
+
+  });
+
+};
diff --git a/src/plugins/kbn_vislib_vis_types/package.json b/src/plugins/kbn_vislib_vis_types/package.json
new file mode 100644
index 0000000000000..fc8863542cc4a
--- /dev/null
+++ b/src/plugins/kbn_vislib_vis_types/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "kbn_vislib_vis_types",
+  "version": "1.0.0"
+}
diff --git a/src/kibana/plugins/kbn_vislib_vis_types/area.js b/src/plugins/kbn_vislib_vis_types/public/area.js
similarity index 89%
rename from src/kibana/plugins/kbn_vislib_vis_types/area.js
rename to src/plugins/kbn_vislib_vis_types/public/area.js
index 63ecd29f32117..9f94093e45627 100644
--- a/src/kibana/plugins/kbn_vislib_vis_types/area.js
+++ b/src/plugins/kbn_vislib_vis_types/public/area.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function HistogramVisType(Private) {
-    var VislibVisType = Private(require('components/vislib_vis_type/VislibVisType'));
-    var Schemas = Private(require('components/vis/Schemas'));
+    var VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
+    var Schemas = Private(require('ui/Vis/Schemas'));
 
     return new VislibVisType({
       name: 'area',
@@ -28,7 +28,7 @@ define(function (require) {
         },
         scales: ['linear', 'log', 'square root'],
         modes: ['stacked', 'overlap', 'percentage', 'wiggle', 'silhouette'],
-        editor: require('text!plugins/kbn_vislib_vis_types/editors/area.html')
+        editor: require('plugins/kbn_vislib_vis_types/editors/area.html')
       },
       schemas: new Schemas([
         {
diff --git a/src/kibana/plugins/kbn_vislib_vis_types/controls/line_interpolation_option.html b/src/plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.html
similarity index 100%
rename from src/kibana/plugins/kbn_vislib_vis_types/controls/line_interpolation_option.html
rename to src/plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.html
diff --git a/src/plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js b/src/plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js
new file mode 100644
index 0000000000000..23aac4bdaaf63
--- /dev/null
+++ b/src/plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js
@@ -0,0 +1,13 @@
+define(function (require) {
+  var _ = require('lodash');
+  var $ = require('jquery');
+  var module = require('ui/modules').get('kibana');
+
+  module.directive('lineInterpolationOption', function ($parse, $compile) {
+    return {
+      restrict: 'E',
+      template: require('plugins/kbn_vislib_vis_types/controls/line_interpolation_option.html'),
+      replace: true
+    };
+  });
+});
diff --git a/src/kibana/plugins/kbn_vislib_vis_types/controls/point_series_options.html b/src/plugins/kbn_vislib_vis_types/public/controls/point_series_options.html
similarity index 100%
rename from src/kibana/plugins/kbn_vislib_vis_types/controls/point_series_options.html
rename to src/plugins/kbn_vislib_vis_types/public/controls/point_series_options.html
diff --git a/src/plugins/kbn_vislib_vis_types/public/controls/point_series_options.js b/src/plugins/kbn_vislib_vis_types/public/controls/point_series_options.js
new file mode 100644
index 0000000000000..8fac50be538ca
--- /dev/null
+++ b/src/plugins/kbn_vislib_vis_types/public/controls/point_series_options.js
@@ -0,0 +1,14 @@
+define(function (require) {
+  var _ = require('lodash');
+  var $ = require('jquery');
+  var module = require('ui/modules').get('kibana');
+  require('ui/directives/inequality');
+
+  module.directive('pointSeriesOptions', function ($parse, $compile) {
+    return {
+      restrict: 'E',
+      template: require('plugins/kbn_vislib_vis_types/controls/point_series_options.html'),
+      replace: true
+    };
+  });
+});
diff --git a/src/kibana/plugins/kbn_vislib_vis_types/controls/radius_ratio_option.html b/src/plugins/kbn_vislib_vis_types/public/controls/radius_ratio_option.html
similarity index 100%
rename from src/kibana/plugins/kbn_vislib_vis_types/controls/radius_ratio_option.html
rename to src/plugins/kbn_vislib_vis_types/public/controls/radius_ratio_option.html
diff --git a/src/kibana/plugins/kbn_vislib_vis_types/controls/rows_or_columns.html b/src/plugins/kbn_vislib_vis_types/public/controls/rows_or_columns.html
similarity index 100%
rename from src/kibana/plugins/kbn_vislib_vis_types/controls/rows_or_columns.html
rename to src/plugins/kbn_vislib_vis_types/public/controls/rows_or_columns.html
diff --git a/src/kibana/plugins/kbn_vislib_vis_types/controls/vislib_basic_options.html b/src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.html
similarity index 100%
rename from src/kibana/plugins/kbn_vislib_vis_types/controls/vislib_basic_options.html
rename to src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.html
diff --git a/src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js b/src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js
new file mode 100644
index 0000000000000..1d7b9d6d06d97
--- /dev/null
+++ b/src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js
@@ -0,0 +1,13 @@
+define(function (require) {
+  var _ = require('lodash');
+  var $ = require('jquery');
+  var module = require('ui/modules').get('kibana');
+
+  module.directive('vislibBasicOptions', function ($parse, $compile) {
+    return {
+      restrict: 'E',
+      template: require('plugins/kbn_vislib_vis_types/controls/vislib_basic_options.html'),
+      replace: true
+    };
+  });
+});
diff --git a/src/kibana/plugins/kbn_vislib_vis_types/editors/area.html b/src/plugins/kbn_vislib_vis_types/public/editors/area.html
similarity index 100%
rename from src/kibana/plugins/kbn_vislib_vis_types/editors/area.html
rename to src/plugins/kbn_vislib_vis_types/public/editors/area.html
diff --git a/src/kibana/plugins/kbn_vislib_vis_types/editors/histogram.html b/src/plugins/kbn_vislib_vis_types/public/editors/histogram.html
similarity index 100%
rename from src/kibana/plugins/kbn_vislib_vis_types/editors/histogram.html
rename to src/plugins/kbn_vislib_vis_types/public/editors/histogram.html
diff --git a/src/kibana/plugins/kbn_vislib_vis_types/editors/line.html b/src/plugins/kbn_vislib_vis_types/public/editors/line.html
similarity index 100%
rename from src/kibana/plugins/kbn_vislib_vis_types/editors/line.html
rename to src/plugins/kbn_vislib_vis_types/public/editors/line.html
diff --git a/src/kibana/plugins/kbn_vislib_vis_types/editors/pie.html b/src/plugins/kbn_vislib_vis_types/public/editors/pie.html
similarity index 100%
rename from src/kibana/plugins/kbn_vislib_vis_types/editors/pie.html
rename to src/plugins/kbn_vislib_vis_types/public/editors/pie.html
diff --git a/src/kibana/plugins/kbn_vislib_vis_types/editors/tile_map.html b/src/plugins/kbn_vislib_vis_types/public/editors/tile_map.html
similarity index 100%
rename from src/kibana/plugins/kbn_vislib_vis_types/editors/tile_map.html
rename to src/plugins/kbn_vislib_vis_types/public/editors/tile_map.html
diff --git a/src/plugins/kbn_vislib_vis_types/public/histogram.js b/src/plugins/kbn_vislib_vis_types/public/histogram.js
new file mode 100644
index 0000000000000..aeb01ef7d7990
--- /dev/null
+++ b/src/plugins/kbn_vislib_vis_types/public/histogram.js
@@ -0,0 +1,67 @@
+define(function (require) {
+  return function HistogramVisType(Private) {
+    var VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
+    var Schemas = Private(require('ui/Vis/Schemas'));
+
+    return new VislibVisType({
+      name: 'histogram',
+      title: 'Vertical bar chart',
+      icon: 'fa-bar-chart',
+      description: 'The goto chart for oh-so-many needs. Great for time and non-time data. Stacked or grouped, ' +
+      'exact numbers or percentages. If you are not sure which chart your need, you could do worse than to start here.',
+      params: {
+        defaults: {
+          shareYAxis: true,
+          addTooltip: true,
+          addLegend: true,
+          scale: 'linear',
+          mode: 'stacked',
+          times: [],
+          addTimeMarker: false,
+          defaultYExtents: false,
+          setYExtents: false,
+          yAxis: {}
+        },
+        scales: ['linear', 'log', 'square root'],
+        modes: ['stacked', 'percentage', 'grouped'],
+        editor: require('plugins/kbn_vislib_vis_types/editors/histogram.html')
+      },
+      schemas: new Schemas([
+        {
+          group: 'metrics',
+          name: 'metric',
+          title: 'Y-Axis',
+          min: 1,
+          aggFilter: '!std_dev',
+          defaults: [
+            { schema: 'metric', type: 'count' }
+          ]
+        },
+        {
+          group: 'buckets',
+          name: 'segment',
+          title: 'X-Axis',
+          min: 0,
+          max: 1,
+          aggFilter: '!geohash_grid'
+        },
+        {
+          group: 'buckets',
+          name: 'group',
+          title: 'Split Bars',
+          min: 0,
+          max: 1,
+          aggFilter: '!geohash_grid'
+        },
+        {
+          group: 'buckets',
+          name: 'split',
+          title: 'Split Chart',
+          min: 0,
+          max: 1,
+          aggFilter: '!geohash_grid'
+        }
+      ])
+    });
+  };
+});
diff --git a/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js b/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js
new file mode 100644
index 0000000000000..6aa4e07a0230f
--- /dev/null
+++ b/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js
@@ -0,0 +1,8 @@
+define(function (require) {
+  var visTypes = require('ui/registry/vis_types');
+  visTypes.register(require('plugins/kbn_vislib_vis_types/histogram'));
+  visTypes.register(require('plugins/kbn_vislib_vis_types/line'));
+  visTypes.register(require('plugins/kbn_vislib_vis_types/pie'));
+  visTypes.register(require('plugins/kbn_vislib_vis_types/area'));
+  visTypes.register(require('plugins/kbn_vislib_vis_types/tileMap'));
+});
diff --git a/src/kibana/plugins/kbn_vislib_vis_types/line.js b/src/plugins/kbn_vislib_vis_types/public/line.js
similarity index 89%
rename from src/kibana/plugins/kbn_vislib_vis_types/line.js
rename to src/plugins/kbn_vislib_vis_types/public/line.js
index 73981a90074f6..dbc9fdc8dc2da 100644
--- a/src/kibana/plugins/kbn_vislib_vis_types/line.js
+++ b/src/plugins/kbn_vislib_vis_types/public/line.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function HistogramVisType(Private) {
-    var VislibVisType = Private(require('components/vislib_vis_type/VislibVisType'));
-    var Schemas = Private(require('components/vis/Schemas'));
+    var VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
+    var Schemas = Private(require('ui/Vis/Schemas'));
 
     return new VislibVisType({
       name: 'line',
@@ -27,7 +27,7 @@ define(function (require) {
           yAxis: {}
         },
         scales: ['linear', 'log', 'square root'],
-        editor: require('text!plugins/kbn_vislib_vis_types/editors/line.html')
+        editor: require('plugins/kbn_vislib_vis_types/editors/line.html')
       },
       schemas: new Schemas([
         {
diff --git a/src/plugins/kbn_vislib_vis_types/public/pie.js b/src/plugins/kbn_vislib_vis_types/public/pie.js
new file mode 100644
index 0000000000000..04714ef260ee9
--- /dev/null
+++ b/src/plugins/kbn_vislib_vis_types/public/pie.js
@@ -0,0 +1,57 @@
+define(function (require) {
+  return function HistogramVisType(Private) {
+    var VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
+    var Schemas = Private(require('ui/Vis/Schemas'));
+
+    return new VislibVisType({
+      name: 'pie',
+      title: 'Pie chart',
+      icon: 'fa-pie-chart',
+      description: 'Pie charts are ideal for displaying the parts of some whole. For example, sales percentages by department.' +
+       'Pro Tip: Pie charts are best used sparingly, and with no more than 7 slices per pie.',
+      params: {
+        defaults: {
+          shareYAxis: true,
+          addTooltip: true,
+          addLegend: true,
+          isDonut: false
+        },
+        editor: require('plugins/kbn_vislib_vis_types/editors/pie.html')
+      },
+      responseConverter: false,
+      hierarchicalData: true,
+      schemas: new Schemas([
+        {
+          group: 'metrics',
+          name: 'metric',
+          title: 'Slice Size',
+          min: 1,
+          max: 1,
+          aggFilter: ['sum', 'count', 'cardinality'],
+          defaults: [
+            { schema: 'metric', type: 'count' }
+          ]
+        },
+        {
+          group: 'buckets',
+          name: 'segment',
+          icon: 'fa fa-scissors',
+          title: 'Split Slices',
+          min: 0,
+          max: Infinity,
+          aggFilter: '!geohash_grid'
+        },
+        {
+          group: 'buckets',
+          name: 'split',
+          icon: 'fa fa-th',
+          title: 'Split Chart',
+          mustBeFirst: true,
+          min: 0,
+          max: 1,
+          aggFilter: '!geohash_grid'
+        }
+      ])
+    });
+  };
+});
diff --git a/src/kibana/plugins/kbn_vislib_vis_types/tileMap.js b/src/plugins/kbn_vislib_vis_types/public/tileMap.js
similarity index 88%
rename from src/kibana/plugins/kbn_vislib_vis_types/tileMap.js
rename to src/plugins/kbn_vislib_vis_types/public/tileMap.js
index 6d6cff5744c1c..8a3046561b968 100644
--- a/src/kibana/plugins/kbn_vislib_vis_types/tileMap.js
+++ b/src/plugins/kbn_vislib_vis_types/public/tileMap.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function TileMapVisType(Private, getAppState, courier, config) {
-    var VislibVisType = Private(require('components/vislib_vis_type/VislibVisType'));
-    var Schemas = Private(require('components/vis/Schemas'));
-    var geoJsonConverter = Private(require('components/agg_response/geo_json/geo_json'));
+    var VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
+    var Schemas = Private(require('ui/Vis/Schemas'));
+    var geoJsonConverter = Private(require('ui/agg_response/geo_json/geo_json'));
     var _ = require('lodash');
-    var supports = require('utils/supports');
+    var supports = require('ui/utils/supports');
 
     return new VislibVisType({
       name: 'tile_map',
@@ -25,14 +25,14 @@ define(function (require) {
         },
         mapTypes: ['Scaled Circle Markers', 'Shaded Circle Markers', 'Shaded Geohash Grid', 'Heatmap'],
         canDesaturate: !!supports.cssFilters,
-        editor: require('text!plugins/kbn_vislib_vis_types/editors/tile_map.html')
+        editor: require('plugins/kbn_vislib_vis_types/editors/tile_map.html')
       },
       listeners: {
         rectangle: function (event) {
           var agg = _.get(event, 'chart.geohashGridAgg');
           if (!agg) return;
 
-          var pushFilter = Private(require('components/filter_bar/push_filter'))(getAppState());
+          var pushFilter = Private(require('ui/filter_bar/push_filter'))(getAppState());
           var indexPatternName = agg.vis.indexPattern.id;
           var field = agg.fieldName();
           var filter = {geo_bounding_box: {}};
diff --git a/src/plugins/kibana/index.js b/src/plugins/kibana/index.js
new file mode 100644
index 0000000000000..34f9a8246152c
--- /dev/null
+++ b/src/plugins/kibana/index.js
@@ -0,0 +1,46 @@
+module.exports = function (kibana) {
+  return new kibana.Plugin({
+
+    config: function (Joi) {
+      return Joi.object({
+        enabled: Joi.boolean().default(true),
+        defaultAppId: Joi.string().default('discover'),
+        index: Joi.string().default('.kibana')
+      }).default();
+    },
+
+    uiExports: {
+      app: {
+        title: 'Kibana',
+        description: 'the kibana you know and love',
+        icon: 'plugins/kibana/settings/sections/about/barcode.svg',
+        main: 'plugins/kibana/kibana',
+        uses: [
+          'visTypes',
+          'spyModes'
+        ],
+
+        autoload: kibana.autoload.require.concat(
+          'plugins/kibana/discover',
+          'plugins/kibana/visualize',
+          'plugins/kibana/dashboard',
+          'plugins/kibana/settings',
+          'plugins/kibana/settings/sections',
+          'plugins/kibana/doc',
+          'plugins/kibana/settings/sections',
+          'ui/vislib',
+          'ui/agg_response',
+          'ui/agg_types',
+          'leaflet'
+        ),
+
+        constants: function (server, options) {
+          return {
+            defaultAppId: options.defaultAppId
+          };
+        }
+      }
+    }
+  });
+
+};
diff --git a/src/plugins/kibana/package.json b/src/plugins/kibana/package.json
new file mode 100644
index 0000000000000..4ff821e670ce7
--- /dev/null
+++ b/src/plugins/kibana/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "kibana",
+  "version": "1.0.0"
+}
diff --git a/src/plugins/kibana/public/dashboard/components/panel/lib/load_panel.js b/src/plugins/kibana/public/dashboard/components/panel/lib/load_panel.js
new file mode 100644
index 0000000000000..b7d7b42554be2
--- /dev/null
+++ b/src/plugins/kibana/public/dashboard/components/panel/lib/load_panel.js
@@ -0,0 +1,18 @@
+define(function (require) {
+  var _ = require('lodash');
+  return function loadPanelFunction(Private) { // Inject services here
+    return function (panel, $scope) { // Function parameters here
+      var panelTypes = {
+        visualization: Private(require('plugins/kibana/dashboard/components/panel/lib/visualization')),
+        search: Private(require('plugins/kibana/dashboard/components/panel/lib/search'))
+      };
+
+      try {
+        return panelTypes[panel.type](panel, $scope);
+      } catch (e) {
+        throw new Error('Loader not found for unknown panel type: ' + panel.type);
+      }
+
+    };
+  };
+});
diff --git a/src/kibana/plugins/dashboard/components/panel/lib/search.js b/src/plugins/kibana/public/dashboard/components/panel/lib/search.js
similarity index 100%
rename from src/kibana/plugins/dashboard/components/panel/lib/search.js
rename to src/plugins/kibana/public/dashboard/components/panel/lib/search.js
diff --git a/src/kibana/plugins/dashboard/components/panel/lib/visualization.js b/src/plugins/kibana/public/dashboard/components/panel/lib/visualization.js
similarity index 80%
rename from src/kibana/plugins/dashboard/components/panel/lib/visualization.js
rename to src/plugins/kibana/public/dashboard/components/panel/lib/visualization.js
index 12bce66c1b50a..f5cbdd8923864 100644
--- a/src/kibana/plugins/dashboard/components/panel/lib/visualization.js
+++ b/src/plugins/kibana/public/dashboard/components/panel/lib/visualization.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function visualizationLoader(savedVisualizations, Private) { // Inject services here
-    var brushEvent = Private(require('utils/brush_event'));
-    var filterBarClickHandler = Private(require('components/filter_bar/filter_bar_click_handler'));
+    var brushEvent = Private(require('ui/utils/brush_event'));
+    var filterBarClickHandler = Private(require('ui/filter_bar/filter_bar_click_handler'));
 
     return function (panel, $scope) { // Function parameters here
       return savedVisualizations.get(panel.id)
diff --git a/src/kibana/plugins/dashboard/components/panel/panel.html b/src/plugins/kibana/public/dashboard/components/panel/panel.html
similarity index 84%
rename from src/kibana/plugins/dashboard/components/panel/panel.html
rename to src/plugins/kibana/public/dashboard/components/panel/panel.html
index 9e2f1b4ad40f3..5a1286cad8075 100644
--- a/src/kibana/plugins/dashboard/components/panel/panel.html
+++ b/src/plugins/kibana/public/dashboard/components/panel/panel.html
@@ -2,10 +2,10 @@
   <div class="panel-heading">
     <span class="panel-title">{{savedObj.title}}</span>
     <div class="btn-group">
-      <a aria-label="Edit" ng-show="!appEmbedded && editUrl" ng-href="{{editUrl}}">
+      <a aria-label="Edit" ng-show="!chrome.embedded && editUrl" ng-href="{{editUrl}}">
         <i aria-hidden="true" class="fa fa-pencil"></i>
       </a>
-      <a aria-label="Remove" ng-show="!appEmbedded" ng-click="remove()">
+      <a aria-label="Remove" ng-show="!chrome.embedded" ng-click="remove()">
         <i aria-hidden="true" class="fa fa-times"></i>
       </a>
     </div>
diff --git a/src/kibana/plugins/dashboard/components/panel/panel.js b/src/plugins/kibana/public/dashboard/components/panel/panel.js
similarity index 81%
rename from src/kibana/plugins/dashboard/components/panel/panel.js
rename to src/plugins/kibana/public/dashboard/components/panel/panel.js
index ae03ab2e090a4..d4912125ae8d7 100644
--- a/src/kibana/plugins/dashboard/components/panel/panel.js
+++ b/src/plugins/kibana/public/dashboard/components/panel/panel.js
@@ -1,15 +1,15 @@
 define(function (require) {
   var moment = require('moment');
   var $ = require('jquery');
-  require('modules')
+  require('ui/modules')
   .get('app/dashboard')
   .directive('dashboardPanel', function (savedVisualizations, savedSearches, Notifier, Private, $injector) {
     var _ = require('lodash');
-    var loadPanel = Private(require('plugins/dashboard/components/panel/lib/load_panel'));
-    var filterManager = Private(require('components/filter_manager/filter_manager'));
+    var loadPanel = Private(require('plugins/kibana/dashboard/components/panel/lib/load_panel'));
+    var filterManager = Private(require('ui/filter_manager'));
     var notify = new Notifier();
 
-    var services = require('plugins/settings/saved_object_registry').all().map(function (serviceObj) {
+    var services = require('plugins/kibana/settings/saved_object_registry').all().map(function (serviceObj) {
       var service = $injector.get(serviceObj.service);
       return {
         type: service.type,
@@ -17,14 +17,14 @@ define(function (require) {
       };
     });
 
-    require('components/visualize/visualize');
-    require('components/doc_table/doc_table');
+    require('ui/visualize');
+    require('ui/doc_table');
 
-    var brushEvent = Private(require('utils/brush_event'));
+    var brushEvent = Private(require('ui/utils/brush_event'));
 
     return {
       restrict: 'E',
-      template: require('text!plugins/dashboard/components/panel/panel.html'),
+      template: require('plugins/kibana/dashboard/components/panel/panel.html'),
       requires: '^dashboardGrid',
       link: function ($scope, $el) {
         // using $scope inheritance, panels are available in AppState
diff --git a/src/kibana/plugins/dashboard/directives/grid.js b/src/plugins/kibana/public/dashboard/directives/grid.js
similarity index 99%
rename from src/kibana/plugins/dashboard/directives/grid.js
rename to src/plugins/kibana/public/dashboard/directives/grid.js
index cc45541b34a8a..3b29551df48d2 100644
--- a/src/kibana/plugins/dashboard/directives/grid.js
+++ b/src/plugins/kibana/public/dashboard/directives/grid.js
@@ -4,7 +4,7 @@ define(function (require) {
 
   require('gridster');
 
-  var app = require('modules').get('app/dashboard');
+  var app = require('ui/modules').get('app/dashboard');
 
   app.directive('dashboardGrid', function ($compile, Notifier) {
     return {
diff --git a/src/plugins/kibana/public/dashboard/index.html b/src/plugins/kibana/public/dashboard/index.html
new file mode 100644
index 0000000000000..8b6d925275c7d
--- /dev/null
+++ b/src/plugins/kibana/public/dashboard/index.html
@@ -0,0 +1,89 @@
+<div dashboard-app class="app-container dashboard-container">
+  <navbar ng-show="!chrome.embedded">
+    <span class="name" ng-if="dash.id" bindonce bo-bind="dash.title" tooltip="{{dash.title}}"></span>
+
+    <form name="queryInput"
+      class="fill inline-form"
+      ng-submit="filterResults()"
+      role="form">
+
+      <div class="typeahead" kbn-typeahead="dashboard">
+        <div class="input-group"
+          ng-class="queryInput.$invalid ? 'has-error' : ''">
+
+          <input type="text"
+            placeholder="Filter..."
+            aria-label="Filter input"
+            class="form-control"
+            ng-model="state.query"
+            input-focus
+            kbn-typeahead-input
+            validate-query>
+          <button type="submit" class="btn btn-default" ng-disabled="queryInput.$invalid" aria-label="Filter dashboards">
+            <span aria-hidden="true" class="fa fa-search"></span>
+          </button>
+        </div>
+
+        <kbn-typeahead-items></kbn-typeahead-items>
+      </div>
+
+    </form>
+
+    <div class="button-group" role="toolbar">
+      <kbn-tooltip text="New Dashboard" placement="bottom" append-to-body="1">
+        <button ng-click="newDashboard()" aria-label="New Dashboard"><i aria-hidden="true" class="fa fa-file-new-o"></i></button>
+      </kbn-tooltip>
+      <kbn-tooltip text="Save Dashboard" placement="bottom" append-to-body="1">
+        <button
+          aria-label="Save Dashboard"
+          aria-haspopup="true"
+          aria-expanded="{{ configTemplate.is('save') }}"
+          ng-class="{active: configTemplate.is('save')}"
+          ng-click="configTemplate.toggle('save');">
+          <i aria-hidden="true" class="fa fa-save"></i>
+        </button>
+      </kbn-tooltip>
+      <kbn-tooltip text="Load Saved Dashboard" placement="bottom" append-to-body="1">
+        <button
+          aria-label="Load Saved Dashboard"
+          aria-haspopup="true"
+          aria-expanded="{{ configTemplate.is('load') }}"
+          ng-class="{active: configTemplate.is('load')}"
+          ng-click="configTemplate.toggle('load');">
+          <i aria-hidden="true" class="fa fa-folder-open-o"></i>
+        </button>
+      </kbn-tooltip>
+      <kbn-tooltip text="Share" placement="bottom" append-to-body="1">
+        <button
+          aria-label="Share Dashboard"
+          aria-haspopup="true"
+          aria-expanded="{{ configTemplate.is('share') }}"
+          ng-class="{active: configTemplate.is('share')}"
+          ng-click="configTemplate.toggle('share');">
+          <i aria-hidden="true" class="fa fa-external-link"></i>
+        </button>
+      </kbn-tooltip>
+      <kbn-tooltip text="Add Visualization" placement="bottom" append-to-body="1">
+        <button
+          aria-label="Add Visualization"
+          aria-haspopup="true"
+          aria-expanded="{{ configTemplate.is('pickVis') }}"
+          ng-class="{active: configTemplate.is('pickVis')}"
+          ng-click="configTemplate.toggle('pickVis');">
+          <i aria-hidden="true" class="fa fa-plus-circle"></i>
+        </button>
+      </kbn-tooltip>
+    </div>
+  </navbar>
+
+  <config config-template="configTemplate" config-object="opts"></config>
+
+  <filter-bar state="state"></filter-bar>
+
+  <div ng-show="!state.panels.length" class="text-center start-screen">
+    <h2>Ready to get started?</h2>
+    <p>Click the <a class="btn btn-xs navbtn-inverse" ng-click="configTemplate.open('pickVis'); toggleAddVisualization = !toggleAddVisualization" aria-label="Add visualization"><i aria-hidden="true" class="fa fa-plus-circle"></i></a> button in the menu bar above to add a visualization to the dashboard. <br/>If you haven't setup a visualization yet visit the <a href="#/visualize" title="Visualize">"Visualize"</a> tab to create your first visualization.</p>
+  </div>
+
+  <dashboard-grid></dashboard-grid>
+</div>
diff --git a/src/plugins/kibana/public/dashboard/index.js b/src/plugins/kibana/public/dashboard/index.js
new file mode 100644
index 0000000000000..4d6fea7fb3447
--- /dev/null
+++ b/src/plugins/kibana/public/dashboard/index.js
@@ -0,0 +1,207 @@
+define(function (require) {
+  var _ = require('lodash');
+  var $ = require('jquery');
+  var angular = require('angular');
+  var ConfigTemplate = require('ui/ConfigTemplate');
+
+  require('ui/directives/config');
+  require('ui/courier');
+  require('ui/config');
+  require('ui/notify');
+  require('ui/typeahead');
+  require('ui/clipboard');
+
+  require('plugins/kibana/dashboard/directives/grid');
+  require('plugins/kibana/dashboard/components/panel/panel');
+  require('plugins/kibana/dashboard/services/saved_dashboards');
+  require('plugins/kibana/dashboard/styles/main.less');
+
+  var app = require('ui/modules').get('app/dashboard', [
+    'elasticsearch',
+    'ngRoute',
+    'kibana/courier',
+    'kibana/config',
+    'kibana/notify',
+    'kibana/typeahead'
+  ]);
+
+  require('ui/routes')
+  .when('/dashboard', {
+    template: require('plugins/kibana/dashboard/index.html'),
+    resolve: {
+      dash: function (savedDashboards) {
+        return savedDashboards.get();
+      }
+    }
+  })
+  .when('/dashboard/:id', {
+    template: require('plugins/kibana/dashboard/index.html'),
+    resolve: {
+      dash: function (savedDashboards, Notifier, $route, $location, courier) {
+        return savedDashboards.get($route.current.params.id)
+        .catch(courier.redirectWhenMissing({
+          'dashboard' : '/dashboard'
+        }));
+      }
+    }
+  });
+
+  app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter, kbnUrl) {
+    return {
+      controller: function ($scope, $route, $routeParams, $location, Private, getAppState) {
+        var queryFilter = Private(require('ui/filter_bar/query_filter'));
+
+        var notify = new Notifier({
+          location: 'Dashboard'
+        });
+
+        var dash = $scope.dash = $route.current.locals.dash;
+
+        if (dash.timeRestore && dash.timeTo && dash.timeFrom && !getAppState.previouslyStored()) {
+          timefilter.time.to = dash.timeTo;
+          timefilter.time.from = dash.timeFrom;
+        }
+
+        $scope.$on('$destroy', dash.destroy);
+
+        var matchQueryFilter = function (filter) {
+          return filter.query && filter.query.query_string && !filter.meta;
+        };
+
+        var extractQueryFromFilters = function (filters) {
+          var filter = _.find(filters, matchQueryFilter);
+          if (filter) return filter.query;
+        };
+
+        var stateDefaults = {
+          title: dash.title,
+          panels: dash.panelsJSON ? JSON.parse(dash.panelsJSON) : [],
+          query: extractQueryFromFilters(dash.searchSource.getOwn('filter')) || {query_string: {query: '*'}},
+          filters: _.reject(dash.searchSource.getOwn('filter'), matchQueryFilter)
+        };
+
+        var $state = $scope.state = new AppState(stateDefaults);
+
+        $scope.configTemplate = new ConfigTemplate({
+          save: require('plugins/kibana/dashboard/partials/save_dashboard.html'),
+          load: require('plugins/kibana/dashboard/partials/load_dashboard.html'),
+          share: require('plugins/kibana/dashboard/partials/share.html'),
+          pickVis: require('plugins/kibana/dashboard/partials/pick_visualization.html')
+        });
+
+        $scope.refresh = _.bindKey(courier, 'fetch');
+
+        timefilter.enabled = true;
+        $scope.timefilter = timefilter;
+        $scope.$listen(timefilter, 'fetch', $scope.refresh);
+
+        courier.setRootSearchSource(dash.searchSource);
+
+        function init() {
+          updateQueryOnRootSource();
+
+          var docTitle = Private(require('ui/doc_title'));
+          if (dash.id) {
+            docTitle.change(dash.title);
+          }
+
+          $scope.$emit('application.load');
+        }
+
+        function updateQueryOnRootSource() {
+          var filters = queryFilter.getFilters();
+          if ($state.query) {
+            dash.searchSource.set('filter', _.union(filters, [{
+              query: $state.query
+            }]));
+          } else {
+            dash.searchSource.set('filter', filters);
+          }
+        }
+
+        // update root source when filters update
+        $scope.$listen(queryFilter, 'update', function () {
+          updateQueryOnRootSource();
+          $state.save();
+        });
+
+        // update data when filters fire fetch event
+        $scope.$listen(queryFilter, 'fetch', $scope.refresh);
+
+        $scope.newDashboard = function () {
+          kbnUrl.change('/dashboard', {});
+        };
+
+        $scope.filterResults = function () {
+          updateQueryOnRootSource();
+          $state.save();
+          $scope.refresh();
+        };
+
+        $scope.save = function () {
+          $state.title = dash.id = dash.title;
+          $state.save();
+          dash.panelsJSON = angular.toJson($state.panels);
+          dash.timeFrom = dash.timeRestore ? timefilter.time.from : undefined;
+          dash.timeTo = dash.timeRestore ? timefilter.time.to : undefined;
+
+          dash.save()
+          .then(function (id) {
+            $scope.configTemplate.close('save');
+            if (id) {
+              notify.info('Saved Dashboard as "' + dash.title + '"');
+              if (dash.id !== $routeParams.id) {
+                kbnUrl.change('/dashboard/{{id}}', {id: dash.id});
+              }
+            }
+          })
+          .catch(notify.fatal);
+        };
+
+        var pendingVis = _.size($state.panels);
+        $scope.$on('ready:vis', function () {
+          if (pendingVis) pendingVis--;
+          if (pendingVis === 0) {
+            $state.save();
+            $scope.refresh();
+          }
+        });
+
+        // listen for notifications from the grid component that changes have
+        // been made, rather than watching the panels deeply
+        $scope.$on('change:vis', function () {
+          $state.save();
+        });
+
+        // called by the saved-object-finder when a user clicks a vis
+        $scope.addVis = function (hit) {
+          pendingVis++;
+          $state.panels.push({ id: hit.id, type: 'visualization' });
+        };
+
+        $scope.addSearch = function (hit) {
+          pendingVis++;
+          $state.panels.push({ id: hit.id, type: 'search' });
+        };
+
+        // Setup configurable values for config directive, after objects are initialized
+        $scope.opts = {
+          dashboard: dash,
+          save: $scope.save,
+          addVis: $scope.addVis,
+          addSearch: $scope.addSearch,
+          shareData: function () {
+            return {
+              link: $location.absUrl(),
+              // This sucks, but seems like the cleanest way. Uhg.
+              embed: '<iframe src="' + $location.absUrl().replace('?', '?embed&') +
+                '" height="600" width="800"></iframe>'
+            };
+          }
+        };
+
+        init();
+      }
+    };
+  });
+});
diff --git a/src/kibana/plugins/dashboard/partials/load_dashboard.html b/src/plugins/kibana/public/dashboard/partials/load_dashboard.html
similarity index 100%
rename from src/kibana/plugins/dashboard/partials/load_dashboard.html
rename to src/plugins/kibana/public/dashboard/partials/load_dashboard.html
diff --git a/src/kibana/plugins/dashboard/partials/pick_visualization.html b/src/plugins/kibana/public/dashboard/partials/pick_visualization.html
similarity index 100%
rename from src/kibana/plugins/dashboard/partials/pick_visualization.html
rename to src/plugins/kibana/public/dashboard/partials/pick_visualization.html
diff --git a/src/kibana/plugins/dashboard/partials/save_dashboard.html b/src/plugins/kibana/public/dashboard/partials/save_dashboard.html
similarity index 100%
rename from src/kibana/plugins/dashboard/partials/save_dashboard.html
rename to src/plugins/kibana/public/dashboard/partials/save_dashboard.html
diff --git a/src/kibana/plugins/dashboard/partials/share.html b/src/plugins/kibana/public/dashboard/partials/share.html
similarity index 100%
rename from src/kibana/plugins/dashboard/partials/share.html
rename to src/plugins/kibana/public/dashboard/partials/share.html
diff --git a/src/kibana/plugins/dashboard/services/_saved_dashboard.js b/src/plugins/kibana/public/dashboard/services/_saved_dashboard.js
similarity index 96%
rename from src/kibana/plugins/dashboard/services/_saved_dashboard.js
rename to src/plugins/kibana/public/dashboard/services/_saved_dashboard.js
index 01aeb96796afc..b53549320169b 100644
--- a/src/kibana/plugins/dashboard/services/_saved_dashboard.js
+++ b/src/plugins/kibana/public/dashboard/services/_saved_dashboard.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('app/dashboard');
+  var module = require('ui/modules').get('app/dashboard');
   var _ = require('lodash');
   var moment = require('moment');
 
diff --git a/src/kibana/plugins/dashboard/services/saved_dashboards.js b/src/plugins/kibana/public/dashboard/services/saved_dashboards.js
similarity index 87%
rename from src/kibana/plugins/dashboard/services/saved_dashboards.js
rename to src/plugins/kibana/public/dashboard/services/saved_dashboards.js
index 41cb1f0ccdb0a..70711f8dafbc2 100644
--- a/src/kibana/plugins/dashboard/services/saved_dashboards.js
+++ b/src/plugins/kibana/public/dashboard/services/saved_dashboards.js
@@ -1,19 +1,19 @@
 define(function (require) {
-  var module = require('modules').get('app/dashboard');
+  var module = require('ui/modules').get('app/dashboard');
   var _ = require('lodash');
   // bring in the factory
-  require('plugins/dashboard/services/_saved_dashboard');
+  require('plugins/kibana/dashboard/services/_saved_dashboard');
 
 
   // Register this service with the saved object registry so it can be
   // edited by the object editor.
-  require('plugins/settings/saved_object_registry').register({
+  require('plugins/kibana/settings/saved_object_registry').register({
     service: 'savedDashboards',
     title: 'dashboards'
   });
 
   // This is the only thing that gets injected into controllers
-  module.service('savedDashboards', function (Promise, SavedDashboard, config, es, kbnUrl) {
+  module.service('savedDashboards', function (Promise, SavedDashboard, kbnIndex, es, kbnUrl) {
     this.type = SavedDashboard.type;
     this.Class = SavedDashboard;
 
@@ -54,7 +54,7 @@ define(function (require) {
       }
 
       return es.search({
-        index: config.file.kibana_index,
+        index: kbnIndex,
         type: 'dashboard',
         body: body,
         size: 100
diff --git a/src/plugins/kibana/public/dashboard/styles/main.less b/src/plugins/kibana/public/dashboard/styles/main.less
new file mode 100644
index 0000000000000..1a7b899f7cad9
--- /dev/null
+++ b/src/plugins/kibana/public/dashboard/styles/main.less
@@ -0,0 +1,121 @@
+@import (reference) "~ui/styles/variables";
+@import (reference) "~ui/styles/mixins";
+@dashboard-background: @gray-lighter;
+
+.tab-dashboard {
+  background-color: @dashboard-background;
+}
+
+dashboard-grid {
+  display: block;
+  margin: 0;
+  padding: 5px;
+}
+
+.start-screen {
+  margin: 20px;
+  background-color: @gray-lighter;
+  padding: 20px;
+}
+
+.gridster {
+  list-style-type: none;
+  display: block;
+  background-color: @dashboard-background;
+  margin: 0;
+  padding: 0;
+
+  .gs-resize-handle {
+    background-position: 50% 50% !important;
+    bottom: 0 !important;
+    right: 0 !important;
+    padding: 4px;
+    height: 25px;
+    width: 25px;
+  }
+
+  i.remove {
+    cursor: pointer;
+  }
+
+  dashboard-panel {
+    display: block;
+    height: 100%;
+    background: @panel-bg;
+    color: @text-color;
+    padding: 0;
+    overflow: hidden;
+    position: relative;
+
+    .panel {
+      margin: 0;
+      // maintain the 100% height of the panel
+      height: 100%;
+
+      // flex layout allows us to define the visualize element as "fill available space"
+      display: flex;
+      flex-direction: column;
+      justify-content: flex-start;
+
+      .panel-heading {
+        flex: 0 0 auto;
+        white-space: nowrap;
+        display: flex;
+
+        div.btn-group {
+          white-space: nowrap;
+          flex: 0 0 auto;
+        }
+
+        .panel-title {
+          font-size: inherit;
+
+          // flexbox fix for IE10
+          // http://stackoverflow.com/questions/22008135/internet-explorer-10-does-not-apply-flexbox-on-inline-elements
+          display: inline-block;
+
+          .ellipsis();
+          flex: 1 1 auto;
+        }
+
+        a {
+          color: @text-color;
+          border: none;
+          background: none;
+          padding: 0px 3px;
+          &:hover {
+            color: @link-hover-color;
+          }
+        }
+      }
+
+      .load-error {
+        text-align: center;
+        font-size: 1em;
+        display: flex;
+        flex: 1 0 auto;
+        justify-content: center;
+        flex-direction: column;
+
+        .fa-exclamation-triangle {
+          font-size: 2em;
+          color: @btn-danger-bg;
+        }
+      }
+
+      .panel-content {
+        display: flex;
+        flex: 1 1 100%;
+        height: auto;
+      }
+    }
+  }
+}
+
+.dashboard-panel-picker > li.list-group-item {
+  border-top: 0px;
+}
+
+.dashboard-load {
+  margin: 10px;
+}
diff --git a/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js b/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js
new file mode 100644
index 0000000000000..4c1cfab24230e
--- /dev/null
+++ b/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js
@@ -0,0 +1,56 @@
+
+var angular = require('angular');
+var $ = require('jquery');
+var _ = require('lodash');
+var sinon = require('auto-release-sinon');
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+
+// Load the kibana app dependencies.
+require('ui/private');
+require('plugins/kibana/discover/components/field_chooser/discover_field');
+
+describe('discoverField', function () {
+  var $scope;
+  var indexPattern;
+  var $elem;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private, $rootScope, $compile) {
+    $elem = angular.element('<discover-field></discover-field>');
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+
+    _.assign($rootScope, {
+      field: indexPattern.fields.byName.extension,
+      increaseFieldCounter: sinon.spy(),
+      toggle: function (field) {
+        indexPattern.fields.byName[field].display = !!!indexPattern.fields.byName[field].display;
+      }
+    });
+
+    $compile($elem)($rootScope);
+
+    $scope = $elem.scope();
+    $scope.$digest();
+  }));
+
+  afterEach(function () {
+    $scope.$destroy();
+  });
+
+  describe('toggleDisplay', function () {
+    it('should exist', function () {
+      expect($scope.toggleDisplay).to.be.a(Function);
+    });
+
+    it('should toggle the display of the field', function () {
+      $scope.toggleDisplay($scope.field);
+      expect($scope.field.display).to.be(true);
+    });
+
+    it('should increase the field popularity', function () {
+      $scope.toggleDisplay($scope.field);
+      expect($scope.increaseFieldCounter.called).to.be(true);
+    });
+  });
+});
diff --git a/src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js b/src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js
new file mode 100644
index 0000000000000..d06b0a34a8132
--- /dev/null
+++ b/src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js
@@ -0,0 +1,145 @@
+
+var _ = require('lodash');
+var ngMock = require('ngMock');
+var fieldCalculator = require('plugins/kibana/discover/components/field_chooser/lib/field_calculator');
+var expect = require('expect.js');
+
+// Load the kibana app dependencies.
+require('ui/private');
+
+var indexPattern;
+
+describe('fieldCalculator', function () {
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+  }));
+
+
+  it('should have a _countMissing that counts nulls & undefineds in an array', function () {
+    var values = [['foo', 'bar'], 'foo', 'foo', undefined, ['foo', 'bar'], 'bar', 'baz', null, null, null, 'foo', undefined];
+    expect(fieldCalculator._countMissing(values)).to.be(5);
+  });
+
+  describe('_groupValues', function () {
+    var groups, params, values;
+    beforeEach(function () {
+      values = [['foo', 'bar'], 'foo', 'foo', undefined, ['foo', 'bar'], 'bar', 'baz', null, null, null, 'foo', undefined];
+      params = {};
+      groups = fieldCalculator._groupValues(values, params);
+    });
+
+    it('should have a _groupValues that counts values', function () {
+      expect(groups).to.be.an(Object);
+    });
+
+    it('should throw an error if any value is a plain object', function () {
+      expect(function () { fieldCalculator._groupValues([{}, true, false], params); })
+        .to.throwError();
+    });
+
+    it('should have a a key for value in the array when not grouping array terms', function () {
+      expect(_.keys(groups).length).to.be(3);
+      expect(groups.foo).to.be.a(Object);
+      expect(groups.bar).to.be.a(Object);
+      expect(groups.baz).to.be.a(Object);
+    });
+
+    it('should count array terms independently', function () {
+      expect(groups['foo,bar']).to.be(undefined);
+      expect(groups.foo.count).to.be(5);
+      expect(groups.bar.count).to.be(3);
+      expect(groups.baz.count).to.be(1);
+    });
+
+    describe('grouped array terms', function () {
+      beforeEach(function () {
+        params.grouped = true;
+        groups = fieldCalculator._groupValues(values, params);
+      });
+
+      it('should group array terms when passed params.grouped', function () {
+        expect(_.keys(groups).length).to.be(4);
+        expect(groups['foo,bar']).to.be.a(Object);
+      });
+
+      it('should contain the original array as the value', function () {
+        expect(groups['foo,bar'].value).to.eql(['foo', 'bar']);
+      });
+
+      it('should count the pairs seperately from the values they contain', function () {
+        expect(groups['foo,bar'].count).to.be(2);
+        expect(groups.foo.count).to.be(3);
+        expect(groups.bar.count).to.be(1);
+      });
+    });
+  });
+
+  describe('getFieldValues', function () {
+    var hits;
+
+    beforeEach(function () {
+      hits = _.each(require('fixtures/real_hits.js'), indexPattern.flattenHit);
+    });
+
+    it('Should return an array of values for _source fields', function () {
+      var extensions = fieldCalculator.getFieldValues(hits, indexPattern.fields.byName.extension);
+      expect(extensions).to.be.an(Array);
+      expect(_.filter(extensions, function (v) { return v === 'html'; }).length).to.be(8);
+      expect(_.uniq(_.clone(extensions)).sort()).to.eql(['gif', 'html', 'php', 'png']);
+    });
+
+    it('Should return an array of values for core meta fields', function () {
+      var types = fieldCalculator.getFieldValues(hits, indexPattern.fields.byName._type);
+      expect(types).to.be.an(Array);
+      expect(_.filter(types, function (v) { return v === 'apache'; }).length).to.be(18);
+      expect(_.uniq(_.clone(types)).sort()).to.eql(['apache', 'nginx']);
+    });
+  });
+
+
+  describe('getFieldValueCounts', function () {
+    var params;
+    beforeEach(function () {
+      params = {
+        hits: require('fixtures/real_hits.js'),
+        field: indexPattern.fields.byName.extension,
+        count: 3
+      };
+    });
+
+    it('counts the top 3 values', function () {
+      var extensions = fieldCalculator.getFieldValueCounts(params);
+      expect(extensions).to.be.an(Object);
+      expect(extensions.buckets).to.be.an(Array);
+      expect(extensions.buckets.length).to.be(3);
+      expect(_.pluck(extensions.buckets, 'value')).to.eql(['html', 'php', 'gif']);
+      expect(extensions.error).to.be(undefined);
+    });
+
+    it('fails to analyze geo and attachment types', function () {
+      params.field = indexPattern.fields.byName.point;
+      expect(fieldCalculator.getFieldValueCounts(params).error).to.not.be(undefined);
+
+      params.field = indexPattern.fields.byName.area;
+      expect(fieldCalculator.getFieldValueCounts(params).error).to.not.be(undefined);
+
+      params.field = indexPattern.fields.byName.request_body;
+      expect(fieldCalculator.getFieldValueCounts(params).error).to.not.be(undefined);
+    });
+
+    it('fails to analyze fields that are in the mapping, but not the hits', function () {
+      params.field = indexPattern.fields.byName.ip;
+      expect(fieldCalculator.getFieldValueCounts(params).error).to.not.be(undefined);
+    });
+
+    it('counts the total hits', function () {
+      expect(fieldCalculator.getFieldValueCounts(params).total).to.be(params.hits.length);
+    });
+
+    it('counts the hits the field exists in', function () {
+      params.field = indexPattern.fields.byName.phpmemory;
+      expect(fieldCalculator.getFieldValueCounts(params).exists).to.be(5);
+    });
+  });
+});
diff --git a/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js b/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js
new file mode 100644
index 0000000000000..ce352ba0284f2
--- /dev/null
+++ b/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js
@@ -0,0 +1,234 @@
+
+var angular = require('angular');
+var ngMock = require('ngMock');
+var $ = require('jquery');
+var _ = require('lodash');
+var sinon = require('auto-release-sinon');
+var expect = require('expect.js');
+
+// Load the kibana app dependencies.
+require('ui/private');
+require('plugins/kibana/discover/components/field_chooser/field_chooser');
+
+var $parentScope;
+var $scope;
+var config;
+var hits;
+var indexPattern;
+var indexPatternList;
+
+// Sets up the directive, take an element, and a list of properties to attach to the parent scope.
+var init = function ($elem, props) {
+  ngMock.inject(function ($rootScope, $compile, $timeout, _config_) {
+    config = _config_;
+    $parentScope = $rootScope;
+    _.assign($parentScope, props);
+    $compile($elem)($parentScope);
+
+    // Required for test to run solo. Sigh
+    $timeout(function () {
+      $elem.scope().$digest();
+    }, 0);
+
+    $scope = $elem.isolateScope();
+  });
+};
+
+var destroy = function () {
+  $scope.$destroy();
+  $parentScope.$destroy();
+};
+
+describe('discover field chooser directives', function () {
+  var $elem = angular.element(
+    '<disc-field-chooser' +
+    '  columns="columns"' +
+    '  toggle="toggle"' +
+    '  hits="hits"' +
+    '  field-counts="fieldCounts"' +
+    '  filter="filter"' +
+    '  index-pattern="indexPattern"' +
+    '  index-pattern-list="indexPatternList"' +
+    '  state="state">' +
+    '</disc-field-chooser>'
+  );
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    hits = Private(require('fixtures/hits'));
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    indexPatternList = [ 'b', 'a', 'c' ];
+
+    var fieldCounts = _.transform(hits, function (counts, hit) {
+      _.keys(indexPattern.flattenHit(hit)).forEach(function (key) {
+        counts[key] = (counts[key] || 0) + 1;
+      });
+    }, {});
+
+    init($elem, {
+      columns: [],
+      toggle: sinon.spy(),
+      hits: hits,
+      fieldCounts: fieldCounts,
+      filter: sinon.spy(),
+      indexPattern: indexPattern,
+      indexPatternList: indexPatternList
+    });
+
+    $scope.$digest();
+  }));
+
+  afterEach(function () {
+    destroy();
+  });
+
+  var getSections = function (ctx) {
+    return {
+      selected: $('.discover-selected-fields', ctx),
+      popular: $('.discover-popular-fields', ctx),
+      unpopular: $('.discover-unpopular-fields', ctx),
+    };
+  };
+
+  describe('Index list', function () {
+    it('should be in alphabetical order', function (done) {
+      expect($elem.find('li.sidebar-item-title').text()).to.be('abc');
+      done();
+    });
+  });
+
+  describe('Field listing', function () {
+    it('should have Selected Fields, Fields and Popular Fields sections', function (done) {
+      var headers = $elem.find('.sidebar-list-header');
+      expect(headers.length).to.be(3);
+      done();
+    });
+
+    it('should have 2 popular fields, 1 unpopular field and no selected fields', function (done) {
+      var section = getSections($elem);
+
+      expect(section.selected.find('li').length).to.be(0);
+
+      expect(section.popular.text()).to.contain('ssl');
+      expect(section.popular.text()).to.contain('@timestamp');
+      expect(section.popular.text()).to.not.contain('ip\n');
+
+      expect(section.unpopular.text()).to.contain('extension');
+      expect(section.unpopular.text()).to.contain('machine.os');
+      expect(section.unpopular.text()).to.not.contain('ssl');
+      done();
+    });
+
+
+    it('should show the popular fields header if there are popular fields', function (done) {
+      var section = getSections($elem);
+      expect(section.popular.hasClass('ng-hide')).to.be(false);
+      expect(section.popular.find('li:not(.sidebar-list-header)').length).to.be.above(0);
+      done();
+    });
+
+    it('should not show the popular fields if there are not any', function (done) {
+
+      // Re-init
+      destroy();
+
+      _.each(indexPattern.fields, function (field) { field.$$spec.count = 0;}); // Reset the popular fields
+      init($elem, {
+        columns: [],
+        toggle: sinon.spy(),
+        hits: require('fixtures/hits'),
+        filter: sinon.spy(),
+        indexPattern: indexPattern
+      });
+
+      var section = getSections($elem);
+
+      $scope.$digest();
+      expect(section.popular.hasClass('ng-hide')).to.be(true);
+      expect(section.popular.find('li:not(.sidebar-list-header)').length).to.be(0);
+      done();
+    });
+
+    it('should move the field into selected when it is added to the columns array', function (done) {
+      var section = getSections($elem);
+      $scope.columns.push('bytes');
+      $scope.$digest();
+
+      expect(section.selected.text()).to.contain('bytes');
+      expect(section.popular.text()).to.not.contain('bytes');
+
+      $scope.columns.push('ip');
+      $scope.$digest();
+      expect(section.selected.text()).to.contain('ip\n');
+      expect(section.unpopular.text()).to.not.contain('ip\n');
+
+      expect(section.popular.text()).to.contain('ssl');
+
+      done();
+    });
+  });
+
+  describe('details processing', function () {
+    var field;
+    function getField() { return _.find($scope.fields, { name: 'bytes' }); }
+
+    beforeEach(function () {
+      field = getField();
+    });
+
+    it('should have a details function', function () {
+      expect($scope.details).to.be.a(Function);
+    });
+
+    it('should increase the field popularity when called', function () {
+      indexPattern.popularizeField = sinon.spy();
+      $scope.details(field);
+      expect(indexPattern.popularizeField.called).to.be(true);
+    });
+
+    it('should append a details object to the field', function () {
+      $scope.details(field);
+      expect(field.details).to.not.be(undefined);
+    });
+
+    it('should delete the field details if they already exist', function () {
+      $scope.details(field);
+      expect(field.details).to.not.be(undefined);
+      $scope.details(field);
+      expect(field.details).to.be(undefined);
+    });
+
+    it('... unless recompute is true', function () {
+      $scope.details(field);
+      expect(field.details).to.not.be(undefined);
+      $scope.details(field, true);
+      expect(field.details).to.not.be(undefined);
+    });
+
+    it('should create buckets with formatted and raw values', function () {
+      $scope.details(field);
+      expect(field.details.buckets).to.not.be(undefined);
+      expect(field.details.buckets[0].value).to.be(40.141592);
+      expect(field.details.buckets[0].display).to.be('40.142');
+    });
+
+
+    it('should recalculate the details on open fields if the hits change', function () {
+      $scope.hits = [
+        { _source: { bytes: 1024 } }
+      ];
+      $scope.$apply();
+
+      field = getField();
+      $scope.details(field);
+      expect(getField().details.total).to.be(1);
+
+      $scope.hits = [
+        { _source: { notbytes: 1024 } }
+      ];
+      $scope.$apply();
+      field = getField();
+      expect(field.details).to.not.have.property('total');
+    });
+  });
+});
diff --git a/src/plugins/kibana/public/discover/__tests__/hit_sort_fn.js b/src/plugins/kibana/public/discover/__tests__/hit_sort_fn.js
new file mode 100644
index 0000000000000..204749cf7662a
--- /dev/null
+++ b/src/plugins/kibana/public/discover/__tests__/hit_sort_fn.js
@@ -0,0 +1,74 @@
+
+var _ = require('lodash');
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+
+describe('hit sort function', function () {
+  var createHitSortFn;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    createHitSortFn = Private(require('plugins/kibana/discover/_hit_sort_fn'));
+  }));
+
+
+  var runSortTest = function (dir, sortOpts) {
+    var groupSize = _.random(10, 30);
+    var total = sortOpts.length * groupSize;
+
+    var hits = new Array(total);
+    sortOpts = sortOpts.map(function (opt) {
+      if (_.isArray(opt)) return opt;
+      else return [opt];
+    });
+    var sortOptLength = sortOpts.length;
+
+    for (var i = 0; i < hits.length; i++) {
+      hits[i] = {
+        _source: {},
+        sort: sortOpts[i % sortOptLength]
+      };
+    }
+
+    hits.sort(createHitSortFn(dir))
+    .forEach(function (hit, i, hits) {
+      var group = Math.floor(i / groupSize);
+      expect(hit.sort).to.eql(sortOpts[group]);
+    });
+  };
+
+
+  it('sorts a list of hits in ascending order', function () {
+    runSortTest('asc', [200, 404, 500]);
+  });
+
+  it('sorts a list of hits in descending order', function () {
+    runSortTest('desc', [10, 3, 1]);
+  });
+
+  it('breaks ties in ascending order', function () {
+    runSortTest('asc', [
+      [ 'apache',  200,  'facebook.com' ],
+      [ 'apache',  200,  'twitter.com'  ],
+      [ 'apache',  301,  'facebook.com' ],
+      [ 'apache',  301,  'twitter.com'  ],
+      [ 'nginx',   200,  'facebook.com' ],
+      [ 'nginx',   200,  'twitter.com'  ],
+      [ 'nginx',   301,  'facebook.com' ],
+      [ 'nginx',   301,  'twitter.com'  ]
+    ]);
+  });
+
+  it('breaks ties in descending order', function () {
+    runSortTest('desc', [
+      [ 'nginx',   301,  'twitter.com'  ],
+      [ 'nginx',   301,  'facebook.com' ],
+      [ 'nginx',   200,  'twitter.com'  ],
+      [ 'nginx',   200,  'facebook.com' ],
+      [ 'apache',  301,  'twitter.com'  ],
+      [ 'apache',  301,  'facebook.com' ],
+      [ 'apache',  200,  'twitter.com'  ],
+      [ 'apache',  200,  'facebook.com' ]
+    ]);
+  });
+});
diff --git a/src/kibana/plugins/discover/_hit_sort_fn.js b/src/plugins/kibana/public/discover/_hit_sort_fn.js
similarity index 100%
rename from src/kibana/plugins/discover/_hit_sort_fn.js
rename to src/plugins/kibana/public/discover/_hit_sort_fn.js
diff --git a/src/kibana/plugins/discover/components/field_chooser/discover_field.html b/src/plugins/kibana/public/discover/components/field_chooser/discover_field.html
similarity index 100%
rename from src/kibana/plugins/discover/components/field_chooser/discover_field.html
rename to src/plugins/kibana/public/discover/components/field_chooser/discover_field.html
diff --git a/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js b/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js
new file mode 100644
index 0000000000000..f8c859ddc5026
--- /dev/null
+++ b/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js
@@ -0,0 +1,94 @@
+define(function (require) {
+  var $ = require('jquery');
+  var app = require('ui/modules').get('apps/discover');
+  var html = require('plugins/kibana/discover/components/field_chooser/discover_field.html');
+  var _ = require('lodash');
+
+  require('ui/directives/css_truncate');
+  require('ui/directives/field_name');
+
+
+  app.directive('discoverField', function ($compile) {
+    return {
+      restrict: 'E',
+      template: html,
+      replace: true,
+      link: function ($scope, $elem) {
+        var detailsElem;
+        var detailScope = $scope.$new();
+
+        var detailsHtml = require('plugins/kibana/discover/components/field_chooser/lib/detail_views/string.html');
+
+        var init = function () {
+          if ($scope.field.details) {
+            $scope.toggleDetails($scope.field, true);
+          }
+        };
+
+        var getWarnings = function (field) {
+          var warnings = [];
+
+          if (!field.scripted) {
+            if (!field.doc_values && !(field.analyzed && field.type === 'string')) {
+              warnings.push('Doc values are not enabled on this field. This may lead to excess heap consumption when visualizing.');
+            }
+
+            if (field.analyzed && field.type === 'string') {
+              warnings.push('This is an analyzed string field.' +
+                ' Analyzed strings are highly unique and can use a lot of memory to visualize.' +
+                ' Values such as foo-bar will be broken into foo and bar.');
+            }
+
+            if (!field.indexed) {
+              warnings.push('This field is not indexed and can not be visualized.');
+            }
+          }
+
+
+          if (field.scripted) {
+            warnings.push('Scripted fields can take a long time to execute.');
+          }
+
+          if (warnings.length > 1) {
+            warnings = warnings.map(function (warning, i) {
+              return (i > 0 ? '\n' : '') + (i + 1) + ' - ' + warning;
+            });
+          }
+
+          return warnings;
+
+        };
+
+        $scope.toggleDisplay = function (field) {
+          // inheritted param to fieldChooser
+          $scope.toggle(field.name);
+          if (field.display) $scope.increaseFieldCounter(field);
+
+          // we are now displaying the field, kill it's details
+          if (field.details) {
+            $scope.toggleDetails(field);
+          }
+        };
+
+        $scope.toggleDetails = function (field, recompute) {
+          if (_.isUndefined(field.details) || recompute) {
+            // This is inherited from fieldChooser
+            $scope.details(field, recompute);
+            detailScope.$destroy();
+            detailScope = $scope.$new();
+            detailScope.warnings = getWarnings(field);
+
+            detailsElem = $(detailsHtml);
+            $compile(detailsElem)(detailScope);
+            $elem.append(detailsElem);
+          } else {
+            delete field.details;
+            detailsElem.remove();
+          }
+        };
+
+        init();
+      }
+    };
+  });
+});
diff --git a/src/kibana/plugins/discover/components/field_chooser/field_chooser.html b/src/plugins/kibana/public/discover/components/field_chooser/field_chooser.html
similarity index 100%
rename from src/kibana/plugins/discover/components/field_chooser/field_chooser.html
rename to src/plugins/kibana/public/discover/components/field_chooser/field_chooser.html
diff --git a/src/plugins/kibana/public/discover/components/field_chooser/field_chooser.js b/src/plugins/kibana/public/discover/components/field_chooser/field_chooser.js
new file mode 100644
index 0000000000000..8eb66d3bdabd1
--- /dev/null
+++ b/src/plugins/kibana/public/discover/components/field_chooser/field_chooser.js
@@ -0,0 +1,258 @@
+define(function (require) {
+  var app = require('ui/modules').get('apps/discover');
+
+  require('ui/directives/css_truncate');
+  require('ui/directives/field_name');
+  require('ui/filters/unique');
+  require('plugins/kibana/discover/components/field_chooser/discover_field');
+
+  app.directive('discFieldChooser', function ($location, globalState, config, $route, Private) {
+    var _ = require('lodash');
+    var rison = require('ui/utils/rison');
+    var fieldCalculator = require('plugins/kibana/discover/components/field_chooser/lib/field_calculator');
+    var FieldList = Private(require('ui/index_patterns/_field_list'));
+
+    return {
+      restrict: 'E',
+      scope: {
+        columns: '=',
+        hits: '=',
+        fieldCounts: '=',
+        state: '=',
+        indexPattern: '=',
+        indexPatternList: '=',
+        updateFilterInQuery: '=filter'
+      },
+      template: require('plugins/kibana/discover/components/field_chooser/field_chooser.html'),
+      link: function ($scope) {
+        $scope.setIndexPattern = function (id) {
+          $scope.state.index = id;
+          $scope.state.save();
+        };
+
+        $scope.$watch('state.index', function (id, previousId) {
+          if (previousId == null || previousId === id) return;
+          $route.reload();
+        });
+
+        var filter = $scope.filter = {
+          props: [
+            'type',
+            'indexed',
+            'analyzed',
+            'missing',
+            'name'
+          ],
+          defaults: {
+            missing: true
+          },
+          boolOpts: [
+            {label: 'any', value: undefined },
+            {label: 'yes', value: true },
+            {label: 'no', value: false }
+          ],
+          toggleVal: function (name, def) {
+            if (filter.vals[name] !== def) filter.vals[name] = def;
+            else filter.vals[name] = undefined;
+          },
+          reset: function () {
+            filter.vals = _.clone(filter.defaults);
+          },
+          isFieldSelected: function (field) {
+            return field.display;
+          },
+          isFieldFiltered: function (field) {
+            var matchFilter = (filter.vals.type == null || field.type === filter.vals.type);
+            var isAnalyzed = (filter.vals.analyzed == null || field.analyzed === filter.vals.analyzed);
+            var isIndexed = (filter.vals.indexed == null || field.indexed === filter.vals.indexed);
+            var scriptedOrMissing = (!filter.vals.missing || field.scripted || field.rowCount > 0);
+            var matchName = (!filter.vals.name || field.name.indexOf(filter.vals.name) !== -1);
+
+            return !field.display
+              && matchFilter
+              && isAnalyzed
+              && isIndexed
+              && scriptedOrMissing
+              && matchName
+            ;
+          },
+          popularity: function (field) {
+            return field.count > 0;
+          },
+          getActive: function () {
+            return _.some(filter.props, function (prop) {
+              return filter.vals[prop] !== filter.defaults[prop];
+            });
+          }
+        };
+
+        // set the initial values to the defaults
+        filter.reset();
+
+        $scope.$watchCollection('filter.vals', function () {
+          filter.active = filter.getActive();
+        });
+
+        $scope.toggle = function (fieldName) {
+          $scope.increaseFieldCounter(fieldName);
+          _.toggleInOut($scope.columns, fieldName);
+        };
+
+        $scope.$watchMulti([
+          '[]fieldCounts',
+          '[]columns',
+          '[]hits'
+        ], function (cur, prev) {
+          var newHits = cur[2] !== prev[2];
+          var fields = $scope.fields;
+          var columns = $scope.columns || [];
+          var fieldCounts = $scope.fieldCounts;
+
+          if (!fields || newHits) {
+            $scope.fields = fields = getFields();
+          }
+
+          if (!fields) return;
+
+          // group the fields into popular and up-popular lists
+          _.chain(fields)
+          .each(function (field) {
+            field.displayOrder = _.indexOf(columns, field.name) + 1;
+            field.display = !!field.displayOrder;
+            field.rowCount = fieldCounts[field.name];
+          })
+          .sortBy(function (field) {
+            return (field.count || 0) * -1;
+          })
+          .groupBy(function (field) {
+            if (field.display) return 'selected';
+            return field.count > 0 ? 'popular' : 'unpopular';
+          })
+          .tap(function (groups) {
+            groups.selected = _.sortBy(groups.selected || [], 'displayOrder');
+
+            groups.popular = groups.popular || [];
+            groups.unpopular = groups.unpopular || [];
+
+            // move excess popular fields to un-popular list
+            var extras = groups.popular.splice(config.get('fields:popularLimit'));
+            groups.unpopular = extras.concat(groups.unpopular);
+          })
+          .each(function (group, name) {
+            $scope[name + 'Fields'] = _.sortBy(group, name === 'selected' ? 'display' : 'name');
+          })
+          .commit();
+
+          // include undefined so the user can clear the filter
+          $scope.fieldTypes = _.union([undefined], _.pluck(fields, 'type'));
+        });
+
+        $scope.increaseFieldCounter = function (fieldName) {
+          $scope.indexPattern.popularizeField(fieldName, 1);
+        };
+
+        $scope.runAgg = function (field) {
+          var agg = {};
+          var isGeoPoint = field.type === 'geo_point';
+          var type = isGeoPoint ? 'tile_map' : 'histogram';
+          // If we're visualizing a date field, and our index is time based (and thus has a time filter),
+          // then run a date histogram
+          if (field.type === 'date' && $scope.indexPattern.timeFieldName === field.name) {
+            agg = {
+              type: 'date_histogram',
+              schema: 'segment',
+              params: {
+                field: field.name,
+                interval: 'auto'
+              }
+            };
+
+          } else if (isGeoPoint) {
+            agg = {
+              type: 'geohash_grid',
+              schema: 'segment',
+              params: {
+                field: field.name,
+                precision: 3
+              }
+            };
+          } else {
+            agg = {
+              type: 'terms',
+              schema: 'segment',
+              params: {
+                field: field.name,
+                size: config.get('discover:aggs:terms:size', 20),
+                orderBy: '2'
+              }
+            };
+          }
+
+          $location.path('/visualize/create').search({
+            indexPattern: $scope.state.index,
+            type: type,
+            _a: rison.encode({
+              filters: $scope.state.filters || [],
+              query: $scope.state.query || undefined,
+              vis: {
+                type: type,
+                aggs: [
+                  agg,
+                  {schema: 'metric', type: 'count', 'id': '2'}
+                ]
+              }
+            })
+          });
+        };
+
+        $scope.details = function (field, recompute) {
+          if (_.isUndefined(field.details) || recompute) {
+            field.details = fieldCalculator.getFieldValueCounts({
+              hits: $scope.hits,
+              field: field,
+              count: 5,
+              grouped: false
+            });
+            _.each(field.details.buckets, function (bucket) {
+              bucket.display = field.format.convert(bucket.value);
+            });
+            $scope.increaseFieldCounter(field, 1);
+          } else {
+            delete field.details;
+          }
+        };
+
+        function getFields() {
+          var prevFields = $scope.fields;
+          var indexPattern = $scope.indexPattern;
+          var hits = $scope.hits;
+          var fieldCounts = $scope.fieldCounts;
+
+          if (!indexPattern || !hits || !fieldCounts) return;
+
+          var fieldSpecs = indexPattern.fields.slice(0);
+          var fieldNamesInDocs = _.keys(fieldCounts);
+          var fieldNamesInIndexPattern = _.keys(indexPattern.fields.byName);
+
+          _.difference(fieldNamesInDocs, fieldNamesInIndexPattern)
+          .forEach(function (unknownFieldName) {
+            fieldSpecs.push({
+              name: unknownFieldName,
+              type: 'unknown'
+            });
+          });
+
+          var fields = new FieldList(indexPattern, fieldSpecs);
+
+          if (prevFields) {
+            fields.forEach(function (field) {
+              field.details = _.get(prevFields, ['byName', field.name, 'details']);
+            });
+          }
+
+          return fields;
+        }
+      }
+    };
+  });
+});
diff --git a/src/kibana/plugins/discover/components/field_chooser/lib/detail_views/string.html b/src/plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html
similarity index 100%
rename from src/kibana/plugins/discover/components/field_chooser/lib/detail_views/string.html
rename to src/plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html
diff --git a/src/kibana/plugins/discover/components/field_chooser/lib/field_calculator.js b/src/plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js
similarity index 100%
rename from src/kibana/plugins/discover/components/field_chooser/lib/field_calculator.js
rename to src/plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js
diff --git a/src/kibana/plugins/discover/controllers/discover.js b/src/plugins/kibana/public/discover/controllers/discover.js
similarity index 90%
rename from src/kibana/plugins/discover/controllers/discover.js
rename to src/plugins/kibana/public/discover/controllers/discover.js
index 4ee38200599d8..f608a5a4db0a2 100644
--- a/src/kibana/plugins/discover/controllers/discover.js
+++ b/src/plugins/kibana/public/discover/controllers/discover.js
@@ -2,33 +2,35 @@ define(function (require) {
   var _ = require('lodash');
   var angular = require('angular');
   var moment = require('moment');
-  var ConfigTemplate = require('utils/config_template');
-  var getSort = require('components/doc_table/lib/get_sort');
-  var rison = require('utils/rison');
-
-  var datemath = require('utils/datemath');
-
-  require('components/notify/notify');
-  require('components/timepicker/timepicker');
-  require('components/fixedScroll');
-  require('directives/validate_json');
-  require('components/validate_query/validate_query');
-  require('filters/moment');
-  require('components/courier/courier');
-  require('components/index_patterns/index_patterns');
-  require('components/state_management/app_state');
-  require('components/timefilter/timefilter');
-  require('components/highlight/highlight_tags');
-
-  var app = require('modules').get('apps/discover', [
+  var ConfigTemplate = require('ui/ConfigTemplate');
+  var getSort = require('ui/doc_table/lib/get_sort');
+  var rison = require('ui/utils/rison');
+
+  var dateMath = require('ui/utils/dateMath');
+
+  require('ui/doc_table');
+  require('ui/visualize');
+  require('ui/notify');
+  require('ui/timepicker');
+  require('ui/fixedScroll');
+  require('ui/directives/validate_json');
+  require('ui/validate_query');
+  require('ui/filters/moment');
+  require('ui/courier');
+  require('ui/index_patterns');
+  require('ui/state_management/app_state');
+  require('ui/timefilter');
+  require('ui/highlight/highlight_tags');
+
+  var app = require('ui/modules').get('apps/discover', [
     'kibana/notify',
     'kibana/courier',
     'kibana/index_patterns'
   ]);
 
-  require('routes')
+  require('ui/routes')
   .when('/discover/:id?', {
-    template: require('text!plugins/discover/index.html'),
+    template: require('plugins/kibana/discover/index.html'),
     reloadOnSearch: false,
     resolve: {
       ip: function (Promise, courier, config, $location) {
@@ -64,18 +66,18 @@ define(function (require) {
   app.controller('discover', function ($scope, config, courier, $route, $window, Notifier,
     AppState, timefilter, Promise, Private, kbnUrl, highlightTags) {
 
-    var Vis = Private(require('components/vis/vis'));
-    var docTitle = Private(require('components/doc_title/doc_title'));
-    var brushEvent = Private(require('utils/brush_event'));
-    var HitSortFn = Private(require('plugins/discover/_hit_sort_fn'));
-    var queryFilter = Private(require('components/filter_bar/query_filter'));
-    var filterManager = Private(require('components/filter_manager/filter_manager'));
+    var Vis = Private(require('ui/Vis'));
+    var docTitle = Private(require('ui/doc_title'));
+    var brushEvent = Private(require('ui/utils/brush_event'));
+    var HitSortFn = Private(require('plugins/kibana/discover/_hit_sort_fn'));
+    var queryFilter = Private(require('ui/filter_bar/query_filter'));
+    var filterManager = Private(require('ui/filter_manager'));
 
     var notify = new Notifier({
       location: 'Discover'
     });
 
-    $scope.intervalOptions = Private(require('components/agg_types/buckets/_interval_options'));
+    $scope.intervalOptions = Private(require('ui/agg_types/buckets/_interval_options'));
     $scope.showInterval = false;
 
     $scope.intervalEnabled = function (interval) {
@@ -88,8 +90,8 @@ define(function (require) {
 
     // config panel templates
     $scope.configTemplate = new ConfigTemplate({
-      load: require('text!plugins/discover/partials/load_search.html'),
-      save: require('text!plugins/discover/partials/save_search.html')
+      load: require('plugins/kibana/discover/partials/load_search.html'),
+      save: require('plugins/kibana/discover/partials/save_search.html')
     });
 
     $scope.timefilter = timefilter;
@@ -404,8 +406,8 @@ define(function (require) {
 
     $scope.updateTime = function () {
       $scope.timeRange = {
-        from: datemath.parse(timefilter.time.from),
-        to: datemath.parse(timefilter.time.to, true)
+        from: dateMath.parse(timefilter.time.from),
+        to: dateMath.parse(timefilter.time.to, true)
       };
     };
 
diff --git a/src/plugins/kibana/public/discover/directives/timechart.js b/src/plugins/kibana/public/discover/directives/timechart.js
new file mode 100644
index 0000000000000..7450ce2b3686a
--- /dev/null
+++ b/src/plugins/kibana/public/discover/directives/timechart.js
@@ -0,0 +1,32 @@
+require('ui/modules')
+.get('apps/discover')
+.directive('discoverTimechart', function (Private, $compile) {
+  var _ = require('lodash');
+  var $ = require('jquery');
+  var vislib = Private(require('ui/vislib'));
+
+  return {
+    restrict: 'E',
+    scope : {
+      data: '='
+    },
+    link: function ($scope, elem) {
+
+      var init = function () {
+        // This elem should already have a height/width
+        var myChart = new vislib.Chart(elem[0], {
+
+        });
+
+        $scope.$watch('data', function (data) {
+          if (data != null) {
+            myChart.render(data);
+          }
+        });
+      };
+
+      // Start the directive
+      init();
+    }
+  };
+});
diff --git a/src/kibana/plugins/discover/index.html b/src/plugins/kibana/public/discover/index.html
similarity index 100%
rename from src/kibana/plugins/discover/index.html
rename to src/plugins/kibana/public/discover/index.html
diff --git a/src/plugins/kibana/public/discover/index.js b/src/plugins/kibana/public/discover/index.js
new file mode 100644
index 0000000000000..603fdc7bb6b91
--- /dev/null
+++ b/src/plugins/kibana/public/discover/index.js
@@ -0,0 +1,8 @@
+define(function (require, module, exports) {
+  require('plugins/kibana/discover/saved_searches/saved_searches');
+  require('plugins/kibana/discover/directives/timechart');
+  require('ui/collapsible_sidebar');
+  require('plugins/kibana/discover/components/field_chooser/field_chooser');
+  require('plugins/kibana/discover/controllers/discover');
+  require('plugins/kibana/discover/styles/main.less');
+});
diff --git a/src/kibana/plugins/discover/partials/load_search.html b/src/plugins/kibana/public/discover/partials/load_search.html
similarity index 100%
rename from src/kibana/plugins/discover/partials/load_search.html
rename to src/plugins/kibana/public/discover/partials/load_search.html
diff --git a/src/kibana/plugins/discover/partials/save_search.html b/src/plugins/kibana/public/discover/partials/save_search.html
similarity index 100%
rename from src/kibana/plugins/discover/partials/save_search.html
rename to src/plugins/kibana/public/discover/partials/save_search.html
diff --git a/src/kibana/plugins/discover/saved_searches/_saved_search.js b/src/plugins/kibana/public/discover/saved_searches/_saved_search.js
similarity index 89%
rename from src/kibana/plugins/discover/saved_searches/_saved_search.js
rename to src/plugins/kibana/public/discover/saved_searches/_saved_search.js
index 0ce7c94441ae6..0f678b49770cb 100644
--- a/src/kibana/plugins/discover/saved_searches/_saved_search.js
+++ b/src/plugins/kibana/public/discover/saved_searches/_saved_search.js
@@ -1,9 +1,9 @@
 define(function (require) {
   var _ = require('lodash');
 
-  require('components/notify/notify');
+  require('ui/notify');
 
-  var module = require('modules').get('discover/saved_searches', [
+  var module = require('ui/modules').get('discover/saved_searches', [
     'kibana/notify',
     'kibana/courier'
   ]);
diff --git a/src/kibana/plugins/discover/saved_searches/saved_searches.js b/src/plugins/kibana/public/discover/saved_searches/saved_searches.js
similarity index 80%
rename from src/kibana/plugins/discover/saved_searches/saved_searches.js
rename to src/plugins/kibana/public/discover/saved_searches/saved_searches.js
index de55db9cb3fce..782480bc5c9fd 100644
--- a/src/kibana/plugins/discover/saved_searches/saved_searches.js
+++ b/src/plugins/kibana/public/discover/saved_searches/saved_searches.js
@@ -1,21 +1,21 @@
 define(function (require) {
   var _ = require('lodash');
 
-  require('plugins/discover/saved_searches/_saved_search');
-  require('components/notify/notify');
+  require('plugins/kibana/discover/saved_searches/_saved_search');
+  require('ui/notify');
 
-  var module = require('modules').get('discover/saved_searches', [
+  var module = require('ui/modules').get('discover/saved_searches', [
     'kibana/notify'
   ]);
 
   // Register this service with the saved object registry so it can be
   // edited by the object editor.
-  require('plugins/settings/saved_object_registry').register({
+  require('plugins/kibana/settings/saved_object_registry').register({
     service: 'savedSearches',
     title: 'searches'
   });
 
-  module.service('savedSearches', function (Promise, config, configFile, es, createNotifier, SavedSearch, kbnUrl) {
+  module.service('savedSearches', function (Promise, config, kbnIndex, es, createNotifier, SavedSearch, kbnUrl) {
 
 
     var notify = createNotifier({
@@ -58,7 +58,7 @@ define(function (require) {
       }
 
       return es.search({
-        index: configFile.kibana_index,
+        index: kbnIndex,
         type: 'search',
         body: body,
         size: 100
diff --git a/src/plugins/kibana/public/discover/styles/main.less b/src/plugins/kibana/public/discover/styles/main.less
new file mode 100644
index 0000000000000..75aa3dcb916ae
--- /dev/null
+++ b/src/plugins/kibana/public/discover/styles/main.less
@@ -0,0 +1,265 @@
+@import (reference) "~ui/styles/variables";
+
+.tab-discover {
+  overflow-x: hidden;
+}
+
+.discover {
+
+  &-wrapper {
+    padding-right: 0px !important;
+  }
+
+  &-content {
+    padding-right: @padding-base-horizontal;
+    clear: both;
+  }
+
+  &-timechart {
+    display: block;
+    position: relative;
+
+    header {
+      min-height: @input-height-base + 8px;
+      padding: 4px 0;
+    }
+
+    visualize {
+      height: 200px;
+      max-height: 600px;
+
+      &.only-spy {
+        height: auto;
+
+        .visualize-table {
+          height: auto;
+        }
+      }
+    }
+
+    .chartwrapper {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+    }
+
+    .vis-overlay {
+      display: flex;
+      align-items: center;
+    }
+  }
+
+  &-overlay {
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    z-index: 20;
+
+    opacity: 0.75;
+    text-align: center;
+    background-color: #ffffff;
+
+    // spinner and prorgess counter
+    > div {
+      text-align: center;
+    }
+  }
+
+  &-info {
+    background-color: @well-bg;
+    float: right;
+    padding: 5px 10px;
+    border-bottom-left-radius: @border-radius-base;
+
+    text-align: right;
+
+    &-title {
+      font-weight: bold;
+      margin-right: 10px;
+    }
+  }
+
+  &-table {
+    overflow-y: auto;
+    overflow-x: auto;
+    padding-left: 0px !important;
+    padding-right: 0px !important;
+
+    tbody {
+      font-family: "Lucida Console", Monaco, monospace;
+    }
+
+    &-footer {
+      background-color: @well-bg;
+      padding: 5px 10px;
+    }
+
+    &-details-toggle {
+      margin-bottom: 3px;
+    }
+
+    &-timefield {
+      white-space: nowrap;
+    }
+
+    &-open-icon {
+      // when switching between open and closed, the toggle changes size
+      // slightly which is a problem because it forces the entire table to
+      // re-render which is SLOW
+      width: 7px;
+    }
+  }
+
+  &-field {
+    &-filter {
+      background-color: @well-bg;
+      margin-right: 10px;
+
+      .form-group {
+        margin-bottom: 0px;
+      }
+
+    }
+
+    &-toggle {
+      color: @btn-success-color;
+      font-size: 9px;
+    }
+  }
+}
+
+.shard-failures {
+  color: @brand-danger;
+  background-color: lighten(@brand-danger, 40%) !important;
+  border: 1px solid @brand-danger;
+  border-radius: @border-radius-base;
+  padding: 0 20px 20px;
+  li {
+    padding-bottom: 5px;
+  }
+}
+
+.sidebar-item button.discover-field-toggle {
+  display: none;
+  font-size: 9px;
+  position: absolute;
+  right: 0;
+  top: 0;
+  margin: 5px 10px;
+}
+
+.sidebar-item:hover:hover button.discover-field-toggle {
+  display: block;
+}
+
+.discover-field-details {
+  border-top: 1px solid @well-border;
+  padding: 5px 10px;
+  background-color: @body-bg;
+  color: @text-color;
+
+  &-close {
+    text-align: center;
+    border-top: 1px solid @well-border;
+    background-color: @well-bg;
+
+    &:hover {
+      background-color: @sidebar-hover-bg;
+      color: @sidebar-hover-color;
+    }
+  }
+
+  &-count {
+    white-space: nowrap;
+  }
+
+  &-error {
+    margin-top: 5px;
+  }
+
+  &-item {
+    margin-top: 5px;
+  }
+
+  &-filter {
+    cursor: pointer;
+  }
+
+  a {
+    color: @link-color !important;
+  }
+
+  a.btn {
+    color: @text-color !important;
+  }
+
+  .progress {
+    margin-bottom: 0px;
+
+    .progress-bar {
+      padding-left: 10px;
+      text-align: right;
+      line-height: 18px;
+      max-width: 100%;
+      border-radius: 4px;
+
+      span {
+        background-color: @gray;
+        padding: 3px;
+        border-radius: 4px;
+        margin-left: 3px;
+        margin-right: 3px;
+      }
+    }
+  }
+}
+
+field-name,
+[field-name] {
+  > i {
+    margin-right: 5px;
+    text-align: center;
+    display: inline-block;
+    width: 12px;
+    color: @text-muted;
+  }
+
+  &.no-results {
+    color: @text-muted;
+  }
+}
+
+disc-field-chooser {
+  ul.discover-selected-fields {
+    /* If only _source is presend in the selected fields list, hide its toggle button */
+    li:first-child:nth-last-child(1)[field=_source] button.discover-field-toggle {
+      display: none;
+    }
+  }
+
+  .sidebar-item-title {
+    position: relative;
+  }
+}
+
+.results {
+  h3 {
+    margin: -20px 0 10px 0;
+    text-align: center;
+  }
+
+  &-interval {
+    a {
+      text-decoration: underline;
+    }
+
+    select {
+      display: inline-block;
+      width: auto;
+    }
+  }
+}
diff --git a/src/plugins/kibana/public/doc/__tests__/doc.js b/src/plugins/kibana/public/doc/__tests__/doc.js
new file mode 100644
index 0000000000000..543b227f59571
--- /dev/null
+++ b/src/plugins/kibana/public/doc/__tests__/doc.js
@@ -0,0 +1,126 @@
+// Load the kibana app dependencies.
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+require('plugins/kibana/doc/index');
+
+var $scope, createController, timefilter;
+
+var init = function (index, type, id) {
+
+  ngMock.module('kibana');
+
+  // Stub services
+  ngMock.module(function ($provide) {
+    $provide.service('$route', function (Private) {
+      this.current = {
+        locals: {
+          indexPattern: Private(require('fixtures/stubbed_logstash_index_pattern'))
+        },
+        params: {
+          index: index || 'myIndex',
+          type: type || 'myType',
+          id: id || 'myId'
+        }
+      };
+    });
+
+    $provide.service('es', function (Private, $q) {
+      this.search = function (config) {
+        var deferred = $q.defer();
+
+        switch (config.index) {
+          case 'goodSearch':
+            deferred.resolve({
+              hits: {
+                total: 1,
+                hits: [{
+                  _source: {
+                    foo: true
+                  }
+                }]
+              }
+            });
+            break;
+          case 'badSearch':
+            deferred.resolve({
+              hits: {
+                total: 0,
+                hits: []
+              }
+            });
+            break;
+          case 'missingIndex':
+            deferred.reject({status: 404});
+            break;
+          case 'badRequest':
+            deferred.reject({status: 500});
+            break;
+        }
+
+        return deferred.promise;
+      };
+    });
+  });
+
+  // Create the scope
+  ngMock.inject(function ($rootScope, $controller, _timefilter_) {
+    $scope = $rootScope.$new();
+    timefilter = _timefilter_;
+
+    createController = function () {
+      return $controller('doc', {
+        '$scope': $scope
+      });
+    };
+  });
+
+  createController();
+};
+
+
+describe('Doc app controller', function () {
+
+  it('should set status=found if the document was found', function (done) {
+    init('goodSearch');
+    $scope.$digest();
+    expect($scope.status).to.be('found');
+    done();
+  });
+
+  it('should attach the hit to scope', function (done) {
+    init('goodSearch');
+    $scope.$digest();
+    expect($scope.hit).to.be.an(Object);
+    expect($scope.hit._source).to.be.an(Object);
+    done();
+  });
+
+  it('should set status=notFound if the document was missing', function (done) {
+    init('badSearch');
+    $scope.$digest();
+    expect($scope.status).to.be('notFound');
+    done();
+  });
+
+  it('should set status=notFound if the request returns a 404', function (done) {
+    init('missingIndex');
+    $scope.$digest();
+    expect($scope.status).to.be('notFound');
+    done();
+  });
+
+  it('should set status=error if the request fails with any other code', function (done) {
+    init('badRequest');
+    $scope.$digest();
+    expect($scope.status).to.be('error');
+    done();
+  });
+
+  it('should disable the time filter', function (done) {
+    init();
+    expect(timefilter.enabled).to.be(false);
+    done();
+  });
+
+
+});
diff --git a/src/plugins/kibana/public/doc/controllers/doc.js b/src/plugins/kibana/public/doc/controllers/doc.js
new file mode 100644
index 0000000000000..fa109900833e5
--- /dev/null
+++ b/src/plugins/kibana/public/doc/controllers/doc.js
@@ -0,0 +1,75 @@
+define(function (require) {
+  var _ = require('lodash');
+  var angular = require('angular');
+
+  require('ui/notify');
+  require('ui/courier');
+  require('ui/doc_viewer');
+  require('ui/index_patterns');
+
+  var app = require('ui/modules').get('apps/doc', [
+    'kibana/notify',
+    'kibana/courier',
+    'kibana/index_patterns'
+  ]);
+
+  var html = require('plugins/kibana/doc/index.html');
+
+  var resolveIndexPattern = {
+    indexPattern: function (courier, savedSearches, $route) {
+      return courier.indexPatterns.get($route.current.params.indexPattern);
+    }
+  };
+
+  require('ui/routes')
+  .when('/doc/:indexPattern/:index/:type/:id', {
+    template: html,
+    resolve: resolveIndexPattern
+  })
+  .when('/doc/:indexPattern/:index/:type', {
+    template: html,
+    resolve: resolveIndexPattern
+  });
+
+  app.controller('doc', function ($scope, $route, es, timefilter) {
+
+    timefilter.enabled = false;
+
+    // Pretty much only need this for formatting, not actually using it for fetching anything.
+    $scope.indexPattern = $route.current.locals.indexPattern;
+
+    var computedFields = $scope.indexPattern.getComputedFields();
+
+    es.search({
+      index: $route.current.params.index,
+      body: {
+        query: {
+          ids: {
+            type: $route.current.params.type,
+            values: [$route.current.params.id]
+          }
+        },
+        fields: computedFields.fields,
+        script_fields: computedFields.scriptFields,
+        fielddata_fields: computedFields.fielddataFields
+      }
+    }).then(function (resp) {
+      if (resp.hits) {
+        if (resp.hits.total < 1) {
+          $scope.status = 'notFound';
+        } else {
+          $scope.status = 'found';
+          $scope.hit = resp.hits.hits[0];
+        }
+      }
+    }).catch(function (err) {
+      if (err.status === 404) {
+        $scope.status = 'notFound';
+      } else {
+        $scope.status = 'error';
+        $scope.resp = err;
+      }
+    });
+
+  });
+});
diff --git a/src/kibana/plugins/doc/index.html b/src/plugins/kibana/public/doc/index.html
similarity index 100%
rename from src/kibana/plugins/doc/index.html
rename to src/plugins/kibana/public/doc/index.html
diff --git a/src/plugins/kibana/public/doc/index.js b/src/plugins/kibana/public/doc/index.js
new file mode 100644
index 0000000000000..23d3c2ee40fb6
--- /dev/null
+++ b/src/plugins/kibana/public/doc/index.js
@@ -0,0 +1,3 @@
+define(function (require, module, exports) {
+  require('plugins/kibana/doc/controllers/doc');
+});
diff --git a/src/plugins/kibana/public/kibana.js b/src/plugins/kibana/public/kibana.js
new file mode 100644
index 0000000000000..668b8f5380ccf
--- /dev/null
+++ b/src/plugins/kibana/public/kibana.js
@@ -0,0 +1,48 @@
+require('plugins/kibana/discover/index');
+require('plugins/kibana/visualize/index');
+require('plugins/kibana/dashboard/index');
+require('plugins/kibana/settings/index');
+require('plugins/kibana/doc/index');
+
+var kibanaLogoUrl = require('ui/images/kibana.png');
+
+require('ui/routes')
+.otherwise({
+  redirectTo: '/discover'
+});
+
+require('ui/chrome')
+.setLogo('url(' + kibanaLogoUrl + ') left no-repeat', true)
+.setNavBackground('#222222')
+.setTabDefaults({
+  resetWhenActive: true,
+  trackLastPath: true,
+  activeIndicatorColor: '#656a76'
+})
+.setTabs([
+  {
+    id: 'discover',
+    title: 'Discover'
+  },
+  {
+    id: 'visualize',
+    title: 'Visualize',
+    activeIndicatorColor: function () {
+      return (String(this.lastUrl).indexOf('/visualize/step/') === 0) ? 'white' : '#656a76';
+    }
+  },
+  {
+    id: 'dashboard',
+    title: 'Dashboard'
+  },
+  {
+    id: 'settings',
+    title: 'Settings'
+  }
+])
+.setRootController('kibana', function ($scope, courier) {
+  // wait for the application to finish loading
+  $scope.$on('application.load', function () {
+    courier.start();
+  });
+});
diff --git a/src/plugins/kibana/public/settings/__tests__/get_val_type.js b/src/plugins/kibana/public/settings/__tests__/get_val_type.js
new file mode 100644
index 0000000000000..2bfde39a829c5
--- /dev/null
+++ b/src/plugins/kibana/public/settings/__tests__/get_val_type.js
@@ -0,0 +1,37 @@
+
+var getValType = require('plugins/kibana/settings/sections/advanced/lib/get_val_type');
+var expect = require('expect.js');
+
+describe('Settings', function () {
+  describe('Advanced', function () {
+    describe('getValType(def, val)', function () {
+      it('should be a function', function () {
+        expect(getValType).to.be.a(Function);
+      });
+
+      it('should return the explicitly defined type of a setting', function () {
+        expect(getValType({type: 'string'})).to.be('string');
+        expect(getValType({type: 'json'})).to.be('json');
+        expect(getValType({type: 'string', value: 5})).to.be('string');
+      });
+
+      it('should return array if the value is an Array and there is no defined type', function () {
+        expect(getValType({type: 'string'}, [1, 2, 3])).to.be('string');
+        expect(getValType({type: 'json', value: [1, 2, 3]})).to.be('json');
+
+        expect(getValType({value: 'someString'}, [1, 2, 3])).to.be('array');
+        expect(getValType({value: [1, 2, 3]}, 'someString')).to.be('array');
+
+      });
+
+      it('should return the type of the default value if there is no type and it is not an array', function () {
+        expect(getValType({value: 'someString'})).to.be('string');
+        expect(getValType({value: 'someString'}, 42)).to.be('string');
+      });
+
+      it('should return the type of the value if the default value is null', function () {
+        expect(getValType({value: null}, 'someString')).to.be('string');
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/kibana/plugins/settings/app.html b/src/plugins/kibana/public/settings/app.html
similarity index 100%
rename from src/kibana/plugins/settings/app.html
rename to src/plugins/kibana/public/settings/app.html
diff --git a/src/plugins/kibana/public/settings/index.js b/src/plugins/kibana/public/settings/index.js
new file mode 100644
index 0000000000000..0144dac6d0e4d
--- /dev/null
+++ b/src/plugins/kibana/public/settings/index.js
@@ -0,0 +1,35 @@
+define(function (require, module, exports) {
+  var _ = require('lodash');
+
+  require('plugins/kibana/settings/styles/main.less');
+  require('ui/filters/start_from');
+
+  require('ui/routes')
+  .when('/settings', {
+    redirectTo: '/settings/indices'
+  });
+
+  var sections = require('plugins/kibana/settings/sections/index');
+
+  require('ui/modules')
+  .get('apps/settings')
+  .directive('kbnSettingsApp', function (Private, $route, timefilter) {
+    return {
+      restrict: 'E',
+      template: require('plugins/kibana/settings/app.html'),
+      transclude: true,
+      scope: {
+        sectionName: '@section'
+      },
+      link: function ($scope, $el) {
+        timefilter.enabled = false;
+        $scope.sections = sections;
+        $scope.section = _.find($scope.sections, { name: $scope.sectionName });
+
+        $scope.sections.forEach(function (section) {
+          section.class = (section === $scope.section) ? 'active' : void 0;
+        });
+      }
+    };
+  });
+});
diff --git a/src/kibana/plugins/settings/saved_object_registry.js b/src/plugins/kibana/public/settings/saved_object_registry.js
similarity index 100%
rename from src/kibana/plugins/settings/saved_object_registry.js
rename to src/plugins/kibana/public/settings/saved_object_registry.js
diff --git a/src/kibana/plugins/settings/sections/about/barcode.svg b/src/plugins/kibana/public/settings/sections/about/barcode.svg
similarity index 100%
rename from src/kibana/plugins/settings/sections/about/barcode.svg
rename to src/plugins/kibana/public/settings/sections/about/barcode.svg
diff --git a/src/plugins/kibana/public/settings/sections/about/index.html b/src/plugins/kibana/public/settings/sections/about/index.html
new file mode 100644
index 0000000000000..d90e9ee6f204f
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/about/index.html
@@ -0,0 +1,30 @@
+<kbn-settings-app section="about">
+  <div class="kbn-settings-about container" ng-controller="settingsAbout">
+    <div class="col-md-4 col-md-offset-4 jumbotron">
+      <center>
+        <img src='/plugins/kibana/settings/sections/about/barcode.svg' alt="Kibana Barcode Logo" width="128" height="128"><br>
+        <h1>Kibana</h1>
+        <p>
+          <table class="table table-condensed kbn-settings-about-versions">
+            <tr>
+              <td>Version</td>
+              <td>{{kbnVersion}}</td>
+            </tr>
+
+            <tr>
+              <td>Build</td>
+              <td>{{buildNum}}</td>
+            </tr>
+
+            <tr>
+              <td>Commit SHA</td>
+              <td>{{commitSha | limitTo:7}}</td>
+            </tr>
+
+          </table>
+        </p>
+        <small>© 2015 All Rights Reserved - Elasticsearch</small>
+      </center>
+    </div>
+  </div>
+</kbn-settings-app>
diff --git a/src/plugins/kibana/public/settings/sections/about/index.js b/src/plugins/kibana/public/settings/sections/about/index.js
new file mode 100644
index 0000000000000..77740f535ec14
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/about/index.js
@@ -0,0 +1,22 @@
+define(function (require) {
+  var _ = require('lodash');
+
+  require('ui/routes')
+  .when('/settings/about', {
+    template: require('plugins/kibana/settings/sections/about/index.html')
+  });
+
+  require('ui/modules').get('apps/settings')
+  .controller('settingsAbout', function ($scope, kbnVersion, buildNum, commitSha) {
+    $scope.kbnVersion = kbnVersion;
+    $scope.buildNum = buildNum;
+    $scope.commitSha = commitSha;
+  });
+
+  return {
+    order: Infinity,
+    name: 'about',
+    display: 'About',
+    url: '#/settings/about'
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/plugins/settings/sections/advanced/advanced_row.html b/src/plugins/kibana/public/settings/sections/advanced/advanced_row.html
similarity index 100%
rename from src/kibana/plugins/settings/sections/advanced/advanced_row.html
rename to src/plugins/kibana/public/settings/sections/advanced/advanced_row.html
diff --git a/src/kibana/plugins/settings/sections/advanced/advanced_row.js b/src/plugins/kibana/public/settings/sections/advanced/advanced_row.js
similarity index 87%
rename from src/kibana/plugins/settings/sections/advanced/advanced_row.js
rename to src/plugins/kibana/public/settings/sections/advanced/advanced_row.js
index bd94ed889866f..7371827e073fb 100644
--- a/src/kibana/plugins/settings/sections/advanced/advanced_row.js
+++ b/src/plugins/kibana/public/settings/sections/advanced/advanced_row.js
@@ -1,19 +1,19 @@
 define(function (require) {
   var _ = require('lodash');
-  require('components/elastic_textarea');
+  require('ui/elastic_textarea');
 
-  require('modules').get('apps/settings')
+  require('ui/modules').get('apps/settings')
   .directive('advancedRow', function (config, Notifier, Private) {
     return {
       restrict: 'A',
       replace: true,
-      template: require('text!plugins/settings/sections/advanced/advanced_row.html'),
+      template: require('plugins/kibana/settings/sections/advanced/advanced_row.html'),
       scope: {
         conf: '=advancedRow',
         configs: '='
       },
       link: function ($scope) {
-        var configDefaults = Private(require('components/config/defaults'));
+        var configDefaults = Private(require('ui/config/defaults'));
         var notify = new Notifier();
         var keyCodes = {
           ESC: 27
diff --git a/src/kibana/plugins/settings/sections/advanced/index.html b/src/plugins/kibana/public/settings/sections/advanced/index.html
similarity index 100%
rename from src/kibana/plugins/settings/sections/advanced/index.html
rename to src/plugins/kibana/public/settings/sections/advanced/index.html
diff --git a/src/plugins/kibana/public/settings/sections/advanced/index.js b/src/plugins/kibana/public/settings/sections/advanced/index.js
new file mode 100644
index 0000000000000..40e1c7fa7981e
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/advanced/index.js
@@ -0,0 +1,73 @@
+define(function (require) {
+  var _ = require('lodash');
+  var getValType = require('plugins/kibana/settings/sections/advanced/lib/get_val_type');
+
+
+  require('plugins/kibana/settings/sections/advanced/advanced_row');
+
+  require('ui/routes')
+  .when('/settings/advanced', {
+    template: require('plugins/kibana/settings/sections/advanced/index.html')
+  });
+
+  require('ui/modules').get('apps/settings')
+  .directive('kbnSettingsAdvanced', function (config, Notifier, Private, $rootScope) {
+    return {
+      restrict: 'E',
+      link: function ($scope) {
+        var configDefaults = Private(require('ui/config/defaults'));
+        var keyCodes = {
+          ESC: 27
+        };
+
+        var NAMED_EDITORS = ['json', 'array', 'boolean', 'select'];
+        var NORMAL_EDITOR = ['number', 'string', 'null', 'undefined'];
+
+        function getEditorType(conf) {
+          if (_.contains(NAMED_EDITORS, conf.type)) return conf.type;
+          if (_.contains(NORMAL_EDITOR, conf.type)) return 'normal';
+        }
+
+        function isTypeComplex(conf) {
+          return !(conf.json || conf.array || conf.bool || conf.normal);
+        }
+
+        function readConfigVals() {
+          var configVals = config._vals();
+
+          $scope.configs = _.map(configDefaults, function (def, name) {
+            var val = configVals[name];
+            var conf = {
+              name: name,
+              defVal: def.value,
+              type: getValType(def, val),
+              description: def.description,
+              options: def.options,
+              value: val,
+            };
+
+            var editor = getEditorType(conf);
+            conf.json = editor === 'json';
+            conf.select = editor === 'select';
+            conf.bool = editor === 'boolean';
+            conf.array = editor === 'array';
+            conf.normal = editor === 'normal';
+            conf.tooComplex = !editor;
+
+            return conf;
+          });
+        }
+
+        readConfigVals();
+        $rootScope.$on('change:config', readConfigVals);
+      }
+    };
+  });
+
+  return {
+    order: 2,
+    name: 'advanced',
+    display: 'Advanced',
+    url: '#/settings/advanced'
+  };
+});
diff --git a/src/kibana/plugins/settings/sections/advanced/lib/get_val_type.js b/src/plugins/kibana/public/settings/sections/advanced/lib/get_val_type.js
similarity index 100%
rename from src/kibana/plugins/settings/sections/advanced/lib/get_val_type.js
rename to src/plugins/kibana/public/settings/sections/advanced/lib/get_val_type.js
diff --git a/src/plugins/kibana/public/settings/sections/index.js b/src/plugins/kibana/public/settings/sections/index.js
new file mode 100644
index 0000000000000..5268b0696758b
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/index.js
@@ -0,0 +1,10 @@
+define(function (require) {
+  // each of these private modules returns an object defining that section, their properties
+  // are used to create the nav bar
+  return [
+    require('plugins/kibana/settings/sections/indices/index'),
+    require('plugins/kibana/settings/sections/advanced/index'),
+    require('plugins/kibana/settings/sections/objects/index'),
+    require('plugins/kibana/settings/sections/about/index')
+  ];
+});
\ No newline at end of file
diff --git a/src/kibana/plugins/settings/sections/indices/_create.html b/src/plugins/kibana/public/settings/sections/indices/_create.html
similarity index 100%
rename from src/kibana/plugins/settings/sections/indices/_create.html
rename to src/plugins/kibana/public/settings/sections/indices/_create.html
diff --git a/src/kibana/plugins/settings/sections/indices/_create.js b/src/plugins/kibana/public/settings/sections/indices/_create.js
similarity index 95%
rename from src/kibana/plugins/settings/sections/indices/_create.js
rename to src/plugins/kibana/public/settings/sections/indices/_create.js
index adfac91aa1b2f..b649bd3b35a8f 100644
--- a/src/kibana/plugins/settings/sections/indices/_create.js
+++ b/src/plugins/kibana/public/settings/sections/indices/_create.js
@@ -1,21 +1,21 @@
 define(function (require) {
   var _ = require('lodash');
   var moment = require('moment');
-  var errors = require('errors');
+  var errors = require('ui/errors');
 
-  require('directives/validate_index_name');
-  require('directives/auto_select_if_only_one');
+  require('ui/directives/validate_index_name');
+  require('ui/directives/auto_select_if_only_one');
 
-  require('routes')
+  require('ui/routes')
   .when('/settings/indices/', {
-    template: require('text!plugins/settings/sections/indices/_create.html')
+    template: require('plugins/kibana/settings/sections/indices/_create.html')
   });
 
-  require('modules').get('apps/settings')
+  require('ui/modules').get('apps/settings')
   .controller('settingsIndicesCreate', function ($scope, kbnUrl, Private, Notifier, indexPatterns, es, config, Promise) {
     var notify = new Notifier();
     var MissingIndices = errors.IndexPatternMissingIndices;
-    var refreshKibanaIndex = Private(require('plugins/settings/sections/indices/_refresh_kibana_index'));
+    var refreshKibanaIndex = Private(require('plugins/kibana/settings/sections/indices/_refresh_kibana_index'));
     var intervals = indexPatterns.intervals;
     var samplePromise;
 
diff --git a/src/kibana/plugins/settings/sections/indices/_date_scripts.js b/src/plugins/kibana/public/settings/sections/indices/_date_scripts.js
similarity index 100%
rename from src/kibana/plugins/settings/sections/indices/_date_scripts.js
rename to src/plugins/kibana/public/settings/sections/indices/_date_scripts.js
diff --git a/src/kibana/plugins/settings/sections/indices/_edit.html b/src/plugins/kibana/public/settings/sections/indices/_edit.html
similarity index 100%
rename from src/kibana/plugins/settings/sections/indices/_edit.html
rename to src/plugins/kibana/public/settings/sections/indices/_edit.html
diff --git a/src/kibana/plugins/settings/sections/indices/_edit.js b/src/plugins/kibana/public/settings/sections/indices/_edit.js
similarity index 78%
rename from src/kibana/plugins/settings/sections/indices/_edit.js
rename to src/plugins/kibana/public/settings/sections/indices/_edit.js
index 32d9ff63a8404..abd5ee43ea8a9 100644
--- a/src/kibana/plugins/settings/sections/indices/_edit.js
+++ b/src/plugins/kibana/public/settings/sections/indices/_edit.js
@@ -1,12 +1,12 @@
 define(function (require) {
   var _ = require('lodash');
-  require('plugins/settings/sections/indices/_indexed_fields');
-  require('plugins/settings/sections/indices/_scripted_fields');
-  require('plugins/settings/sections/indices/_index_header');
+  require('plugins/kibana/settings/sections/indices/_indexed_fields');
+  require('plugins/kibana/settings/sections/indices/_scripted_fields');
+  require('plugins/kibana/settings/sections/indices/_index_header');
 
-  require('routes')
+  require('ui/routes')
   .when('/settings/indices/:indexPatternId', {
-    template: require('text!plugins/settings/sections/indices/_edit.html'),
+    template: require('plugins/kibana/settings/sections/indices/_edit.html'),
     resolve: {
       indexPattern: function ($route, courier) {
         return courier.indexPatterns.get($route.current.params.indexPatternId)
@@ -15,19 +15,19 @@ define(function (require) {
     }
   });
 
-  require('modules').get('apps/settings')
+  require('ui/modules').get('apps/settings')
   .controller('settingsIndicesEdit', function ($scope, $location, $route, config, courier, Notifier, Private, AppState, docTitle) {
 
     var notify = new Notifier();
     var $state = $scope.state = new AppState();
-    var refreshKibanaIndex = Private(require('plugins/settings/sections/indices/_refresh_kibana_index'));
+    var refreshKibanaIndex = Private(require('plugins/kibana/settings/sections/indices/_refresh_kibana_index'));
 
-    $scope.kbnUrl = Private(require('components/url/url'));
+    $scope.kbnUrl = Private(require('ui/url'));
     $scope.indexPattern = $route.current.locals.indexPattern;
     docTitle.change($scope.indexPattern.id);
     var otherIds = _.without($route.current.locals.indexPatternIds, $scope.indexPattern.id);
 
-    var fieldTypes = Private(require('plugins/settings/sections/indices/_field_types'));
+    var fieldTypes = Private(require('plugins/kibana/settings/sections/indices/_field_types'));
     $scope.$watch('indexPattern.fields', function () {
       $scope.fieldTypes = fieldTypes($scope.indexPattern);
     });
diff --git a/src/kibana/plugins/settings/sections/indices/_field_controls.html b/src/plugins/kibana/public/settings/sections/indices/_field_controls.html
similarity index 100%
rename from src/kibana/plugins/settings/sections/indices/_field_controls.html
rename to src/plugins/kibana/public/settings/sections/indices/_field_controls.html
diff --git a/src/kibana/plugins/settings/sections/indices/_field_editor.html b/src/plugins/kibana/public/settings/sections/indices/_field_editor.html
similarity index 100%
rename from src/kibana/plugins/settings/sections/indices/_field_editor.html
rename to src/plugins/kibana/public/settings/sections/indices/_field_editor.html
diff --git a/src/kibana/plugins/settings/sections/indices/_field_editor.js b/src/plugins/kibana/public/settings/sections/indices/_field_editor.js
similarity index 82%
rename from src/kibana/plugins/settings/sections/indices/_field_editor.js
rename to src/plugins/kibana/public/settings/sections/indices/_field_editor.js
index c993e413f7bac..a93db7f716542 100644
--- a/src/kibana/plugins/settings/sections/indices/_field_editor.js
+++ b/src/plugins/kibana/public/settings/sections/indices/_field_editor.js
@@ -1,12 +1,12 @@
 define(function (require) {
-  require('components/field_editor/field_editor');
-  require('plugins/settings/sections/indices/_index_header');
+  require('ui/field_editor');
+  require('plugins/kibana/settings/sections/indices/_index_header');
 
-  require('routes')
+  require('ui/routes')
   .when('/settings/indices/:indexPatternId/field/:fieldName', { mode: 'edit' })
   .when('/settings/indices/:indexPatternId/create-field/', { mode: 'create' })
   .defaults(/settings\/indices\/[^\/]+\/(field|create-field)(\/|$)/, {
-    template: require('text!plugins/settings/sections/indices/_field_editor.html'),
+    template: require('plugins/kibana/settings/sections/indices/_field_editor.html'),
     resolve: {
       indexPattern: function ($route, courier) {
         return courier.indexPatterns.get($route.current.params.indexPatternId)
@@ -15,9 +15,9 @@ define(function (require) {
     },
     controllerAs: 'fieldSettings',
     controller: function FieldEditorPageController($route, Private, Notifier, docTitle) {
-      var Field = Private(require('components/index_patterns/_field'));
+      var Field = Private(require('ui/index_patterns/_field'));
       var notify = new Notifier({ location: 'Field Editor' });
-      var kbnUrl = Private(require('components/url/url'));
+      var kbnUrl = Private(require('ui/url'));
 
 
       this.mode = $route.current.mode;
diff --git a/src/kibana/plugins/settings/sections/indices/_field_name.html b/src/plugins/kibana/public/settings/sections/indices/_field_name.html
similarity index 100%
rename from src/kibana/plugins/settings/sections/indices/_field_name.html
rename to src/plugins/kibana/public/settings/sections/indices/_field_name.html
diff --git a/src/kibana/plugins/settings/sections/indices/_field_popularity.html b/src/plugins/kibana/public/settings/sections/indices/_field_popularity.html
similarity index 100%
rename from src/kibana/plugins/settings/sections/indices/_field_popularity.html
rename to src/plugins/kibana/public/settings/sections/indices/_field_popularity.html
diff --git a/src/kibana/plugins/settings/sections/indices/_field_type.html b/src/plugins/kibana/public/settings/sections/indices/_field_type.html
similarity index 100%
rename from src/kibana/plugins/settings/sections/indices/_field_type.html
rename to src/plugins/kibana/public/settings/sections/indices/_field_type.html
diff --git a/src/kibana/plugins/settings/sections/indices/_field_types.js b/src/plugins/kibana/public/settings/sections/indices/_field_types.js
similarity index 100%
rename from src/kibana/plugins/settings/sections/indices/_field_types.js
rename to src/plugins/kibana/public/settings/sections/indices/_field_types.js
diff --git a/src/kibana/plugins/settings/sections/indices/_index_header.html b/src/plugins/kibana/public/settings/sections/indices/_index_header.html
similarity index 100%
rename from src/kibana/plugins/settings/sections/indices/_index_header.html
rename to src/plugins/kibana/public/settings/sections/indices/_index_header.html
diff --git a/src/kibana/plugins/settings/sections/indices/_index_header.js b/src/plugins/kibana/public/settings/sections/indices/_index_header.js
similarity index 84%
rename from src/kibana/plugins/settings/sections/indices/_index_header.js
rename to src/plugins/kibana/public/settings/sections/indices/_index_header.js
index d932cd0a429b5..e079aae64a003 100644
--- a/src/kibana/plugins/settings/sections/indices/_index_header.js
+++ b/src/plugins/kibana/public/settings/sections/indices/_index_header.js
@@ -1,10 +1,10 @@
 define(function (require) {
-  require('modules')
+  require('ui/modules')
   .get('apps/settings')
   .directive('kbnSettingsIndexHeader', function (config) {
     return {
       restrict: 'E',
-      template: require('text!plugins/settings/sections/indices/_index_header.html'),
+      template: require('plugins/kibana/settings/sections/indices/_index_header.html'),
       scope: {
         indexPattern: '=',
         setDefault: '&',
diff --git a/src/kibana/plugins/settings/sections/indices/_indexed_fields.html b/src/plugins/kibana/public/settings/sections/indices/_indexed_fields.html
similarity index 100%
rename from src/kibana/plugins/settings/sections/indices/_indexed_fields.html
rename to src/plugins/kibana/public/settings/sections/indices/_indexed_fields.html
diff --git a/src/kibana/plugins/settings/sections/indices/_indexed_fields.js b/src/plugins/kibana/public/settings/sections/indices/_indexed_fields.js
similarity index 82%
rename from src/kibana/plugins/settings/sections/indices/_indexed_fields.js
rename to src/plugins/kibana/public/settings/sections/indices/_indexed_fields.js
index 8f9706b6f2a66..cebb4f10e6009 100644
--- a/src/kibana/plugins/settings/sections/indices/_indexed_fields.js
+++ b/src/plugins/kibana/public/settings/sections/indices/_indexed_fields.js
@@ -1,19 +1,19 @@
 define(function (require) {
   var _ = require('lodash');
-  require('components/paginated_table/paginated_table');
+  require('ui/paginated_table');
 
-  require('modules').get('apps/settings')
+  require('ui/modules').get('apps/settings')
   .directive('indexedFields', function ($filter) {
     var yesTemplate = '<i class="fa fa-check" aria-label="yes"></i>';
     var noTemplate = '';
-    var nameHtml = require('text!plugins/settings/sections/indices/_field_name.html');
-    var typeHtml = require('text!plugins/settings/sections/indices/_field_type.html');
-    var controlsHtml = require('text!plugins/settings/sections/indices/_field_controls.html');
+    var nameHtml = require('plugins/kibana/settings/sections/indices/_field_name.html');
+    var typeHtml = require('plugins/kibana/settings/sections/indices/_field_type.html');
+    var controlsHtml = require('plugins/kibana/settings/sections/indices/_field_controls.html');
     var filter = $filter('filter');
 
     return {
       restrict: 'E',
-      template: require('text!plugins/settings/sections/indices/_indexed_fields.html'),
+      template: require('plugins/kibana/settings/sections/indices/_indexed_fields.html'),
       scope: true,
       link: function ($scope) {
         var rowScopes = []; // track row scopes, so they can be destroyed as needed
diff --git a/src/plugins/kibana/public/settings/sections/indices/_refresh_kibana_index.js b/src/plugins/kibana/public/settings/sections/indices/_refresh_kibana_index.js
new file mode 100644
index 0000000000000..190cc961815d2
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/indices/_refresh_kibana_index.js
@@ -0,0 +1,9 @@
+define(function (require) {
+  return function RefreshKibanaIndexFn(es, kbnIndex) {
+    return function () {
+      return es.indices.refresh({
+        index: kbnIndex
+      });
+    };
+  };
+});
diff --git a/src/kibana/plugins/settings/sections/indices/_scripted_fields.html b/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.html
similarity index 100%
rename from src/kibana/plugins/settings/sections/indices/_scripted_fields.html
rename to src/plugins/kibana/public/settings/sections/indices/_scripted_fields.html
diff --git a/src/kibana/plugins/settings/sections/indices/_scripted_fields.js b/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js
similarity index 85%
rename from src/kibana/plugins/settings/sections/indices/_scripted_fields.js
rename to src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js
index 93ecfc5980b4b..7c9ecf1b4b7f5 100644
--- a/src/kibana/plugins/settings/sections/indices/_scripted_fields.js
+++ b/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js
@@ -1,22 +1,22 @@
 define(function (require) {
   var _ = require('lodash');
-  require('components/paginated_table/paginated_table');
+  require('ui/paginated_table');
 
-  require('modules').get('apps/settings')
+  require('ui/modules').get('apps/settings')
   .directive('scriptedFields', function (kbnUrl, Notifier, $filter) {
     var rowScopes = []; // track row scopes, so they can be destroyed as needed
-    var popularityHtml = require('text!plugins/settings/sections/indices/_field_popularity.html');
-    var controlsHtml = require('text!plugins/settings/sections/indices/_field_controls.html');
+    var popularityHtml = require('plugins/kibana/settings/sections/indices/_field_popularity.html');
+    var controlsHtml = require('plugins/kibana/settings/sections/indices/_field_controls.html');
     var filter = $filter('filter');
 
     var notify = new Notifier();
 
     return {
       restrict: 'E',
-      template: require('text!plugins/settings/sections/indices/_scripted_fields.html'),
+      template: require('plugins/kibana/settings/sections/indices/_scripted_fields.html'),
       scope: true,
       link: function ($scope) {
-        var dateScripts = require('plugins/settings/sections/indices/_date_scripts');
+        var dateScripts = require('plugins/kibana/settings/sections/indices/_date_scripts');
 
         var fieldCreatorPath = '/settings/indices/{{ indexPattern }}/scriptedField';
         var fieldEditorPath = fieldCreatorPath + '/{{ fieldName }}';
diff --git a/src/kibana/plugins/settings/sections/indices/index.html b/src/plugins/kibana/public/settings/sections/indices/index.html
similarity index 100%
rename from src/kibana/plugins/settings/sections/indices/index.html
rename to src/plugins/kibana/public/settings/sections/indices/index.html
diff --git a/src/plugins/kibana/public/settings/sections/indices/index.js b/src/plugins/kibana/public/settings/sections/indices/index.js
new file mode 100644
index 0000000000000..b3588ef40bd72
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/indices/index.js
@@ -0,0 +1,51 @@
+define(function (require) {
+  var _ = require('lodash');
+
+  require('plugins/kibana/settings/sections/indices/_create');
+  require('plugins/kibana/settings/sections/indices/_edit');
+  require('plugins/kibana/settings/sections/indices/_field_editor');
+
+  // add a dependency to all of the subsection routes
+  require('ui/routes')
+  .defaults(/settings\/indices/, {
+    resolve: {
+      indexPatternIds: function (courier) {
+        return courier.indexPatterns.getIds();
+      }
+    }
+  });
+
+  // wrapper directive, which sets some global stuff up like the left nav
+  require('ui/modules').get('apps/settings')
+  .directive('kbnSettingsIndices', function ($route, config, kbnUrl) {
+    return {
+      restrict: 'E',
+      transclude: true,
+      template: require('plugins/kibana/settings/sections/indices/index.html'),
+      link: function ($scope) {
+        $scope.edittingId = $route.current.params.indexPatternId;
+        config.$bind($scope, 'defaultIndex');
+
+        $scope.$watch('defaultIndex', function () {
+          var ids = $route.current.locals.indexPatternIds;
+          $scope.indexPatternList = ids.map(function (id) {
+            return {
+              id: id,
+              url: kbnUrl.eval('#/settings/indices/{{id}}', {id: id}),
+              class: 'sidebar-item-title ' + ($scope.edittingId === id ? 'active' : ''),
+              default: $scope.defaultIndex === id
+            };
+          });
+        });
+
+        $scope.$emit('application.load');
+      }
+    };
+  });
+
+  return {
+    name: 'indices',
+    display: 'Indices',
+    url: '#/settings/indices',
+  };
+});
diff --git a/src/kibana/plugins/settings/sections/objects/_objects.html b/src/plugins/kibana/public/settings/sections/objects/_objects.html
similarity index 100%
rename from src/kibana/plugins/settings/sections/objects/_objects.html
rename to src/plugins/kibana/public/settings/sections/objects/_objects.html
diff --git a/src/kibana/plugins/settings/sections/objects/_objects.js b/src/plugins/kibana/public/settings/sections/objects/_objects.js
similarity index 90%
rename from src/kibana/plugins/settings/sections/objects/_objects.js
rename to src/plugins/kibana/public/settings/sections/objects/_objects.js
index 49c2bc0ea9c84..d5ed679a67dda 100644
--- a/src/kibana/plugins/settings/sections/objects/_objects.js
+++ b/src/plugins/kibana/public/settings/sections/objects/_objects.js
@@ -1,19 +1,19 @@
 define(function (require) {
   var _ = require('lodash');
   var angular = require('angular');
-  var saveAs = require('file_saver');
-  var registry = require('plugins/settings/saved_object_registry');
-  var objectIndexHTML = require('text!plugins/settings/sections/objects/_objects.html');
+  var saveAs = require('@spalger/filesaver').saveAs;
+  var registry = require('plugins/kibana/settings/saved_object_registry');
+  var objectIndexHTML = require('plugins/kibana/settings/sections/objects/_objects.html');
 
-  require('directives/file_upload');
+  require('ui/directives/file_upload');
 
-  require('routes')
+  require('ui/routes')
   .when('/settings/objects', {
     template: objectIndexHTML
   });
 
-  require('modules').get('apps/settings')
-  .directive('kbnSettingsObjects', function (config, Notifier, Private, kbnUrl, Promise) {
+  require('ui/modules').get('apps/settings')
+  .directive('kbnSettingsObjects', function (kbnIndex, Notifier, Private, kbnUrl, Promise) {
     return {
       restrict: 'E',
       controller: function ($scope, $injector, $q, AppState, es) {
@@ -100,7 +100,7 @@ define(function (require) {
 
         function retrieveAndExportDocs(objs) {
           es.mget({
-            index: config.file.kibana_index,
+            index: kbnIndex,
             body: {docs: objs.map(transformToMget)}
           })
           .then(function (response) {
@@ -141,7 +141,7 @@ define(function (require) {
 
         function refreshIndex() {
           return es.indices.refresh({
-            index: config.file.kibana_index
+            index: kbnIndex
           });
         }
 
diff --git a/src/kibana/plugins/settings/sections/objects/_view.html b/src/plugins/kibana/public/settings/sections/objects/_view.html
similarity index 100%
rename from src/kibana/plugins/settings/sections/objects/_view.html
rename to src/plugins/kibana/public/settings/sections/objects/_view.html
diff --git a/src/kibana/plugins/settings/sections/objects/_view.js b/src/plugins/kibana/public/settings/sections/objects/_view.js
similarity index 92%
rename from src/kibana/plugins/settings/sections/objects/_view.js
rename to src/plugins/kibana/public/settings/sections/objects/_view.js
index 4b16953462812..54c4817b48e20 100644
--- a/src/kibana/plugins/settings/sections/objects/_view.js
+++ b/src/plugins/kibana/public/settings/sections/objects/_view.js
@@ -1,22 +1,22 @@
 define(function (require) {
   var _ = require('lodash');
   var angular = require('angular');
-  var rison = require('utils/rison');
-  var registry = require('plugins/settings/saved_object_registry');
-  var objectViewHTML = require('text!plugins/settings/sections/objects/_view.html');
+  var rison = require('ui/utils/rison');
+  var registry = require('plugins/kibana/settings/saved_object_registry');
+  var objectViewHTML = require('plugins/kibana/settings/sections/objects/_view.html');
 
-  require('routes')
+  require('ui/routes')
   .when('/settings/objects/:service/:id', {
     template: objectViewHTML
   });
 
-  require('modules').get('apps/settings')
-  .directive('kbnSettingsObjectsView', function (config, Notifier) {
+  require('ui/modules').get('apps/settings')
+  .directive('kbnSettingsObjectsView', function (kbnIndex, Notifier) {
     return {
       restrict: 'E',
       controller: function ($scope, $injector, $routeParams, $location, $window, $rootScope, es, Private) {
         var notify = new Notifier({ location: 'SavedObject view' });
-        var castMappingType = Private(require('components/index_patterns/_cast_mapping_type'));
+        var castMappingType = Private(require('ui/index_patterns/_cast_mapping_type'));
         var serviceObj = registry.get($routeParams.service);
         var service = $injector.get(serviceObj.service);
 
@@ -103,7 +103,7 @@ define(function (require) {
         $scope.title = service.type;
 
         es.get({
-          index: config.file.kibana_index,
+          index: kbnIndex,
           type: service.type,
           id: $routeParams.id
         })
@@ -159,7 +159,7 @@ define(function (require) {
          */
         $scope.delete = function () {
           es.delete({
-            index: config.file.kibana_index,
+            index: kbnIndex,
             type: service.type,
             id: $routeParams.id
           })
@@ -187,7 +187,7 @@ define(function (require) {
           });
 
           es.index({
-            index: config.file.kibana_index,
+            index: kbnIndex,
             type: service.type,
             id: $routeParams.id,
             body: source
@@ -200,7 +200,7 @@ define(function (require) {
 
         function redirectHandler(action) {
           return es.indices.refresh({
-            index: config.file.kibana_index
+            index: kbnIndex
           })
           .then(function (resp) {
             var msg = 'You successfully ' + action + ' the "' + $scope.obj._source.title + '" ' + $scope.title.toLowerCase() + ' object';
diff --git a/src/plugins/kibana/public/settings/sections/objects/index.js b/src/plugins/kibana/public/settings/sections/objects/index.js
new file mode 100644
index 0000000000000..08ed7d77155d0
--- /dev/null
+++ b/src/plugins/kibana/public/settings/sections/objects/index.js
@@ -0,0 +1,16 @@
+define(function (require) {
+  require('plugins/kibana/settings/sections/objects/_view');
+  require('plugins/kibana/settings/sections/objects/_objects');
+
+  require('ace');
+  require('ui/directives/confirm_click');
+
+  // add the module deps to this module
+  require('ui/modules').get('apps/settings');
+
+  return {
+    name: 'objects',
+    display: 'Objects',
+    url: '#/settings/objects'
+  };
+});
diff --git a/src/plugins/kibana/public/settings/styles/main.less b/src/plugins/kibana/public/settings/styles/main.less
new file mode 100644
index 0000000000000..d2980234bcbbb
--- /dev/null
+++ b/src/plugins/kibana/public/settings/styles/main.less
@@ -0,0 +1,189 @@
+@import (reference) "~ui/styles/theme";
+@import (reference) "~ui/styles/variables";
+
+kibana-settings-app,
+kbn-settings-indices,
+kbn-settings-indices-edit,
+kbn-settings-indices-create,
+kbn-settings-advanced,
+kbn-settings-objects,
+kbn-settings-objects-view {
+  display: block;
+}
+
+.settings-nav {
+  text-transform: capitalize;
+}
+
+li.kbn-settings-tab:first-letter {
+  text-transform: capitalize;
+}
+
+kbn-settings-objects {
+  form {
+    margin-bottom: @line-height-computed;
+  }
+  .list-unstyled {
+    // border-top: 1px solid @gray-lighter;
+    // margin-top: @line-height-computed;
+    li {
+      border-bottom: 1px solid @gray-lighter;
+      padding: 8px;
+    }
+  }
+  .empty {
+    color: @gray-light;
+  }
+
+  .action-bar {
+    margin-top: 10px;
+    background-color: @gray-lighter;
+    padding: 4px 12px;
+
+    label {
+      font-size: 10px;
+      font-weight: normal;
+    }
+
+    .btn {
+      font-size: 10px;
+      margin-left: 20px;
+    }
+  }
+
+  .header {
+    .title, .controls {
+      padding-right: 1em;
+      display: inline-block;
+    }
+  }
+}
+
+kbn-settings-advanced {
+  // super specific rule to override bootstrap's equally specific rule
+  // https://github.com/twbs/bootstrap/blob/1f329f8f17aa989eabc6e94bdcab93e69ef0e463/less/tables.less#L35
+  .table > tbody > tr > td {
+    vertical-align: middle;
+  }
+}
+
+kbn-settings-objects-view {
+  label {
+    font-family: @font-family-monospace;
+  }
+  .ace_editor { height: 300px; }
+}
+
+.kbn-settings-about {
+  margin-top: 30px;
+
+  .jumbotron h1 {
+    font-weight: bold;
+  }
+
+  &-versions {
+    td {
+      width: 50%;
+    }
+
+    td:first-child {
+      font-weight: bold;
+      text-align: right;
+    }
+  }
+}
+
+.advanced-settings {
+  table {
+    width: 100%;
+
+    tr.default td.value {
+      color: @input-color-placeholder;
+    }
+
+    td {
+      font-family: @font-family-monospace;
+
+      &.actions {
+        width: 150px;
+      }
+    }
+  }
+}
+
+.objects-settings {
+  .item {
+    padding: 12px;
+
+    .item-title {
+      margin-left: 30px;
+    }
+
+    .actions {
+      margin-top: -6px;
+    }
+  }
+}
+
+.indices-settings {
+  i.active {
+    color: @btn-success-bg;
+  }
+
+  tr.field-settings {
+    .field-popularize {
+      margin-left: 5px;
+      display: none;
+    }
+    &:hover .field-popularize {
+      display: inline;
+    }
+  }
+
+  .index-pattern-name {
+    display: flex;
+    align-items: center;
+
+    .title {
+      flex: 1 1 auto;
+    }
+
+    .controls {
+      flex: 4 0 auto;
+    }
+  }
+}
+
+kbn-settings-indices {
+  .fields {
+    table {
+      .table-striped()
+    }
+
+    th:last-child,
+    td:last-child {
+      text-align: right;
+    }
+  }
+
+  .indexed-fields {
+    th:first-child,
+    td:first-child {
+      width: 35%;
+    }
+  }
+
+  .scripted-fields header {
+    margin: 5px 0;
+    text-align: right;
+  }
+
+  p.text-center {
+    padding-top: 1em;
+  }
+}
+
+
+.kbn-settings-indices-create {
+  .time-and-pattern > div {}
+}
diff --git a/src/plugins/kibana/public/visualize/editor/__tests__/agg.js b/src/plugins/kibana/public/visualize/editor/__tests__/agg.js
new file mode 100644
index 0000000000000..5ef09e68bf954
--- /dev/null
+++ b/src/plugins/kibana/public/visualize/editor/__tests__/agg.js
@@ -0,0 +1,86 @@
+
+var angular = require('angular');
+var $ = require('jquery');
+var _ = require('lodash');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+require('plugins/kibana/visualize/editor/agg');
+
+describe('Vis-Editor-Agg plugin directive', function () {
+  var $parentScope = {};
+  var $scope, $elem;
+
+  function makeConfig(which) {
+    var schemaMap = {
+      radius: {
+        title: 'Dot Size',
+        min: 0,
+        max: 1
+      },
+      metric: {
+        title: 'Y-Axis',
+        min: 1,
+        max: Infinity
+      }
+    };
+    var typeOptions = ['count', 'avg', 'sum', 'min', 'max', 'cardinality'];
+    which = which || 'metric';
+
+    var schema = schemaMap[which];
+
+    return {
+      min: schema.min,
+      max: schema.max,
+      name: which,
+      title: schema.title,
+      group: 'metrics',
+      aggFilter: typeOptions,
+      // AggParams object
+      params: []
+    };
+  }
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function ($rootScope, $compile) {
+    $parentScope.agg = {
+      id: 1,
+      params: {},
+      schema: makeConfig()
+    };
+    $parentScope.groupName = 'metrics';
+    $parentScope.group = [{
+      id: '1',
+      schema: makeConfig()
+    }, {
+      id: '2',
+      schema: makeConfig('radius')
+    }];
+
+    // share the scope
+    _.defaults($parentScope, $rootScope, Object.getPrototypeOf($rootScope));
+
+    // make the element
+    $elem = angular.element(
+      '<ng-form vis-editor-agg></ng-form>'
+    );
+
+    // compile the html
+    $compile($elem)($parentScope);
+
+    // Digest everything
+    $elem.scope().$digest();
+
+    // give us a scope to work with
+    $scope = $elem.isolateScope();
+  }));
+
+  it('should only add the close button if there is more than the minimum', function () {
+    expect($parentScope.canRemove($parentScope.agg)).to.be(false);
+    $parentScope.group.push({
+      id: '3',
+      schema: makeConfig()
+    });
+    expect($parentScope.canRemove($parentScope.agg)).to.be(true);
+  });
+});
diff --git a/src/kibana/plugins/visualize/editor/add_bucket_agg.js b/src/plugins/kibana/public/visualize/editor/add_bucket_agg.js
similarity index 100%
rename from src/kibana/plugins/visualize/editor/add_bucket_agg.js
rename to src/plugins/kibana/public/visualize/editor/add_bucket_agg.js
diff --git a/src/kibana/plugins/visualize/editor/advanced_toggle.html b/src/plugins/kibana/public/visualize/editor/advanced_toggle.html
similarity index 100%
rename from src/kibana/plugins/visualize/editor/advanced_toggle.html
rename to src/plugins/kibana/public/visualize/editor/advanced_toggle.html
diff --git a/src/kibana/plugins/visualize/editor/agg.html b/src/plugins/kibana/public/visualize/editor/agg.html
similarity index 100%
rename from src/kibana/plugins/visualize/editor/agg.html
rename to src/plugins/kibana/public/visualize/editor/agg.html
diff --git a/src/plugins/kibana/public/visualize/editor/agg.js b/src/plugins/kibana/public/visualize/editor/agg.js
new file mode 100644
index 0000000000000..3f551f81647c9
--- /dev/null
+++ b/src/plugins/kibana/public/visualize/editor/agg.js
@@ -0,0 +1,92 @@
+define(function (require) {
+  require('ui/modules')
+  .get('app/visualize')
+  .directive('visEditorAgg', function ($compile, $parse, $filter, Private, Notifier) {
+    require('plugins/kibana/visualize/editor/agg_params');
+    require('plugins/kibana/visualize/editor/agg_add');
+
+    var _ = require('lodash');
+    var $ = require('jquery');
+    var aggTypes = Private(require('ui/agg_types/index'));
+    var advancedToggleHtml = require('plugins/kibana/visualize/editor/advanced_toggle.html');
+
+    var notify = new Notifier({
+      location: 'visAggGroup'
+    });
+
+    return {
+      restrict: 'A',
+      template: require('plugins/kibana/visualize/editor/agg.html'),
+      require: 'form',
+      link: function ($scope, $el, attrs, kbnForm) {
+        $scope.$bind('outputAgg', 'outputVis.aggs.byId[agg.id]', $scope);
+        $scope.editorOpen = !!$scope.agg.brandNew;
+
+        $scope.$watch('editorOpen', function (open) {
+          // make sure that all of the form inputs are "touched"
+          // so that their errors propogate
+          if (!open) kbnForm.$setTouched();
+        });
+
+        $scope.$watchMulti([
+          '$index',
+          'group.length'
+        ], function () {
+          $scope.aggIsTooLow = calcAggIsTooLow();
+        });
+
+        /**
+         * Describe the aggregation, for display in the collapsed agg header
+         * @return {[type]} [description]
+         */
+        $scope.describe = function () {
+          if (!$scope.agg.type.makeLabel) return '';
+          var label = $scope.agg.type.makeLabel($scope.agg);
+          return label ? label : '';
+        };
+
+        function move(below, agg) {
+          _.move($scope.vis.aggs, agg, below, function (otherAgg) {
+            return otherAgg.schema.group === agg.schema.group;
+          });
+        }
+        $scope.moveUp = _.partial(move, false);
+        $scope.moveDown = _.partial(move, true);
+
+        $scope.remove = function (agg) {
+          var aggs = $scope.vis.aggs;
+
+          var index = aggs.indexOf(agg);
+          if (index === -1) return notify.log('already removed');
+
+          aggs.splice(index, 1);
+        };
+
+        $scope.canRemove = function (aggregation) {
+          var metricCount = _.reduce($scope.group, function (count, agg) {
+            return (agg.schema.name === aggregation.schema.name) ? ++count : count;
+          }, 0);
+
+          // make sure the the number of these aggs is above the min
+          return metricCount > aggregation.schema.min;
+        };
+
+        function calcAggIsTooLow() {
+          if (!$scope.agg.schema.mustBeFirst) {
+            return false;
+          }
+
+          var firstDifferentSchema = _.findIndex($scope.group, function (agg) {
+            return agg.schema !== $scope.agg.schema;
+          });
+
+          if (firstDifferentSchema === -1) {
+            return false;
+          }
+
+          return $scope.$index > firstDifferentSchema;
+        }
+      }
+    };
+  });
+});
diff --git a/src/kibana/plugins/visualize/editor/agg_add.html b/src/plugins/kibana/public/visualize/editor/agg_add.html
similarity index 100%
rename from src/kibana/plugins/visualize/editor/agg_add.html
rename to src/plugins/kibana/public/visualize/editor/agg_add.html
diff --git a/src/kibana/plugins/visualize/editor/agg_add.js b/src/plugins/kibana/public/visualize/editor/agg_add.js
similarity index 77%
rename from src/kibana/plugins/visualize/editor/agg_add.js
rename to src/plugins/kibana/public/visualize/editor/agg_add.js
index 8457f27c69c23..b325de87276d7 100644
--- a/src/kibana/plugins/visualize/editor/agg_add.js
+++ b/src/plugins/kibana/public/visualize/editor/agg_add.js
@@ -1,12 +1,12 @@
 define(function (require) {
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .directive('visEditorAggAdd', function (Private) {
-    var AggConfig = Private(require('components/vis/AggConfig'));
+    var AggConfig = Private(require('ui/Vis/AggConfig'));
 
     return {
       restrict: 'E',
-      template: require('text!plugins/visualize/editor/agg_add.html'),
+      template: require('plugins/kibana/visualize/editor/agg_add.html'),
       controllerAs: 'add',
       controller: function ($scope) {
         var self = this;
diff --git a/src/plugins/kibana/public/visualize/editor/agg_filter.js b/src/plugins/kibana/public/visualize/editor/agg_filter.js
new file mode 100644
index 0000000000000..fe6708f382b0b
--- /dev/null
+++ b/src/plugins/kibana/public/visualize/editor/agg_filter.js
@@ -0,0 +1,10 @@
+define(function (require) {
+  var _ = require('lodash');
+  var propFilter = require('ui/filters/_prop_filter');
+
+  require('ui/modules')
+  .get('kibana')
+  .filter('aggFilter', function () {
+    return propFilter('name');
+  });
+});
\ No newline at end of file
diff --git a/src/kibana/plugins/visualize/editor/agg_group.html b/src/plugins/kibana/public/visualize/editor/agg_group.html
similarity index 100%
rename from src/kibana/plugins/visualize/editor/agg_group.html
rename to src/plugins/kibana/public/visualize/editor/agg_group.html
diff --git a/src/kibana/plugins/visualize/editor/agg_group.js b/src/plugins/kibana/public/visualize/editor/agg_group.js
similarity index 82%
rename from src/kibana/plugins/visualize/editor/agg_group.js
rename to src/plugins/kibana/public/visualize/editor/agg_group.js
index 372e75ac592e0..825d3e76c7abb 100644
--- a/src/kibana/plugins/visualize/editor/agg_group.js
+++ b/src/plugins/kibana/public/visualize/editor/agg_group.js
@@ -1,14 +1,14 @@
 define(function (require) {
-  require('modules')
+  require('ui/modules')
   .get('app/visualize')
   .directive('visEditorAggGroup', function (Private) {
-    require('plugins/visualize/editor/agg');
-    require('plugins/visualize/editor/agg_add');
-    require('plugins/visualize/editor/nesting_indicator');
+    require('plugins/kibana/visualize/editor/agg');
+    require('plugins/kibana/visualize/editor/agg_add');
+    require('plugins/kibana/visualize/editor/nesting_indicator');
 
     return {
       restrict: 'E',
-      template: require('text!plugins/visualize/editor/agg_group.html'),
+      template: require('plugins/kibana/visualize/editor/agg_group.html'),
       scope: true,
       link: function ($scope, $el, attr) {
         $scope.groupName = attr.groupName;
diff --git a/src/kibana/plugins/visualize/editor/agg_param.js b/src/plugins/kibana/public/visualize/editor/agg_param.js
similarity index 96%
rename from src/kibana/plugins/visualize/editor/agg_param.js
rename to src/plugins/kibana/public/visualize/editor/agg_param.js
index 280b3f4300be7..41522787005ad 100644
--- a/src/kibana/plugins/visualize/editor/agg_param.js
+++ b/src/plugins/kibana/public/visualize/editor/agg_param.js
@@ -1,7 +1,7 @@
 define(function (require) {
   var _ = require('lodash');
 
-  require('modules')
+  require('ui/modules')
   .get('app/visualize')
   .directive('visAggParamEditor', function (config, $parse, Private) {
     return {
diff --git a/src/kibana/plugins/visualize/editor/agg_params.html b/src/plugins/kibana/public/visualize/editor/agg_params.html
similarity index 100%
rename from src/kibana/plugins/visualize/editor/agg_params.html
rename to src/plugins/kibana/public/visualize/editor/agg_params.html
diff --git a/src/kibana/plugins/visualize/editor/agg_params.js b/src/plugins/kibana/public/visualize/editor/agg_params.js
similarity index 90%
rename from src/kibana/plugins/visualize/editor/agg_params.js
rename to src/plugins/kibana/public/visualize/editor/agg_params.js
index 8f6e34d855920..b64599f5d1716 100644
--- a/src/kibana/plugins/visualize/editor/agg_params.js
+++ b/src/plugins/kibana/public/visualize/editor/agg_params.js
@@ -1,16 +1,16 @@
 define(function (require) {
-  var IndexedArray = require('utils/indexed_array/index');
+  var IndexedArray = require('ui/IndexedArray');
 
-  require('modules')
+  require('ui/modules')
   .get('app/visualize')
   .directive('visEditorAggParams', function ($compile, $parse, Private, Notifier, $filter) {
     var _ = require('lodash');
     var $ = require('jquery');
-    var aggTypes = Private(require('components/agg_types/index'));
-    var aggSelectHtml = require('text!plugins/visualize/editor/agg_select.html');
-    var advancedToggleHtml = require('text!plugins/visualize/editor/advanced_toggle.html');
-    require('filters/match_any');
-    require('plugins/visualize/editor/agg_param');
+    var aggTypes = Private(require('ui/agg_types/index'));
+    var aggSelectHtml = require('plugins/kibana/visualize/editor/agg_select.html');
+    var advancedToggleHtml = require('plugins/kibana/visualize/editor/advanced_toggle.html');
+    require('ui/filters/match_any');
+    require('plugins/kibana/visualize/editor/agg_param');
 
     var notify = new Notifier({
       location: 'visAggGroup'
@@ -18,7 +18,7 @@ define(function (require) {
 
     return {
       restrict: 'E',
-      template: require('text!plugins/visualize/editor/agg_params.html'),
+      template: require('plugins/kibana/visualize/editor/agg_params.html'),
       scope: true,
       link: function ($scope, $el, attr) {
         $scope.$bind('agg', attr.agg);
diff --git a/src/kibana/plugins/visualize/editor/agg_select.html b/src/plugins/kibana/public/visualize/editor/agg_select.html
similarity index 100%
rename from src/kibana/plugins/visualize/editor/agg_select.html
rename to src/plugins/kibana/public/visualize/editor/agg_select.html
diff --git a/src/kibana/plugins/visualize/editor/editor.html b/src/plugins/kibana/public/visualize/editor/editor.html
similarity index 95%
rename from src/kibana/plugins/visualize/editor/editor.html
rename to src/plugins/kibana/public/visualize/editor/editor.html
index 8d5cae53dcf7b..647448e85ae98 100644
--- a/src/kibana/plugins/visualize/editor/editor.html
+++ b/src/plugins/kibana/public/visualize/editor/editor.html
@@ -1,6 +1,6 @@
 <div ng-controller="VisEditor" class="vis-editor vis-type-{{ vis.type.name }}">
 
-  <navbar ng-if="!appEmbedded">
+  <navbar ng-if="!chrome.embedded">
     <div class="fill bitty-modal-container">
       <div ng-if="vis.type.requiresSearch && $state.linked && !unlinking"
         ng-dblclick="unlink()"
@@ -118,7 +118,7 @@
 
 
   <config
-    ng-if="!appEmbedded"
+    ng-if="!chrome.embedded"
     config-template="configTemplate"
     config-object="conf">
   </config>
@@ -127,9 +127,9 @@
 
   <div class="vis-editor-content">
 
-    <vis-editor-sidebar class="vis-editor-sidebar" ng-if="!appEmbedded"></vis-editor-sidebar>
+    <vis-editor-sidebar class="vis-editor-sidebar" ng-if="!chrome.embedded"></vis-editor-sidebar>
 
-    <div class="vis-editor-canvas" ng-class="{ embedded: appEmbedded }">
+    <div class="vis-editor-canvas" ng-class="{ embedded: chrome.embedded }">
       <div class="visualize-info" ng-if="savedVis.id">
         <div class="visualize-info-tab">
           <span bindonce bo-bind="savedVis.title"></span>
diff --git a/src/kibana/plugins/visualize/editor/editor.js b/src/plugins/kibana/public/visualize/editor/editor.js
similarity index 86%
rename from src/kibana/plugins/visualize/editor/editor.js
rename to src/plugins/kibana/public/visualize/editor/editor.js
index 88a84809f82ec..9a0b5f12d9df8 100644
--- a/src/kibana/plugins/visualize/editor/editor.js
+++ b/src/plugins/kibana/public/visualize/editor/editor.js
@@ -1,23 +1,18 @@
 define(function (require) {
   var _ = require('lodash');
-  require('plugins/visualize/saved_visualizations/saved_visualizations');
-  require('plugins/visualize/editor/sidebar');
-  require('plugins/visualize/editor/agg_filter');
+  require('plugins/kibana/visualize/saved_visualizations/saved_visualizations');
+  require('plugins/kibana/visualize/editor/sidebar');
+  require('plugins/kibana/visualize/editor/agg_filter');
 
+  require('ui/visualize');
+  require('ui/clipboard');
 
-  require('directives/saved_object_finder');
-  require('components/visualize/visualize');
-  require('components/clipboard/clipboard');
-  require('components/comma_list_filter');
-
-  require('filters/uriescape');
-
-  require('routes')
+  require('ui/routes')
   .when('/visualize/create', {
-    template: require('text!plugins/visualize/editor/editor.html'),
+    template: require('plugins/kibana/visualize/editor/editor.html'),
     resolve: {
       savedVis: function (savedVisualizations, courier, $route, Private) {
-        var visTypes = Private(require('registry/vis_types'));
+        var visTypes = Private(require('ui/registry/vis_types'));
         var visType = _.find(visTypes, {name: $route.current.params.type});
         if (visType.requiresSearch && !$route.current.params.indexPattern && !$route.current.params.savedSearchId) {
           throw new Error('You must provide either an indexPattern or a savedSearchId');
@@ -31,7 +26,7 @@ define(function (require) {
     }
   })
   .when('/visualize/edit/:id', {
-    template: require('text!plugins/visualize/editor/editor.html'),
+    template: require('plugins/kibana/visualize/editor/editor.html'),
     resolve: {
       savedVis: function (savedVisualizations, courier, $route) {
         return savedVisualizations.get($route.current.params.id)
@@ -45,7 +40,7 @@ define(function (require) {
     }
   });
 
-  require('modules')
+  require('ui/modules')
   .get('app/visualize', [
     'kibana/notify',
     'kibana/courier'
@@ -54,12 +49,12 @@ define(function (require) {
 
     var _ = require('lodash');
     var angular = require('angular');
-    var ConfigTemplate = require('utils/config_template');
-    var Notifier = require('components/notify/_notifier');
-    var docTitle = Private(require('components/doc_title/doc_title'));
-    var brushEvent = Private(require('utils/brush_event'));
-    var queryFilter = Private(require('components/filter_bar/query_filter'));
-    var filterBarClickHandler = Private(require('components/filter_bar/filter_bar_click_handler'));
+    var ConfigTemplate = require('ui/ConfigTemplate');
+    var Notifier = require('ui/notify/Notifier');
+    var docTitle = Private(require('ui/doc_title'));
+    var brushEvent = Private(require('ui/utils/brush_event'));
+    var queryFilter = Private(require('ui/filter_bar/query_filter'));
+    var filterBarClickHandler = Private(require('ui/filter_bar/filter_bar_click_handler'));
 
     var notify = new Notifier({
       location: 'Visualization Editor'
@@ -79,9 +74,9 @@ define(function (require) {
 
     // config panel templates
     var configTemplate = new ConfigTemplate({
-      save: require('text!plugins/visualize/editor/panels/save.html'),
-      load: require('text!plugins/visualize/editor/panels/load.html'),
-      share: require('text!plugins/visualize/editor/panels/share.html'),
+      save: require('plugins/kibana/visualize/editor/panels/save.html'),
+      load: require('plugins/kibana/visualize/editor/panels/load.html'),
+      share: require('plugins/kibana/visualize/editor/panels/share.html'),
     });
 
     if (savedVis.id) {
diff --git a/src/kibana/plugins/visualize/editor/nesting_indicator.js b/src/plugins/kibana/public/visualize/editor/nesting_indicator.js
similarity index 88%
rename from src/kibana/plugins/visualize/editor/nesting_indicator.js
rename to src/plugins/kibana/public/visualize/editor/nesting_indicator.js
index c27c6e336ead0..d9114c64c07c8 100644
--- a/src/kibana/plugins/visualize/editor/nesting_indicator.js
+++ b/src/plugins/kibana/public/visualize/editor/nesting_indicator.js
@@ -1,10 +1,10 @@
 define(function (require) {
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .directive('nestingIndicator', function ($rootScope, $parse, Private) {
     var _ = require('lodash');
     var $ = require('jquery');
-    var getColors = Private(require('components/vislib/components/color/color_palette'));
+    var getColors = Private(require('ui/vislib/components/color/color_palette'));
 
     return {
       restrict: 'E',
diff --git a/src/kibana/plugins/visualize/editor/panels/load.html b/src/plugins/kibana/public/visualize/editor/panels/load.html
similarity index 100%
rename from src/kibana/plugins/visualize/editor/panels/load.html
rename to src/plugins/kibana/public/visualize/editor/panels/load.html
diff --git a/src/kibana/plugins/visualize/editor/panels/save.html b/src/plugins/kibana/public/visualize/editor/panels/save.html
similarity index 100%
rename from src/kibana/plugins/visualize/editor/panels/save.html
rename to src/plugins/kibana/public/visualize/editor/panels/save.html
diff --git a/src/kibana/plugins/visualize/editor/panels/share.html b/src/plugins/kibana/public/visualize/editor/panels/share.html
similarity index 100%
rename from src/kibana/plugins/visualize/editor/panels/share.html
rename to src/plugins/kibana/public/visualize/editor/panels/share.html
diff --git a/src/kibana/plugins/visualize/editor/sidebar.html b/src/plugins/kibana/public/visualize/editor/sidebar.html
similarity index 100%
rename from src/kibana/plugins/visualize/editor/sidebar.html
rename to src/plugins/kibana/public/visualize/editor/sidebar.html
diff --git a/src/plugins/kibana/public/visualize/editor/sidebar.js b/src/plugins/kibana/public/visualize/editor/sidebar.js
new file mode 100644
index 0000000000000..56671c8e0bfaa
--- /dev/null
+++ b/src/plugins/kibana/public/visualize/editor/sidebar.js
@@ -0,0 +1,22 @@
+define(function (require) {
+  require('ui/modules')
+  .get('app/visualize')
+  .directive('visEditorSidebar', function () {
+    var _ = require('lodash');
+
+    require('plugins/kibana/visualize/editor/agg_group');
+    require('plugins/kibana/visualize/editor/vis_options');
+
+    return {
+      restrict: 'E',
+      template: require('plugins/kibana/visualize/editor/sidebar.html'),
+      scope: true,
+      controllerAs: 'sidebar',
+      controller: function ($scope) {
+        $scope.$bind('vis', 'editableVis');
+        $scope.$bind('outputVis', 'vis');
+        this.section = _.get($scope, 'vis.type.requiresSearch') ? 'data' : 'options';
+      }
+    };
+  });
+});
diff --git a/src/plugins/kibana/public/visualize/editor/styles/.editor.less b/src/plugins/kibana/public/visualize/editor/styles/.editor.less
new file mode 100644
index 0000000000000..2f8a6e991fa4a
--- /dev/null
+++ b/src/plugins/kibana/public/visualize/editor/styles/.editor.less
@@ -0,0 +1,372 @@
+.vis-editor {
+  .flex-parent();
+
+  @vis-editor-sidebar-basis: (100/12) * 2%; // two of twelve columns
+  @vis-editor-sidebar-min-width: 350px;
+  @vis-editor-nesting-width: 8px;
+  @vis-editor-agg-editor-spacing: 5px;
+
+  // For the vis-editor sidebar nav
+  .navbar-default .navbar-nav {
+    &> .active > a:before {
+      border: 7px solid transparent;
+      border-bottom-color: @gray-lighter;
+    }
+
+    .danger {
+      color: @btn-danger-color;
+      background-color: @btn-danger-bg;
+    }
+  }
+
+  .btn-xs {
+    line-height: 1.3;
+  }
+
+  navbar {
+    .bitty-modal-container {
+      position: relative;
+
+      .bitty-modal {
+        position: absolute;
+        cursor: pointer;
+        top: 0px;
+        left: 0px;
+        right: 0px;
+        bottom: 0px;
+        z-index: 10;
+        background: fadeout(@navbar-default-bg, 10%);
+        color: white;
+        text-align: center;
+        padding-top: 6px;
+
+        // Don't overflow container
+        padding-left: 20px;
+        padding-right: 20px;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        user-select: none;
+      }
+
+      a {
+        color: white;
+      }
+    }
+  }
+
+  &-content {
+    .flex-parent();
+
+    // overrides for tablet and desktop
+    @media (min-width: @screen-md-min) {
+      flex-direction: row;
+    }
+  }
+
+  &-sidebar {
+    .flex-parent(0, 0, auto);
+
+    // overflow: auto;
+
+    // overrided for tablet and desktop
+    @media (min-width: @screen-md-min) {
+      flex-basis: @vis-editor-sidebar-basis;
+      min-width: @vis-editor-sidebar-min-width;
+      max-width: @vis-editor-sidebar-min-width;
+      // margin-bottom: (@input-height-base * 2) - 3;
+    }
+
+    nav {
+      border-radius: 0px;
+    }
+
+    .sidebar-item {
+      border-top: 0 !important;
+    }
+
+    .sidebar-container {
+      .flex-parent(1, 1, auto);
+      background-color: @body-bg;
+      border-right-color: @sidebar-bg;
+
+      form {
+        .flex-parent(1, 1, auto);
+
+        > div.vis-editor-config {
+          @media (min-width: @screen-md-min) {
+            .flex-parent(1, 1, 1px);
+            overflow: auto;
+          }
+          @media (max-width: @screen-md-min) {
+            .flex-parent(1, 1, auto);
+          }
+        }
+
+        > .vis-edit-sidebar-buttons {
+          flex: 0 0 auto;
+        }
+
+        label {
+          margin-bottom: 0px;
+        }
+      }
+    }
+
+    .sidebar-item-title {
+      font-size: 20px;
+      font-weight: bold;
+      border: inherit !important;
+      background-color: @gray-lighter;
+      margin-bottom: @vis-editor-agg-editor-spacing;
+      padding: 2px 5px !important;
+    }
+
+    .sidebar-item-title:hover {
+      color: @text-color !important;
+      background-color: @gray-lighter !important;
+    }
+
+    .hintbox {
+      padding: @vis-editor-agg-editor-spacing;
+      margin-bottom: @vis-editor-agg-editor-spacing;
+    }
+
+    label {
+      flex: 2 0 0;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      margin-bottom: 0;
+    }
+  }
+
+  .visualization-options {
+    padding: @vis-editor-agg-editor-spacing;
+
+    .form-group {
+      margin-bottom: @vis-editor-agg-editor-spacing;
+    }
+    .form-horizontal .control-label {
+      text-align: left;
+    }
+  }
+
+  nesting-indicator {
+    display: flex;
+    flex: 0 0 auto;
+
+    > span {
+      width: @vis-editor-nesting-width;
+      background-color: @brand-success;
+    }
+  }
+
+  &-agg {
+    .flex-parent();
+
+    //IE10/11 - prevent flex item from overflowing
+    flex-basis: 100%;
+
+    padding: @vis-editor-agg-editor-spacing;
+
+    // wraps the .vis-editor-agg and nesting-indicator ^^
+    &-wrapper {
+      display: flex;
+    }
+
+    &-group {
+      .flex-parent(0, 1, auto);
+      color: @text-color;
+    }
+
+    &-header {
+      display: flex;
+      align-items: center;
+      flex: 1 0 auto;
+      margin-bottom: @vis-editor-agg-editor-spacing;
+
+      &-toggle {
+        flex: 0 0 auto;
+        margin-right: @vis-editor-agg-editor-spacing;
+      }
+
+      &-subagg-icon {
+        flex: 0 1 auto;
+        padding-right: @padding-base-vertical;
+      }
+
+      &-title {
+        flex: 1 1 auto;
+        .ellipsis();
+        font-weight: bold;
+      }
+
+      &-description {
+        font-weight: normal;
+        padding-right: @vis-editor-agg-editor-spacing;
+
+        &.danger {
+          .text-danger();
+          font-weight: bold;
+        }
+      }
+
+      &-controls {
+        flex: 0 0 auto;
+      }
+    }
+
+    &-error {
+      margin: @vis-editor-agg-editor-spacing 0;
+      padding: @vis-editor-agg-editor-spacing;
+      text-align: center;
+      background: @btn-danger-bg;
+      color: @btn-danger-color;
+    }
+
+    &-editor {
+      &-ranges {
+        td {
+          padding: 0 @vis-editor-agg-editor-spacing @vis-editor-agg-editor-spacing 0;
+          &:last-child {
+            padding-right: 0;
+          }
+        }
+      }
+
+      .regex .flags {
+        .docs {
+          text-align: right;
+        }
+
+        a {
+          color: @link-color;
+        }
+      }
+
+      &-advanced-toggle {
+        text-align: right;
+      }
+    }
+
+    &-form-row {
+      display: flex;
+
+      > * {
+        flex: 1 1 auto;
+        margin-right: @vis-editor-agg-editor-spacing;
+
+        &:last-child {
+          margin-right: 0px;
+        }
+      }
+
+      > .btn {
+        align-self: center;
+      }
+    }
+
+    &-form-value {
+      align-self: center;
+      margin: 0 0 0 @vis-editor-agg-editor-spacing;
+      font-size: 1.2em;
+    }
+
+    &-wide-btn {
+      border-radius: 0;
+      border-top: 2px solid @gray-lighter;
+
+      &-add {
+        width: 140px;
+        margin: -2px auto 5px auto;
+        text-align: center;
+        border: 2px solid @gray-lighter;
+        border-top: 0px;
+        padding: 3px;
+        border-bottom-right-radius: @border-radius-base;
+        border-bottom-left-radius: @border-radius-base;
+        background-color: @body-bg;
+        font-weight: bold;
+      }
+
+      &-add:hover {
+        background-color: @gray-lighter;
+      }
+    }
+
+    &-add {
+      .flex-parent();
+
+      &-subagg {
+        margin-bottom: -@vis-editor-agg-editor-spacing - 1; // extra one pixel covers the aggs bottom border
+        margin-right: -@vis-editor-agg-editor-spacing;
+        margin-left: -@vis-editor-agg-editor-spacing;
+      }
+
+      &-schemas {
+        margin: @vis-editor-agg-editor-spacing * 3;
+      }
+    }
+
+    &-order-agg {
+      border: 2px solid @gray-lighter;
+      border-radius: @border-radius-base;
+      margin: @vis-editor-agg-editor-spacing;
+      padding: @vis-editor-agg-editor-spacing;
+    }
+  }
+
+  vis-editor-agg-group {
+    .flex-parent(0, 1, auto);
+  }
+
+  &-canvas {
+    flex: 1 0 (@screen-md-min - @vis-editor-sidebar-basis);
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+
+    &.embedded {
+      flex-shrink: 1;
+      flex-basis: 100%;
+    }
+
+    // overrided for tablet and desktop
+    @media (min-width: @screen-md-min) {
+      flex-shrink: 1;
+      flex-basis: 100%;
+    }
+
+    &-title {
+      text-align: center;
+      margin: 10px 0 0;
+    }
+
+    visualize {
+      .flex-parent();
+      flex: 1 1 100%;
+    }
+
+    .visualize-chart {
+      flex: 1 1 100%;
+      position: relative;
+    }
+  }
+}
+
+vis-editor,
+vis-editor-agg-group,
+vis-editor-agg,
+vis-editor-agg-params,
+vis-editor-agg-param,
+vis-editor-vis-options,
+vis-editor-vis-options > * {
+  .flex-parent();
+}
+
+form.vis-share {
+  div.form-control {
+    height: inherit;
+  }
+}
diff --git a/src/kibana/plugins/visualize/editor/vis_options.html b/src/plugins/kibana/public/visualize/editor/vis_options.html
similarity index 100%
rename from src/kibana/plugins/visualize/editor/vis_options.html
rename to src/plugins/kibana/public/visualize/editor/vis_options.html
diff --git a/src/kibana/plugins/visualize/editor/vis_options.js b/src/plugins/kibana/public/visualize/editor/vis_options.js
similarity index 86%
rename from src/kibana/plugins/visualize/editor/vis_options.js
rename to src/plugins/kibana/public/visualize/editor/vis_options.js
index 882dc088e2211..7041d609227f7 100644
--- a/src/kibana/plugins/visualize/editor/vis_options.js
+++ b/src/plugins/kibana/public/visualize/editor/vis_options.js
@@ -2,12 +2,12 @@ define(function (require) {
   var _ = require('lodash');
   var $ = require('jquery');
 
-  require('modules')
+  require('ui/modules')
   .get('app/visualize')
   .directive('visEditorVisOptions', function (Private, $timeout, $compile) {
     return {
       restrict: 'E',
-      template: require('text!plugins/visualize/editor/vis_options.html'),
+      template: require('plugins/kibana/visualize/editor/vis_options.html'),
       scope: {
         vis: '=',
       },
diff --git a/src/plugins/kibana/public/visualize/index.js b/src/plugins/kibana/public/visualize/index.js
new file mode 100644
index 0000000000000..4fd8a507b9c5d
--- /dev/null
+++ b/src/plugins/kibana/public/visualize/index.js
@@ -0,0 +1,11 @@
+define(function (require) {
+  require('plugins/kibana/visualize/styles/main.less');
+
+  require('plugins/kibana/visualize/editor/editor');
+  require('plugins/kibana/visualize/wizard/wizard');
+
+  require('ui/routes')
+  .when('/visualize', {
+    redirectTo: '/visualize/step/1'
+  });
+});
diff --git a/src/kibana/plugins/visualize/saved_visualizations/_saved_vis.js b/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
similarity index 97%
rename from src/kibana/plugins/visualize/saved_visualizations/_saved_vis.js
rename to src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
index 765dafee61168..90d09df826694 100644
--- a/src/kibana/plugins/visualize/saved_visualizations/_saved_vis.js
+++ b/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
@@ -1,9 +1,9 @@
 define(function (require) {
-  require('modules')
+  require('ui/modules')
   .get('app/visualize')
   .factory('SavedVis', function (config, $injector, courier, Promise, savedSearches, Private, Notifier) {
     var _ = require('lodash');
-    var Vis = Private(require('components/vis/vis'));
+    var Vis = Private(require('ui/Vis'));
 
     var notify = new Notifier({
       location: 'SavedVis'
diff --git a/src/kibana/plugins/visualize/saved_visualizations/saved_visualizations.js b/src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js
similarity index 85%
rename from src/kibana/plugins/visualize/saved_visualizations/saved_visualizations.js
rename to src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js
index e5e2ea8dbdd78..45bf73e286d6e 100644
--- a/src/kibana/plugins/visualize/saved_visualizations/saved_visualizations.js
+++ b/src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js
@@ -1,18 +1,18 @@
 define(function (require) {
-  var app = require('modules').get('app/visualize');
+  var app = require('ui/modules').get('app/visualize');
   var _ = require('lodash');
 
-  require('plugins/visualize/saved_visualizations/_saved_vis');
+  require('plugins/kibana/visualize/saved_visualizations/_saved_vis');
 
   // Register this service with the saved object registry so it can be
   // edited by the object editor.
-  require('plugins/settings/saved_object_registry').register({
+  require('plugins/kibana/settings/saved_object_registry').register({
     service: 'savedVisualizations',
     title: 'visualizations'
   });
 
-  app.service('savedVisualizations', function (Promise, es, config, SavedVis, Private, Notifier, kbnUrl) {
-    var visTypes = Private(require('registry/vis_types'));
+  app.service('savedVisualizations', function (Promise, es, kbnIndex, SavedVis, Private, Notifier, kbnUrl) {
+    var visTypes = Private(require('ui/registry/vis_types'));
     var notify = new Notifier({
       location: 'Saved Visualization Service'
     });
@@ -53,7 +53,7 @@ define(function (require) {
       }
 
       return es.search({
-        index: config.file.kibana_index,
+        index: kbnIndex,
         type: 'visualization',
         body: body,
         size: 100,
diff --git a/src/plugins/kibana/public/visualize/styles/main.less b/src/plugins/kibana/public/visualize/styles/main.less
new file mode 100644
index 0000000000000..4dc46a0b3c75a
--- /dev/null
+++ b/src/plugins/kibana/public/visualize/styles/main.less
@@ -0,0 +1,59 @@
+@import (reference) "~ui/styles/variables";
+@import (reference) "~bootstrap/less/list-group";
+@import (reference) "~ui/styles/list-group-menu";
+
+.vis-wizard {
+  h1 {
+    margin-top: 45px;
+  }
+}
+
+.wizard-vis-type {
+  .list-group-item();
+  .list-group-menu .list-group-menu-item();
+
+  // overrided for tablet and desktop
+  @media (min-width: @screen-md-min) {
+    display: flex;
+    align-items: flex-start;
+  }
+
+  &-heading {
+    flex: 0 0 200px;
+    display: flex;
+    align-items: center;
+    font-size: 1.2em;
+
+    .fa {
+      flex: 0 0 auto;
+      margin-right: @padding-base-horizontal;
+      font-size: 1.5em;
+      text-align: center;
+    }
+
+    h4 {
+      flex: 1 0 auto;
+    }
+  }
+
+  &-description {
+    flex: 1 1 auto;
+    color: @brand-primary;
+  }
+}
+
+.visualize-info {
+  align-self: flex-end;
+
+  &-tab {
+    background-color: @well-bg;
+    padding: 5px 10px;
+    margin-left: @padding-base-horizontal;
+    border-bottom-left-radius: @border-radius-base;
+    text-align: right;
+    font-weight: bold;
+  }
+
+}
+
+@import "../editor/styles/.editor.less";
diff --git a/src/kibana/plugins/visualize/wizard/step_1.html b/src/plugins/kibana/public/visualize/wizard/step_1.html
similarity index 100%
rename from src/kibana/plugins/visualize/wizard/step_1.html
rename to src/plugins/kibana/public/visualize/wizard/step_1.html
diff --git a/src/kibana/plugins/visualize/wizard/step_2.html b/src/plugins/kibana/public/visualize/wizard/step_2.html
similarity index 100%
rename from src/kibana/plugins/visualize/wizard/step_2.html
rename to src/plugins/kibana/public/visualize/wizard/step_2.html
diff --git a/src/kibana/plugins/visualize/wizard/wizard.js b/src/plugins/kibana/public/visualize/wizard/wizard.js
similarity index 76%
rename from src/kibana/plugins/visualize/wizard/wizard.js
rename to src/plugins/kibana/public/visualize/wizard/wizard.js
index 9f993f4fbb0dc..4349ed1b9839c 100644
--- a/src/kibana/plugins/visualize/wizard/wizard.js
+++ b/src/plugins/kibana/public/visualize/wizard/wizard.js
@@ -1,28 +1,28 @@
 define(function (require) {
   var _ = require('lodash');
 
-  require('plugins/visualize/saved_visualizations/saved_visualizations');
-  require('directives/saved_object_finder');
-  require('plugins/discover/saved_searches/saved_searches');
+  require('plugins/kibana/visualize/saved_visualizations/saved_visualizations');
+  require('ui/directives/saved_object_finder');
+  require('plugins/kibana/discover/saved_searches/saved_searches');
 
   var templateStep = function (num, txt) {
     return '<div ng-controller="VisualizeWizardStep' + num + '" class="container vis-wizard">' + txt + '</div>';
   };
 
-  var module = require('modules').get('app/visualize', ['kibana/courier']);
-  var routes = require('routes');
+  var module = require('ui/modules').get('app/visualize', ['kibana/courier']);
+  var routes = require('ui/routes');
 
   /********
   /** Wizard Step 1
   /********/
   routes.when('/visualize/step/1', {
-    template: templateStep(1, require('text!plugins/visualize/wizard/step_1.html'))
+    template: templateStep(1, require('plugins/kibana/visualize/wizard/step_1.html'))
   });
 
   module.controller('VisualizeWizardStep1', function ($scope, $route, $location, timefilter, Private) {
     timefilter.enabled = false;
 
-    $scope.visTypes = Private(require('registry/vis_types'));
+    $scope.visTypes = Private(require('ui/registry/vis_types'));
     $scope.visTypeUrl = function (visType) {
       if (!visType.requiresSearch) return '#/visualize/create?type=' + encodeURIComponent(visType.name);
       else return '#/visualize/step/2?type=' + encodeURIComponent(visType.name);
@@ -33,7 +33,7 @@ define(function (require) {
   /** Wizard Step 2
   /********/
   routes.when('/visualize/step/2', {
-    template: templateStep(2, require('text!plugins/visualize/wizard/step_2.html')),
+    template: templateStep(2, require('plugins/kibana/visualize/wizard/step_2.html')),
     resolve: {
       indexPatternIds: function (courier) {
         return courier.indexPatterns.getIds();
diff --git a/src/plugins/markdown_vis/index.js b/src/plugins/markdown_vis/index.js
new file mode 100644
index 0000000000000..85c44ec5b2b40
--- /dev/null
+++ b/src/plugins/markdown_vis/index.js
@@ -0,0 +1,13 @@
+module.exports = function (kibana) {
+
+  return new kibana.Plugin({
+
+    uiExports: {
+      visTypes: [
+        'plugins/markdown_vis/markdown_vis'
+      ]
+    }
+
+  });
+
+};
diff --git a/src/plugins/markdown_vis/package.json b/src/plugins/markdown_vis/package.json
new file mode 100644
index 0000000000000..e47e6b73a6995
--- /dev/null
+++ b/src/plugins/markdown_vis/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "markdown_vis",
+  "version": "1.0.0"
+}
diff --git a/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js b/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js
new file mode 100644
index 0000000000000..2aa81b105903a
--- /dev/null
+++ b/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js
@@ -0,0 +1,26 @@
+
+describe('markdown vis controller', function () {
+  var $scope, $el;
+  var ngMock = require('ngMock');
+  var expect = require('expect.js');
+
+  beforeEach(ngMock.module('kibana/markdown_vis'));
+  beforeEach(ngMock.inject(function ($rootScope, $controller) {
+    $scope = $rootScope.$new();
+    $controller('KbnMarkdownVisController', {$scope: $scope});
+    $scope.$digest();
+  }));
+
+  it('should set html from markdown params', function () {
+    expect($scope).to.not.have.property('html');
+    $scope.vis = {
+      params: {
+        markdown: 'This is a test of the [markdown](http://daringfireball.net/projects/markdown) vis.'
+      }
+    };
+    $scope.$digest();
+
+    expect($scope).to.have.property('html');
+    expect($scope.html.toString().indexOf('<a href')).to.be.greaterThan(-1);
+  });
+});
\ No newline at end of file
diff --git a/src/kibana/plugins/markdown_vis/markdown_vis.html b/src/plugins/markdown_vis/public/markdown_vis.html
similarity index 100%
rename from src/kibana/plugins/markdown_vis/markdown_vis.html
rename to src/plugins/markdown_vis/public/markdown_vis.html
diff --git a/src/plugins/markdown_vis/public/markdown_vis.js b/src/plugins/markdown_vis/public/markdown_vis.js
new file mode 100644
index 0000000000000..3066cd8c108af
--- /dev/null
+++ b/src/plugins/markdown_vis/public/markdown_vis.js
@@ -0,0 +1,31 @@
+define(function (require) {
+  // we need to load the css ourselves
+  require('plugins/markdown_vis/markdown_vis.less');
+
+  // we also need to load the controller and used by the template
+  require('plugins/markdown_vis/markdown_vis_controller');
+
+  // register the provider with the visTypes registry so that other know it exists
+  require('ui/registry/vis_types').register(MarkdownVisProvider);
+
+  function MarkdownVisProvider(Private) {
+    var TemplateVisType = Private(require('ui/template_vis_type/TemplateVisType'));
+
+    // return the visType object, which kibana will use to display and configure new
+    // Vis object of this type.
+    return new TemplateVisType({
+      name: 'markdown',
+      title: 'Markdown widget',
+      icon: 'fa-code',
+      description: 'Useful for displaying explanations or instructions for dashboards.',
+      template: require('plugins/markdown_vis/markdown_vis.html'),
+      params: {
+        editor: require('plugins/markdown_vis/markdown_vis_params.html')
+      },
+      requiresSearch: false
+    });
+  }
+
+  // export the provider so that the visType can be required with Private()
+  return MarkdownVisProvider;
+});
diff --git a/src/plugins/markdown_vis/public/markdown_vis.less b/src/plugins/markdown_vis/public/markdown_vis.less
new file mode 100644
index 0000000000000..c626e5d893967
--- /dev/null
+++ b/src/plugins/markdown_vis/public/markdown_vis.less
@@ -0,0 +1,30 @@
+@import (reference) "~ui/styles/mixins.less";
+
+.markdown-vis {
+  padding: 1em;
+  width: 100%;
+}
+
+.vis-editor {
+
+  &.vis-type-markdown {
+
+    .visualization-options {
+      .flex-parent();
+      flex: 1 1 auto;
+    }
+
+    .markdown-vis-options {
+      .flex-parent();
+      flex: 1 1 auto;
+
+      textarea {
+        flex: 1 1 auto;
+        resize: none;
+      }
+
+    }
+
+  }
+
+}
diff --git a/src/plugins/markdown_vis/public/markdown_vis_controller.js b/src/plugins/markdown_vis/public/markdown_vis_controller.js
new file mode 100644
index 0000000000000..f8f35da06198c
--- /dev/null
+++ b/src/plugins/markdown_vis/public/markdown_vis_controller.js
@@ -0,0 +1,15 @@
+define(function (require) {
+  var marked = require('marked');
+  marked.setOptions({
+    gfm: true, // Github-flavored markdown
+    sanitize: true // Sanitize HTML tags
+  });
+
+  var module = require('ui/modules').get('kibana/markdown_vis', ['kibana']);
+  module.controller('KbnMarkdownVisController', function ($scope, $sce) {
+    $scope.$watch('vis.params.markdown', function (html) {
+      if (!html) return;
+      $scope.html = $sce.trustAsHtml(marked(html));
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/kibana/plugins/markdown_vis/markdown_vis_params.html b/src/plugins/markdown_vis/public/markdown_vis_params.html
similarity index 100%
rename from src/kibana/plugins/markdown_vis/markdown_vis_params.html
rename to src/plugins/markdown_vis/public/markdown_vis_params.html
diff --git a/src/plugins/metric_vis/index.js b/src/plugins/metric_vis/index.js
new file mode 100644
index 0000000000000..129211697e149
--- /dev/null
+++ b/src/plugins/metric_vis/index.js
@@ -0,0 +1,13 @@
+module.exports = function (kibana) {
+
+  return new kibana.Plugin({
+
+    uiExports: {
+      visTypes: [
+        'plugins/metric_vis/metric_vis'
+      ]
+    }
+
+  });
+
+};
diff --git a/src/plugins/metric_vis/package.json b/src/plugins/metric_vis/package.json
new file mode 100644
index 0000000000000..76c59dab399e5
--- /dev/null
+++ b/src/plugins/metric_vis/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "metric_vis",
+  "version": "1.0.0"
+}
diff --git a/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js b/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js
new file mode 100644
index 0000000000000..b1309ff569ebc
--- /dev/null
+++ b/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js
@@ -0,0 +1,62 @@
+
+describe('metric vis', function () {
+  var $scope;
+  var ngMock = require('ngMock');
+  var expect = require('expect.js');
+
+  var formatter = function (value) {
+    return value.toFixed(3);
+  };
+
+  beforeEach(ngMock.module('kibana/metric_vis'));
+  beforeEach(ngMock.inject(function ($rootScope, $controller) {
+    $scope = $rootScope.$new();
+    $controller('KbnMetricVisController', {$scope: $scope});
+    $scope.$digest();
+  }));
+
+  it('should set the metric label and value', function () {
+    $scope.processTableGroups({
+      tables: [{
+        columns: [{title: 'Count'}],
+        rows: [[4301021]],
+        aggConfig: function () {
+          return {
+            fieldFormatter: function () {
+              return formatter;
+            }
+          };
+        }
+      }]
+    });
+
+    expect($scope.metrics.length).to.be(1);
+    expect($scope.metrics[0].label).to.be('Count');
+    expect($scope.metrics[0].value).to.be('4301021.000');
+  });
+
+  it('should support multi-value metrics', function () {
+    $scope.processTableGroups({
+      tables: [{
+        columns: [
+          {title: '1st percentile of bytes'},
+          {title: '99th percentile of bytes'}
+        ],
+        rows: [[182, 445842.4634666484]],
+        aggConfig: function () {
+          return {
+            fieldFormatter: function () {
+              return formatter;
+            }
+          };
+        }
+      }]
+    });
+
+    expect($scope.metrics.length).to.be(2);
+    expect($scope.metrics[0].label).to.be('1st percentile of bytes');
+    expect($scope.metrics[0].value).to.be('182.000');
+    expect($scope.metrics[1].label).to.be('99th percentile of bytes');
+    expect($scope.metrics[1].value).to.be('445842.463');
+  });
+});
diff --git a/src/kibana/plugins/metric_vis/metric_vis.html b/src/plugins/metric_vis/public/metric_vis.html
similarity index 97%
rename from src/kibana/plugins/metric_vis/metric_vis.html
rename to src/plugins/metric_vis/public/metric_vis.html
index cb8e88d2c5feb..ef30d0404d8c1 100644
--- a/src/kibana/plugins/metric_vis/metric_vis.html
+++ b/src/plugins/metric_vis/public/metric_vis.html
@@ -3,4 +3,4 @@
         <div class="metric-value" ng-style="{'font-size': vis.params.fontSize+'pt'}">{{metric.value}}</div>
         <div>{{metric.label}}</div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/plugins/metric_vis/public/metric_vis.js b/src/plugins/metric_vis/public/metric_vis.js
new file mode 100644
index 0000000000000..8efbe17470f66
--- /dev/null
+++ b/src/plugins/metric_vis/public/metric_vis.js
@@ -0,0 +1,46 @@
+define(function (require) {
+  // we need to load the css ourselves
+  require('plugins/metric_vis/metric_vis.less');
+
+  // we also need to load the controller and used by the template
+  require('plugins/metric_vis/metric_vis_controller');
+
+  // register the provider with the visTypes registry
+  require('ui/registry/vis_types').register(MetricVisProvider);
+
+  function MetricVisProvider(Private) {
+    var TemplateVisType = Private(require('ui/template_vis_type/TemplateVisType'));
+    var Schemas = Private(require('ui/Vis/Schemas'));
+
+    // return the visType object, which kibana will use to display and configure new
+    // Vis object of this type.
+    return new TemplateVisType({
+      name: 'metric',
+      title: 'Metric',
+      description: 'One big number for all of your one big number needs. Perfect for show ' +
+        'a count of hits, or the exact average a numeric field.',
+      icon: 'fa-calculator',
+      template: require('plugins/metric_vis/metric_vis.html'),
+      params: {
+        defaults: {
+          fontSize: 60
+        },
+        editor: require('plugins/metric_vis/metric_vis_params.html')
+      },
+      schemas: new Schemas([
+        {
+          group: 'metrics',
+          name: 'metric',
+          title: 'Metric',
+          min: 1,
+          defaults: [
+            { type: 'count', schema: 'metric' }
+          ]
+        }
+      ])
+    });
+  }
+
+  // export the provider so that the visType can be required with Private()
+  return MetricVisProvider;
+});
diff --git a/src/plugins/metric_vis/public/metric_vis.less b/src/plugins/metric_vis/public/metric_vis.less
new file mode 100644
index 0000000000000..bc0b7244a5e34
--- /dev/null
+++ b/src/plugins/metric_vis/public/metric_vis.less
@@ -0,0 +1,21 @@
+@import (reference) "~ui/styles/mixins.less";
+
+.metric-vis {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: space-around;
+  align-items: center;
+  align-content: space-around;
+
+  .metric-value {
+    font-weight: bold;
+    .ellipsis();
+  }
+
+  .metric-container {
+    text-align: center;
+    padding: 1em;
+  }
+}
diff --git a/src/plugins/metric_vis/public/metric_vis_controller.js b/src/plugins/metric_vis/public/metric_vis_controller.js
new file mode 100644
index 0000000000000..3ac2ef17c7d22
--- /dev/null
+++ b/src/plugins/metric_vis/public/metric_vis_controller.js
@@ -0,0 +1,30 @@
+define(function (require) {
+  // get the kibana/metric_vis module, and make sure that it requires the "kibana" module if it
+  // didn't already
+  var module = require('ui/modules').get('kibana/metric_vis', ['kibana']);
+
+  module.controller('KbnMetricVisController', function ($scope, Private) {
+    var tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify'));
+
+    var metrics = $scope.metrics = [];
+
+    $scope.processTableGroups = function (tableGroups) {
+      tableGroups.tables.forEach(function (table) {
+        table.columns.forEach(function (column, i) {
+          var fieldFormatter = table.aggConfig(column).fieldFormatter();
+          metrics.push({
+            label: column.title,
+            value: fieldFormatter(table.rows[0][i])
+          });
+        });
+      });
+    };
+
+    $scope.$watch('esResponse', function (resp) {
+      if (resp) {
+        metrics.length = 0;
+        $scope.processTableGroups(tabifyAggResponse($scope.vis, resp));
+      }
+    });
+  });
+});
diff --git a/src/kibana/plugins/metric_vis/metric_vis_params.html b/src/plugins/metric_vis/public/metric_vis_params.html
similarity index 100%
rename from src/kibana/plugins/metric_vis/metric_vis_params.html
rename to src/plugins/metric_vis/public/metric_vis_params.html
diff --git a/src/plugins/spyModes/index.js b/src/plugins/spyModes/index.js
new file mode 100644
index 0000000000000..cbcc86e2012da
--- /dev/null
+++ b/src/plugins/spyModes/index.js
@@ -0,0 +1,10 @@
+module.exports = function (kibana) {
+  return new kibana.Plugin({
+    uiExports: {
+      spyModes: [
+        '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 0000000000000..e5f8c52a1f4a8
--- /dev/null
+++ b/src/plugins/spyModes/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "spyModes",
+  "version": "1.0.0"
+}
diff --git a/src/kibana/components/visualize/spy/_req_resp_stats.html b/src/plugins/spyModes/public/reqRespStatsSpyMode.html
similarity index 100%
rename from src/kibana/components/visualize/spy/_req_resp_stats.html
rename to src/plugins/spyModes/public/reqRespStatsSpyMode.html
diff --git a/src/plugins/spyModes/public/reqRespStatsSpyMode.js b/src/plugins/spyModes/public/reqRespStatsSpyMode.js
new file mode 100644
index 0000000000000..94f9c6ecb8bbf
--- /dev/null
+++ b/src/plugins/spyModes/public/reqRespStatsSpyMode.js
@@ -0,0 +1,57 @@
+define(function (require) {
+  var _ = require('lodash');
+  var reqRespStatsHTML = require('plugins/spyModes/reqRespStatsSpyMode.html');
+
+  var linkReqRespStats = function ($scope, config) {
+    $scope.$bind('req', 'searchSource.history[searchSource.history.length - 1]');
+    $scope.$watchMulti([
+      'req',
+      'req.started',
+      'req.stopped',
+      'searchSource'
+    ], function () {
+      if (!$scope.searchSource || !$scope.req) return;
+
+      var req = $scope.req;
+      var resp = $scope.req.resp;
+      var stats = $scope.stats = [];
+
+      if (resp && resp.took != null) stats.push(['Query Duration', resp.took + 'ms']);
+      if (req && req.ms != null) stats.push(['Request Duration', req.ms + 'ms']);
+      if (resp && resp.hits) stats.push(['Hits', resp.hits.total]);
+
+      if (req.fetchParams.index) stats.push(['Index', req.fetchParams.index]);
+      if (req.fetchParams.type) stats.push(['Type', req.fetchParams.type]);
+      if (req.fetchParams.id) stats.push(['Id', req.fetchParams.id]);
+    });
+  };
+
+  require('ui/registry/spy_modes')
+  .register(function () {
+    return {
+      name: 'request',
+      display: 'Request',
+      order: 2,
+      template: reqRespStatsHTML,
+      link: linkReqRespStats
+    };
+  })
+  .register(function () {
+    return {
+      name: 'response',
+      display: 'Response',
+      order: 3,
+      template: reqRespStatsHTML,
+      link: linkReqRespStats
+    };
+  })
+  .register(function () {
+    return {
+      name: 'stats',
+      display: 'Statistics',
+      order: 4,
+      template: reqRespStatsHTML,
+      link: linkReqRespStats
+    };
+  });
+});
diff --git a/src/kibana/components/visualize/spy/_table.html b/src/plugins/spyModes/public/tableSpyMode.html
similarity index 100%
rename from src/kibana/components/visualize/spy/_table.html
rename to src/plugins/spyModes/public/tableSpyMode.html
diff --git a/src/plugins/spyModes/public/tableSpyMode.js b/src/plugins/spyModes/public/tableSpyMode.js
new file mode 100644
index 0000000000000..97eac984b0914
--- /dev/null
+++ b/src/plugins/spyModes/public/tableSpyMode.js
@@ -0,0 +1,40 @@
+define(function (require) {
+  function VisSpyTableProvider(Notifier, $filter, $rootScope, config, Private) {
+    var _ = require('lodash');
+    var saveAs = require('@spalger/filesaver').saveAs;
+    var tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify'));
+
+    var PER_PAGE_DEFAULT = 10;
+
+    require('ui/agg_table');
+
+    return {
+      name: 'table',
+      display: 'Table',
+      order: 1,
+      template: require('plugins/spyModes/tableSpyMode.html'),
+      link: function tableLinkFn($scope, $el) {
+        $rootScope.$watchMulti.call($scope, [
+          'vis',
+          'esResp'
+        ], function () {
+          if (!$scope.vis || !$scope.esResp) {
+            $scope.table = null;
+          } else {
+            if (!$scope.editableVis.params.spyPerPage) {
+              $scope.editableVis.params.spyPerPage = PER_PAGE_DEFAULT;
+            }
+
+            $scope.table = tabifyAggResponse($scope.vis, $scope.esResp, {
+              canSplit: false,
+              asAggConfigResults: true,
+              partialRows: true
+            });
+          }
+        });
+      }
+    };
+  }
+
+  require('ui/registry/spy_modes').register(VisSpyTableProvider);
+});
diff --git a/src/plugins/statusPage/index.js b/src/plugins/statusPage/index.js
new file mode 100644
index 0000000000000..ca95adecb2b62
--- /dev/null
+++ b/src/plugins/statusPage/index.js
@@ -0,0 +1,33 @@
+module.exports = function (kibana) {
+  return new kibana.Plugin({
+    uiExports: {
+      app: {
+        title: 'Server Status',
+        main: 'plugins/statusPage/statusPage',
+        hidden: true,
+
+        autoload: [].concat(
+          kibana.autoload.styles,
+          'ui/chrome',
+          'angular'
+        )
+      },
+
+      modules: {
+        nvd3$: {
+          path: 'nvd3/build/nv.d3.js',
+          exports: 'window.nv',
+          imports: 'd3,nvd3Styles'
+        },
+        nvd3Styles$: {
+          path: 'nvd3/build/nv.d3.css'
+        }
+      },
+
+      loaders: [
+        { test: /\/angular-nvd3\//, loader: 'imports?angular,nv=nvd3,d3' }
+      ]
+    }
+  });
+};
+
diff --git a/src/plugins/statusPage/package.json b/src/plugins/statusPage/package.json
new file mode 100644
index 0000000000000..853b935ec57e9
--- /dev/null
+++ b/src/plugins/statusPage/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "statusPage",
+  "version": "1.0.0"
+}
diff --git a/src/plugins/statusPage/public/lib/formatNumber.js b/src/plugins/statusPage/public/lib/formatNumber.js
new file mode 100644
index 0000000000000..71973497c857a
--- /dev/null
+++ b/src/plugins/statusPage/public/lib/formatNumber.js
@@ -0,0 +1,19 @@
+
+var moment = require('moment');
+var numeral = require('numeral');
+
+module.exports = function formatNumber(num, which) {
+  var format = '0.00';
+  var postfix = '';
+  switch (which) {
+    case 'time':
+      return moment(num).format('HH:mm:ss');
+    case 'byte':
+      format += 'b';
+      break;
+    case 'ms':
+      postfix = 'ms';
+      break;
+  }
+  return numeral(num).format(format) + postfix;
+};
diff --git a/src/plugins/statusPage/public/lib/makeChartOptions.js b/src/plugins/statusPage/public/lib/makeChartOptions.js
new file mode 100644
index 0000000000000..b7a8783c84396
--- /dev/null
+++ b/src/plugins/statusPage/public/lib/makeChartOptions.js
@@ -0,0 +1,28 @@
+
+var formatNumber = require('./formatNumber');
+
+module.exports = function makeChartOptions(type) {
+  return {
+    chart: {
+      type: 'lineChart',
+      height: 200,
+      showLegend: false,
+      showXAxis: false,
+      showYAxis: false,
+      useInteractiveGuideline: true,
+      tooltips: true,
+      pointSize: 0,
+      color: ['#444', '#777', '#aaa'],
+      margin: {
+        top: 10,
+        left: 0,
+        right: 0,
+        bottom: 20
+      },
+      xAxis: { tickFormat: function (d) { return formatNumber(d, 'time'); } },
+      yAxis: { tickFormat: function (d) { return formatNumber(d, type); }, },
+      y: function (d) { return d.y; },
+      x: function (d) { return d.x; }
+    }
+  };
+};
diff --git a/src/plugins/statusPage/public/lib/readStatData.js b/src/plugins/statusPage/public/lib/readStatData.js
new file mode 100644
index 0000000000000..1bfe56392fe29
--- /dev/null
+++ b/src/plugins/statusPage/public/lib/readStatData.js
@@ -0,0 +1,39 @@
+var _ = require('lodash');
+
+module.exports = function readStatData(data, seriesNames) {
+  // Metric Values format
+  // metric: [[xValue, yValue], ...]
+  // LoadMetric:
+  // metric: [[xValue, [yValue, yValue2, yValue3]], ...]
+  // return [
+  //    {type: 'line', key: name, yAxis: 1, values: [{x: xValue, y: yValue}, ...]},
+  //    {type: 'line', key: name, yAxis: 1, values: [{x: xValue, y: yValue1}, ...]},
+  //    {type: 'line', key: name, yAxis: 1, values: [{x: xValue, y: yValue2}, ...]}]
+  //
+  // Go through all of the metric values and split the values out.
+  // returns an array of all of the averages
+
+  var metricList = [];
+  seriesNames = seriesNames || [];
+  data.forEach(function (vector) {
+    vector = _.flatten(vector);
+    var x = vector.shift();
+    vector.forEach(function (yValue, i) {
+      var series = seriesNames[i] || '';
+
+      if (!metricList[i]) {
+        metricList[i] = {
+          key: series,
+          values: []
+        };
+      }
+      // unshift to make sure they're in the correct order
+      metricList[i].values.unshift({
+        x: x,
+        y: yValue
+      });
+    });
+  });
+
+  return metricList;
+};
diff --git a/src/plugins/statusPage/public/lib/toTitleCase.js b/src/plugins/statusPage/public/lib/toTitleCase.js
new file mode 100644
index 0000000000000..e7f4a1d33a4fa
--- /dev/null
+++ b/src/plugins/statusPage/public/lib/toTitleCase.js
@@ -0,0 +1,10 @@
+var _ = require('lodash');
+
+// Turns thisIsASentence to
+// This Is A Sentence
+module.exports = function toTitleCase(name) {
+  return name
+  .split(/(?=[A-Z])/)
+  .map(function (word) { return word[0].toUpperCase() + _.rest(word).join(''); })
+  .join(' ');
+};
diff --git a/src/plugins/statusPage/public/statusPage.html b/src/plugins/statusPage/public/statusPage.html
new file mode 100644
index 0000000000000..7ee7a28dbddbe
--- /dev/null
+++ b/src/plugins/statusPage/public/statusPage.html
@@ -0,0 +1,48 @@
+<div class="container">
+  <header>
+    <h1>
+      <strong>Kibana</strong>&nbsp;Status Page
+    </h1>
+  </header>
+
+  <section class="section">
+    <h4>What is this page?</h4>
+    <p>This page is your sanity check, and your savior. You can check for potential problems</p>
+    <p>Here is the status of your kibana instance and the plugins you have installed along with some, statistics to asses potential problems.</p>
+  </section>
+
+  <div class="system_status_wrapper state_default state_{{ui.serverState}}">
+
+    <h3 class="title">
+      <b>System Status</b> {{ ui.serverStateMessage }}
+    </h3>
+
+    <div ng-if="!ui.statuses && ui.loading" class="loading_statuses">
+      <span class="spinner"></span>
+    </div>
+
+    <h4 ng-if="!ui.statuses && !ui.loading" class="missing_statuses">
+      No status information available
+    </h4>
+
+    <table class="status_breakdown" ng-if="ui.statuses">
+      <tr>
+        <th class="col-xs-1">Name</th>
+        <th class="col-xs-11">Description</th>
+      </tr>
+      <tr ng-repeat="status in ui.statuses" class="status_row state_default state_{{status.state}}">
+        <td class="col-xs-1 status_name">{{status.name}}</td>
+        <td class="col-xs-11 status_message">{{status.message}}</td>
+      </tr>
+    </table>
+
+  </div>
+
+  <h2>Server Metrics</h2>
+  <p>Interval of 5 seconds, with a max history of 5 minutes.</p>
+  <div id="chart_cont" class="row">
+    <div ng-repeat="(name, data) in ui.metrics">
+      <status-page-metric name="{{name}}" data="data"></status-page-metric>
+    </div>
+  </div>
+</div>
diff --git a/src/plugins/statusPage/public/statusPage.js b/src/plugins/statusPage/public/statusPage.js
new file mode 100644
index 0000000000000..6e44269d40ead
--- /dev/null
+++ b/src/plugins/statusPage/public/statusPage.js
@@ -0,0 +1,58 @@
+var $ = require('jquery');
+var _ = require('lodash');
+var notify = require('ui/notify');
+
+require('plugins/statusPage/statusPageMetric');
+require('plugins/statusPage/statusPage.less');
+
+require('ui/chrome')
+.setTabs([
+  {
+    id: '',
+    title: 'Server Status'
+  }
+])
+.setRootTemplate(require('plugins/statusPage/statusPage.html'))
+.setRootController('ui', function ($http, $scope) {
+  var ui = this;
+  ui.loading = false;
+
+  ui.refresh = function () {
+    ui.loading = true;
+
+    // go ahead and get the info you want
+    return $http
+    .get('/api/status')
+    .then(function (resp) {
+      if (ui.fetchError) {
+        ui.fetchError.clear();
+        ui.fetchError = null;
+      }
+
+      var data = resp.data;
+      ui.metrics = data.metrics;
+      ui.statuses = data.status.statuses;
+
+      var overall = data.status.overall;
+      if (!ui.serverState || (ui.serverState !== overall.state)) {
+        ui.serverState = overall.state;
+        ui.serverStateMessage = overall.nickname || overall.title;
+      }
+    })
+    .catch(function () {
+      if (ui.fetchError) return;
+      ui.fetchError = notify.error('Failed to request server ui. Perhaps your server is down?');
+      ui.metrics = ui.statuses = ui.overall = null;
+    })
+    .then(function () {
+      ui.loading = false;
+    });
+  };
+
+  ui.refresh();
+
+  // let the browser decide when to slow down requests
+  setInterval(function () {
+    $scope.$eval(ui.refresh);
+  }, 5000);
+});
diff --git a/src/plugins/statusPage/public/statusPage.less b/src/plugins/statusPage/public/statusPage.less
new file mode 100644
index 0000000000000..6b67581f79098
--- /dev/null
+++ b/src/plugins/statusPage/public/statusPage.less
@@ -0,0 +1,126 @@
+.section {
+  margin-bottom:15px;
+}
+
+.status_breakdown {
+  margin:0 15px 15px 15px;
+
+  .status_row {
+    height:30px;
+    line-height:30px;
+    + .status_row {
+      border-top:1px solid #ebebeb;
+    }
+  }
+
+  th {
+    font-size:10px;
+    color:#a9a9a9;
+    height:25px;
+    line-height:25px;
+  }
+
+  .status_name {
+    font-weight:bold;
+    padding:0px 5px;
+  }
+
+  .status_message {
+    border-left:1px solid #ebebeb;
+    padding:0;
+    padding-left:15px;
+  }
+}
+
+.system_status_wrapper {
+  .missing_statuses,
+  .loading_statuses {
+    padding: 20px;
+    text-align: center;
+  }
+}
+
+.status_chart_wrapper {
+  border-top:1px solid #ebebeb;
+  border-left:1px solid #ebebeb;
+  .average {
+    font-size: 42px;
+    line-height:45px;
+    margin-top:0;
+    font-weight:bold;
+  }
+  .title {
+    margin:0 0 5px 0;
+    text-transform:capitalize;
+  }
+}
+
+#chart_cont {
+  margin-top:35px;
+}
+
+.status_chart_wrapper:nth-child(2), .status_chart_wrapper:nth-child(3) {
+  border-top:0 none transparent;
+}
+
+.status_chart_wrapper:first-child {
+  border-top:0 none transparent;
+  border-left:0 none transparent;
+}
+
+.status_chart_wrapper:nth-child(3n + 1) {
+  border-left:0 none transparent;
+}
+
+.status_chart_wrapper:nth-child(n + 4) {
+  padding-top:20px;
+}
+
+.nv-axis.nv-x .tick line {
+  display:none;
+}
+
+.state(@primary, @secondary) {
+  &.system_status_wrapper {
+    border:1px solid @primary;
+    border-radius:5px;
+    overflow: hidden;
+
+    .title {
+      color:#ffffff;
+      height:50px;
+      line-height:50px;
+      margin:0 0 10px 0;
+      padding:0 15px;
+      border-color:@primary;
+      background:@primary;
+      background:-moz-linear-gradient(left,@primary 0%,@secondary 100%);
+      background:-webkit-gradient(linear,left top,right top,color-stop(0%,@primary),color-stop(100%,@secondary));
+      background:-webkit-linear-gradient(left,@primary 0%,@secondary 100%);
+      background:-o-linear-gradient(left,@primary 0%,@secondary 100%);
+      background:-ms-linear-gradient(left,@primary 0%,@secondary 100%);
+      background:linear-gradient(to right,@primary 0%,@secondary 100%);
+      filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=@primary,endColorstr=@secondary,GradientType=1);
+    }
+  }
+
+  &.status_row {
+    color: @primary;
+  }
+}
+
+.state_default {
+  .state(#7C7C7C, #CFCFCF);
+}
+
+.state_green {
+  .state(#0a8e03, #96f501);
+}
+
+.state_yellow {
+  .state(#fdee00, #c16f00);
+}
+
+.state_red {
+  .state(#da1e04, #ff730f);
+}
diff --git a/src/plugins/statusPage/public/statusPageMetric.html b/src/plugins/statusPage/public/statusPageMetric.html
new file mode 100644
index 0000000000000..3e36daa900574
--- /dev/null
+++ b/src/plugins/statusPage/public/statusPageMetric.html
@@ -0,0 +1,5 @@
+<div class="status_chart_wrapper col-md-4">
+  <h3 class="title">{{metric.title}}</h3>
+  <h4 class="average">{{ metric.averages.join(', ') }}</h4>
+  <nvd3 options="metric.chartOptions" data="metric.chartData"></nvd3>
+</div>
diff --git a/src/plugins/statusPage/public/statusPageMetric.js b/src/plugins/statusPage/public/statusPageMetric.js
new file mode 100644
index 0000000000000..9d15c227d6668
--- /dev/null
+++ b/src/plugins/statusPage/public/statusPageMetric.js
@@ -0,0 +1,66 @@
+var _ = require('lodash');
+var moment = require('moment');
+var numeral = require('numeral');
+require('angular-nvd3');
+
+var toTitleCase = require('./lib/toTitleCase');
+var formatNumber = require('./lib/formatNumber');
+var getChartOptions = _.memoize(require('./lib/makeChartOptions'));
+var readStatData = require('./lib/readStatData');
+
+function calcAvg(metricList, metricNumberType) {
+  return metricList.map(function (data) {
+    var uglySum = data.values.reduce(function (sumSoFar, vector) {
+      return sumSoFar + vector.y;
+    }, 0);
+    return formatNumber(uglySum / data.values.length, metricNumberType);
+  });
+}
+
+require('ui/modules')
+.get('kibana', ['nvd3'])
+.directive('statusPageMetric', function () {
+  return {
+    restrict: 'E',
+    template: require('plugins/statusPage/statusPageMetric.html'),
+    scope: {
+      name: '@',
+      data: '='
+    },
+    controllerAs: 'metric',
+    controller: function ($scope) {
+      var self = this;
+
+      self.name = $scope.name;
+      self.title = toTitleCase(self.name);
+      self.numberType = 'precise';
+      self.seriesNames = [];
+
+      switch (self.name) {
+        case 'heapTotal':
+        case 'heapUsed':
+        case 'rss':
+          self.numberType = 'byte';
+          break;
+
+        case 'delay':
+        case 'responseTimeAvg':
+        case 'responseTimeMax':
+          self.numberType = 'ms';
+          break;
+
+        case 'load':
+          self.seriesNames = ['1min', '5min', '15min'];
+          break;
+      }
+
+      self.chartOptions = getChartOptions(self.numberType);
+
+      $scope.$watch('data', function (data) {
+        self.rawData = data;
+        self.chartData = readStatData(self.rawData, self.seriesNames);
+        self.averages = calcAvg(self.chartData, self.numberType);
+      });
+    }
+  };
+});
diff --git a/src/plugins/table_vis/index.js b/src/plugins/table_vis/index.js
new file mode 100644
index 0000000000000..438e8cee479cf
--- /dev/null
+++ b/src/plugins/table_vis/index.js
@@ -0,0 +1,11 @@
+module.exports = function (kibana) {
+
+  return new kibana.Plugin({
+    uiExports: {
+      visTypes: [
+        'plugins/table_vis/table_vis'
+      ]
+    }
+  });
+
+};
diff --git a/src/plugins/table_vis/package.json b/src/plugins/table_vis/package.json
new file mode 100644
index 0000000000000..cc3d0ef348c9c
--- /dev/null
+++ b/src/plugins/table_vis/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "table_vis",
+  "version": "1.0.0"
+}
diff --git a/src/plugins/table_vis/public/__tests__/_table_vis.js b/src/plugins/table_vis/public/__tests__/_table_vis.js
new file mode 100644
index 0000000000000..48bb55c30dc7c
--- /dev/null
+++ b/src/plugins/table_vis/public/__tests__/_table_vis.js
@@ -0,0 +1,133 @@
+describe('Integration', function () {
+  var $ = require('jquery');
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+  var sinon = require('auto-release-sinon');
+
+  var $rootScope;
+  var TableGroup;
+  var $compile;
+  var $scope;
+  var $el;
+  var Vis;
+  var indexPattern;
+  var fixtures;
+
+  beforeEach(ngMock.module('kibana', 'kibana/table_vis'));
+  beforeEach(ngMock.inject(function (Private, $injector) {
+    $rootScope = $injector.get('$rootScope');
+    $compile = $injector.get('$compile');
+    fixtures = require('fixtures/fake_hierarchical_data');
+    TableGroup = Private(require('ui/agg_response/tabify/_table_group'));
+    Vis = Private(require('ui/Vis'));
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+  }));
+
+  // basically a parameterized beforeEach
+  function init(vis, esResponse) {
+    vis.aggs.forEach(function (agg, i) { agg.id = 'agg_' + (i + 1); });
+
+    $rootScope.vis = vis;
+    $rootScope.esResponse = esResponse;
+    $el = $('<visualize vis="vis" es-resp="esResponse">');
+    $compile($el)($rootScope);
+    $rootScope.$apply();
+
+    $scope = $el.isolateScope();
+  }
+
+  function OneRangeVis(params) {
+    return new Vis(indexPattern, {
+      type: 'table',
+      params: params || {},
+      aggs: [
+        { type: 'count', schema: 'metric' },
+        {
+          type: 'range',
+          schema: 'bucket',
+          params: {
+            field: 'bytes',
+            ranges: [
+              { from: 0, to: 1000 },
+              { from: 1000, to: 2000 }
+            ]
+          }
+        }
+      ]
+    });
+  }
+
+  function ThreeTermVis(params) {
+    return new Vis(indexPattern, {
+      type: 'table',
+      params: params,
+      aggs: [
+        { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
+        {
+          type: 'terms',
+          schema: 'split',
+          params: {
+            field: 'extension'
+          }
+        },
+        {
+          type: 'terms',
+          schema: 'bucket',
+          params: {
+            field: 'geo.src'
+          }
+        },
+        {
+          type: 'terms',
+          schema: 'bucket',
+          params: {
+            field: 'machine.os'
+          }
+        }
+      ]
+    });
+  }
+
+  it('passes the table groups to the kbnAggTableGroup directive', function () {
+    init(OneRangeVis(), fixtures.oneRangeBucket);
+
+    var $atg = $el.find('kbn-agg-table-group').first();
+    expect($atg.size()).to.be(1);
+    expect($atg.attr('group')).to.be('tableGroups');
+    expect($atg.isolateScope().group).to.be($atg.scope().tableGroups);
+  });
+
+  it('displays an error if the search had no hits', function () {
+    init(OneRangeVis(), { hits: { total: 0, hits: [] }});
+
+    expect($el.find('kbn-agg-table-group').size()).to.be(0);
+
+    var $err = $el.find('.table-vis-error');
+    expect($err.size()).to.be(1);
+    expect($err.text().trim()).to.be('No results found');
+  });
+
+  it('displays an error if the search hits, but didn\'t create any rows', function () {
+    var visParams = {
+      showPartialRows: false,
+      metricsAtAllLevels: true
+    };
+
+    var resp = _.cloneDeep(fixtures.threeTermBuckets);
+    resp.aggregations.agg_2.buckets.forEach(function (extensionBucket) {
+      extensionBucket.agg_3.buckets.forEach(function (countryBucket) {
+        // clear all the machine os buckets
+        countryBucket.agg_4.buckets = [];
+      });
+    });
+
+    init(ThreeTermVis(visParams), resp);
+
+    expect($el.find('kbn-agg-table-group').size()).to.be(0);
+
+    var $err = $el.find('.table-vis-error');
+    expect($err.size()).to.be(1);
+    expect($err.text().trim()).to.be('No results found');
+  });
+});
diff --git a/src/plugins/table_vis/public/__tests__/_table_vis_controller.js b/src/plugins/table_vis/public/__tests__/_table_vis_controller.js
new file mode 100644
index 0000000000000..2c636b932eb49
--- /dev/null
+++ b/src/plugins/table_vis/public/__tests__/_table_vis_controller.js
@@ -0,0 +1,170 @@
+describe('Controller', function () {
+  var $ = require('jquery');
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+  var sinon = require('auto-release-sinon');
+
+  var $rootScope;
+  var TableGroup;
+  var $compile;
+  var Private;
+  var $scope;
+  var $el;
+  var Vis;
+  var fixtures;
+
+  beforeEach(ngMock.module('kibana', 'kibana/table_vis'));
+  beforeEach(ngMock.inject(function ($injector) {
+    Private = $injector.get('Private');
+    $rootScope = $injector.get('$rootScope');
+    $compile = $injector.get('$compile');
+    fixtures = require('fixtures/fake_hierarchical_data');
+    TableGroup = Private(require('ui/agg_response/tabify/_table_group'));
+    Vis = Private(require('ui/Vis'));
+  }));
+
+  function OneRangeVis(params) {
+    return new Vis(
+      Private(require('fixtures/stubbed_logstash_index_pattern')),
+      {
+        type: 'table',
+        params: params || {},
+        aggs: [
+          { type: 'count', schema: 'metric' },
+          {
+            type: 'range',
+            schema: 'bucket',
+            params: {
+              field: 'bytes',
+              ranges: [
+                { from: 0, to: 1000 },
+                { from: 1000, to: 2000 }
+              ]
+            }
+          }
+        ]
+      }
+    );
+  }
+
+  // basically a parameterized beforeEach
+  function initController(vis) {
+    vis.aggs.forEach(function (agg, i) { agg.id = 'agg_' + (i + 1); });
+
+    $rootScope.vis = vis;
+    $rootScope.newScope = function (scope) { $scope = scope; };
+
+    $el = $('<div>')
+      .attr('ng-controller', 'KbnTableVisController')
+      .attr('ng-init', 'newScope(this)');
+
+    $compile($el)($rootScope);
+  }
+
+  // put a response into the controller
+  function attachEsResponseToScope(resp) {
+    $rootScope.esResponse = resp || fixtures.oneRangeBucket;
+    $rootScope.$apply();
+  }
+
+  // remove the response from the controller
+  function removeEsResponseFromScope() {
+    delete $rootScope.esResponse;
+    $rootScope.$apply();
+  }
+
+  it('exposes #tableGroups and #hasSomeRows when a response is attached to scope', function () {
+    initController(OneRangeVis());
+
+    expect(!$scope.tableGroups).to.be.ok();
+    expect(!$scope.hasSomeRows).to.be.ok();
+
+    attachEsResponseToScope(fixtures.oneRangeBucket);
+
+    expect($scope.hasSomeRows).to.be(true);
+    expect($scope.tableGroups).to.have.property('tables');
+    expect($scope.tableGroups.tables).to.have.length(1);
+    expect($scope.tableGroups.tables[0].columns).to.have.length(2);
+    expect($scope.tableGroups.tables[0].rows).to.have.length(2);
+  });
+
+  it('clears #tableGroups and #hasSomeRows when the response is removed', function () {
+    initController(OneRangeVis());
+
+    attachEsResponseToScope(fixtures.oneRangeBucket);
+    removeEsResponseFromScope();
+
+    expect(!$scope.hasSomeRows).to.be.ok();
+    expect(!$scope.tableGroups).to.be.ok();
+  });
+
+  it('sets #hasSomeRows properly if the table group is empty', function () {
+    initController(OneRangeVis());
+
+    // modify the data to not have any buckets
+    var resp = _.cloneDeep(fixtures.oneRangeBucket);
+    resp.aggregations.agg_2.buckets = {};
+
+    attachEsResponseToScope(resp);
+
+    expect($scope.hasSomeRows).to.be(false);
+    expect(!$scope.tableGroups).to.be.ok();
+  });
+
+  it('passes partialRows:true to tabify based on the vis params', function () {
+    // spy on the tabify private module
+    var tabifyPm = require('ui/agg_response/tabify/tabify');
+    var spiedTabify = sinon.spy(Private(tabifyPm));
+    Private.stub(tabifyPm, spiedTabify);
+
+    var vis = OneRangeVis({ showPartialRows: true });
+    initController(vis);
+    attachEsResponseToScope(fixtures.oneRangeBucket);
+
+    expect(spiedTabify).to.have.property('callCount', 1);
+    expect(spiedTabify.firstCall.args[2]).to.have.property('partialRows', true);
+  });
+
+  it('passes partialRows:false to tabify based on the vis params', function () {
+    // spy on the tabify private module
+    var tabifyPm = require('ui/agg_response/tabify/tabify');
+    var spiedTabify = sinon.spy(Private(tabifyPm));
+    Private.stub(tabifyPm, spiedTabify);
+
+    var vis = OneRangeVis({ showPartialRows: false });
+    initController(vis);
+    attachEsResponseToScope(fixtures.oneRangeBucket);
+
+    expect(spiedTabify).to.have.property('callCount', 1);
+    expect(spiedTabify.firstCall.args[2]).to.have.property('partialRows', false);
+  });
+
+  it('passes partialRows:true to tabify based on the vis params', function () {
+    // spy on the tabify private module
+    var tabifyPm = require('ui/agg_response/tabify/tabify');
+    var spiedTabify = sinon.spy(Private(tabifyPm));
+    Private.stub(tabifyPm, spiedTabify);
+
+    var vis = OneRangeVis({ showPartialRows: true });
+    initController(vis);
+    attachEsResponseToScope(fixtures.oneRangeBucket);
+
+    expect(spiedTabify).to.have.property('callCount', 1);
+    expect(spiedTabify.firstCall.args[2]).to.have.property('partialRows', true);
+  });
+
+  it('passes partialRows:false to tabify based on the vis params', function () {
+    // spy on the tabify private module
+    var tabifyPm = require('ui/agg_response/tabify/tabify');
+    var spiedTabify = sinon.spy(Private(tabifyPm));
+    Private.stub(tabifyPm, spiedTabify);
+
+    var vis = OneRangeVis({ showPartialRows: false });
+    initController(vis);
+    attachEsResponseToScope(fixtures.oneRangeBucket);
+
+    expect(spiedTabify).to.have.property('callCount', 1);
+    expect(spiedTabify.firstCall.args[2]).to.have.property('partialRows', false);
+  });
+});
diff --git a/src/plugins/table_vis/public/__tests__/index.js b/src/plugins/table_vis/public/__tests__/index.js
new file mode 100644
index 0000000000000..c1bef98f8f93f
--- /dev/null
+++ b/src/plugins/table_vis/public/__tests__/index.js
@@ -0,0 +1,4 @@
+describe('Table Vis', function () {
+  require('./_table_vis_controller');
+  require('./_table_vis');
+});
diff --git a/src/kibana/plugins/table_vis/table_vis.html b/src/plugins/table_vis/public/table_vis.html
similarity index 100%
rename from src/kibana/plugins/table_vis/table_vis.html
rename to src/plugins/table_vis/public/table_vis.html
diff --git a/src/kibana/plugins/table_vis/table_vis.js b/src/plugins/table_vis/public/table_vis.js
similarity index 77%
rename from src/kibana/plugins/table_vis/table_vis.js
rename to src/plugins/table_vis/public/table_vis.js
index 6c15cb57cf48c..a912925950f6c 100644
--- a/src/kibana/plugins/table_vis/table_vis.js
+++ b/src/plugins/table_vis/public/table_vis.js
@@ -1,6 +1,6 @@
 define(function (require) {
   // we need to load the css ourselves
-  require('css!plugins/table_vis/table_vis.css');
+  require('plugins/table_vis/table_vis.less');
 
   // we also need to load the controller and used by the template
   require('plugins/table_vis/table_vis_controller');
@@ -9,13 +9,16 @@ define(function (require) {
   require('plugins/table_vis/table_vis_params');
 
   // require the directives that we use as well
-  require('components/agg_table/agg_table');
-  require('components/agg_table/agg_table_group');
+  require('ui/agg_table');
+  require('ui/agg_table/agg_table_group');
+
+  // register the provider with the visTypes registry
+  require('ui/registry/vis_types').register(TableVisTypeProvider);
 
   // define the TableVisType
-  return function TableVisTypeProvider(Private) {
-    var TemplateVisType = Private(require('components/template_vis_type/TemplateVisType'));
-    var Schemas = Private(require('components/vis/Schemas'));
+  function TableVisTypeProvider(Private) {
+    var TemplateVisType = Private(require('ui/template_vis_type/TemplateVisType'));
+    var Schemas = Private(require('ui/Vis/Schemas'));
 
     // define the TableVisController which is used in the template
     // by angular's ng-controller directive
@@ -28,7 +31,7 @@ define(function (require) {
       icon: 'fa-table',
       description: 'The data table provides a detailed breakdown, in tabular format, of the results of a composed ' +
         'aggregation. Tip, a data table is available from many other charts by clicking grey bar at the bottom of the chart.',
-      template: require('text!plugins/table_vis/table_vis.html'),
+      template: require('plugins/table_vis/table_vis.html'),
       params: {
         defaults: {
           perPage: 10,
@@ -62,5 +65,7 @@ define(function (require) {
         }
       ])
     });
-  };
+  }
+
+  return TableVisTypeProvider;
 });
diff --git a/src/plugins/table_vis/public/table_vis.less b/src/plugins/table_vis/public/table_vis.less
new file mode 100644
index 0000000000000..c8effbca2028d
--- /dev/null
+++ b/src/plugins/table_vis/public/table_vis.less
@@ -0,0 +1,28 @@
+.table-vis {
+  display: flex;
+  flex-direction: column;
+  flex: 1 0 100%;
+
+  &-error {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    flex: 1 0 100%;
+
+    text-align: center;
+  }
+
+  &-container {
+    kbn-agg-table-group > .table > tbody > tr > td {
+      border-top: 0px;
+    }
+
+    .pagination-other-pages {
+      justify-content: flex-end;
+    }
+
+    .pagination-size {
+      display: none;
+    }
+  }
+}
diff --git a/src/kibana/plugins/table_vis/table_vis_controller.js b/src/plugins/table_vis/public/table_vis_controller.js
similarity index 88%
rename from src/kibana/plugins/table_vis/table_vis_controller.js
rename to src/plugins/table_vis/public/table_vis_controller.js
index acc64c2b51b21..970e82f025d97 100644
--- a/src/kibana/plugins/table_vis/table_vis_controller.js
+++ b/src/plugins/table_vis/public/table_vis_controller.js
@@ -1,12 +1,12 @@
 define(function (require) {
   // get the kibana/table_vis module, and make sure that it requires the "kibana" module if it
   // didn't already
-  var module = require('modules').get('kibana/table_vis', ['kibana']);
+  var module = require('ui/modules').get('kibana/table_vis', ['kibana']);
 
   // add a controller to tha module, which will transform the esResponse into a
   // tabular format that we can pass to the table directive
   module.controller('KbnTableVisController', function ($scope, Private) {
-    var tabifyAggResponse = Private(require('components/agg_response/tabify/tabify'));
+    var tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify'));
 
     $scope.$watch('esResponse', function (resp, oldResp) {
       var tableGroups = $scope.tableGroups = null;
diff --git a/src/kibana/plugins/table_vis/table_vis_params.html b/src/plugins/table_vis/public/table_vis_params.html
similarity index 100%
rename from src/kibana/plugins/table_vis/table_vis_params.html
rename to src/plugins/table_vis/public/table_vis_params.html
diff --git a/src/kibana/plugins/table_vis/table_vis_params.js b/src/plugins/table_vis/public/table_vis_params.js
similarity index 83%
rename from src/kibana/plugins/table_vis/table_vis_params.js
rename to src/plugins/table_vis/public/table_vis_params.js
index d8f564682e16a..175a08aa41ae2 100644
--- a/src/kibana/plugins/table_vis/table_vis_params.js
+++ b/src/plugins/table_vis/public/table_vis_params.js
@@ -1,11 +1,11 @@
 define(function (require) {
   var _ = require('lodash');
 
-  require('modules').get('kibana/table_vis')
+  require('ui/modules').get('kibana/table_vis')
   .directive('tableVisParams', function () {
     return {
       restrict: 'E',
-      template: require('text!plugins/table_vis/table_vis_params.html'),
+      template: require('plugins/table_vis/table_vis_params.html'),
       link: function ($scope) {
         $scope.$watchMulti([
           'vis.params.showPartialRows',
diff --git a/src/server/KbnServer.js b/src/server/KbnServer.js
new file mode 100644
index 0000000000000..3ee78ef272286
--- /dev/null
+++ b/src/server/KbnServer.js
@@ -0,0 +1,107 @@
+'use strict';
+
+let _ = require('lodash');
+let EventEmitter = require('events').EventEmitter;
+let promify = require('bluebird').promisify;
+let resolve = require('bluebird').resolve;
+let fromNode = require('bluebird').fromNode;
+let Hapi = require('hapi');
+
+let utils = require('requirefrom')('src/utils');
+let rootDir = utils('fromRoot')('.');
+let pkg = utils('packageJson');
+
+module.exports = class KbnServer extends EventEmitter {
+  constructor(settings) {
+    super();
+
+    this.name = pkg.name;
+    this.version = pkg.version;
+    this.build = pkg.build || false;
+    this.rootDir = rootDir;
+    this.server = new Hapi.Server();
+    this.settings = settings || {};
+
+    this.ready = _.constant(this.mixin(
+      require('./config/setup'),
+      require('./http'),
+      require('./logging'),
+      require('./status'), // sets this.status
+      require('./plugins'), // sets this.plugins
+      require('./config/complete'),
+
+      require('../ui'), // sets this.uiExports
+      require('../optimize'),
+
+      function () {
+        if (this.config.get('server.autoListen')) {
+          this.listen();
+        }
+      }
+    ));
+
+    this.listen = _.once(this.listen);
+  }
+
+  /**
+   * Extend the KbnServer outside of the constraits of a plugin. This allows access
+   * to APIs that are not exposed (intentionally) to the plugins and should only
+   * be used when the code will be kept up to date with Kibana.
+   *
+   * @param {...function} - functions that should be called to mixin functionality.
+   *                         They are called with the arguments (kibana, server, config)
+   *                         and can return a promise to delay execution of the next mixin
+   * @return {Promise} - promise that is resolved when the final mixin completes.
+   */
+  mixin(/* ...fns */) {
+    let self = this;
+    return resolve(_.toArray(arguments))
+    .then(_.compact)
+    .each(function (fn) {
+      return fn.call(self, self, self.server, self.config);
+    })
+    .catch(function (err) {
+      self.server.log('fatal', err);
+      self.emit('error', err);
+
+      return self.close()
+      .then(function () {
+        // retrow once server is closed
+        throw err;
+      });
+    })
+    .return(undefined);
+  }
+
+  /**
+   * Tell the server to listen for incoming requests, or get
+   * a promise that will be resolved once the server is listening.
+   *
+   * Calling this function has no effect, unless the "server.autoListen"
+   * is set to false.
+   *
+   * @return undefined
+   */
+  listen() {
+    let self = this;
+
+    return self.ready()
+    .then(function () {
+      return self.mixin(
+        function () {
+          return fromNode(_.bindKey(self.server, 'start'));
+        },
+        require('./pid')
+      );
+    })
+    .then(function () {
+      self.server.log(['listening', 'info'], 'Server running at ' + self.server.info.uri);
+      self.emit('listening');
+      return self.server;
+    });
+  }
+
+  close() {
+    return fromNode(_.bindKey(this.server, 'stop'));
+  }
+};
diff --git a/src/server/bin/kibana.bat b/src/server/bin/kibana.bat
deleted file mode 100644
index 703f35bdd581f..0000000000000
--- a/src/server/bin/kibana.bat
+++ /dev/null
@@ -1,19 +0,0 @@
-@echo off
-
-SETLOCAL
-
-set SCRIPT_DIR=%~dp0
-for %%I in ("%SCRIPT_DIR%..") do set DIR=%%~dpfI
-
-set NODE=%DIR%\node\node.exe
-set SERVER=%DIR%\src\bin\kibana.js
-set NODE_ENV="production"
-set CONFIG_PATH=%DIR%\config\kibana.yml
-
-TITLE Kibana Server @@version
-
-"%NODE%" "%SERVER%" %*
-
-:finally
-
-ENDLOCAL
\ No newline at end of file
diff --git a/src/server/bin/kibana.js b/src/server/bin/kibana.js
deleted file mode 100755
index 5b81e2c2cbea9..0000000000000
--- a/src/server/bin/kibana.js
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env node
-
-var program = require('commander');
-require('../lib/commanderExtensions')(program);
-var path = require('path');
-var startupOptions = require('./startup/startupOptions');
-var startup = require('./startup/startup');
-var pluginProgram = require('./plugin/plugin');
-
-var env = (process.env.NODE_ENV) ? process.env.NODE_ENV : 'development';
-var packagePath = path.resolve(__dirname, '..', '..', '..', 'package.json');
-if (env !== 'development') {
-  packagePath = path.resolve(__dirname, '..', 'package.json');
-}
-var package = require(packagePath);
-
-program.description('Kibana is an open source (Apache Licensed), browser based analytics and search dashboard for Elasticsearch.');
-program.version(package.version);
-
-startupOptions(program);
-pluginProgram(program);
-
-program.parse(process.argv);
-
-if (!program.isCommandSpecified()) {
-  startup(program);
-}
\ No newline at end of file
diff --git a/src/server/bin/kibana.sh b/src/server/bin/kibana.sh
deleted file mode 100644
index 67d8f992da683..0000000000000
--- a/src/server/bin/kibana.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-SCRIPT=$0
-
-# SCRIPT may be an arbitrarily deep series of symlinks. Loop until we have the concrete path.
-while [ -h "$SCRIPT" ] ; do
-  ls=$(ls -ld "$SCRIPT")
-  # Drop everything prior to ->
-  link=$(expr "$ls" : '.*-> \(.*\)$')
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=$(dirname "$SCRIPT")/"$link"
-  fi
-done
-
-DIR=$(dirname "${SCRIPT}")/..
-NODE=${DIR}/node/bin/node
-SERVER=${DIR}/src/bin/kibana.js
-
-CONFIG_PATH="${DIR}/config/kibana.yml" NODE_ENV="production" exec "${NODE}" ${SERVER} ${@}
-
diff --git a/src/server/bin/plugin/plugin.js b/src/server/bin/plugin/plugin.js
deleted file mode 100644
index 2dfaccf5d8159..0000000000000
--- a/src/server/bin/plugin/plugin.js
+++ /dev/null
@@ -1,53 +0,0 @@
-var settingParser = require('./settingParser');
-var installer = require('./pluginInstaller');
-var remover = require('./pluginRemover');
-var pluginLogger = require('./pluginLogger');
-
-module.exports = function (program) {
-  function processCommand(command, options) {
-    var settings;
-    try {
-      settings = settingParser(command).parse();
-    } catch (ex) {
-      //The logger has not yet been initialized.
-      console.error(ex.message);
-      process.exit(64);
-    }
-
-    var logger = pluginLogger(settings);
-
-    if (settings.action === 'install') {
-      installer.install(settings, logger);
-    }
-    if (settings.action === 'remove') {
-      remover.remove(settings, logger);
-    }
-  }
-
-  var installDesc =
-    'The plugin to install\n\n' +
-    '\tCommon examples:\n' +
-    '\t  -i username/sample\n' +
-    '\t    attempts to download the latest version from the following urls:\n' +
-    '\t      https://download.elastic.co/username/sample/sample-latest.tar.gz\n' +
-    '\t      https://github.com/username/sample/archive/master.tar.gz\n\n' +
-    '\t  -i username/sample/v1.1.1\n' +
-    '\t    attempts to download version v1.1.1 from the following urls:\n' +
-    '\t      https://download.elastic.co/username/sample/sample-v1.1.1.tar.gz\n' +
-    '\t      https://github.com/username/sample/archive/v1.1.1.tar.gz\n\n' +
-    '\t  -i sample -u http://www.example.com/other_name.tar.gz\n' +
-    '\t    attempts to download from the specified url,\n' +
-    '\t    and installs the plugin found at that url as "sample"' +
-    '\n';
-
-  program
-    .command('plugin')
-    .description('Maintain Plugins')
-    .option('-i, --install <org>/<plugin>/<version>', installDesc)
-    .option('-r, --remove <plugin>', 'The plugin to remove')
-    .option('-q, --quiet', 'Disable all process messaging except errors')
-    .option('-s, --silent', 'Disable all process messaging')
-    .option('-u, --url <url>', 'Specify download url')
-    .option('-t, --timeout <duration>', 'Length of time before failing; 0 for never fail', settingParser.parseMilliseconds)
-    .action(processCommand);
-};
\ No newline at end of file
diff --git a/src/server/bin/plugin/pluginDownloader.js b/src/server/bin/plugin/pluginDownloader.js
deleted file mode 100644
index 2b3d2912ba702..0000000000000
--- a/src/server/bin/plugin/pluginDownloader.js
+++ /dev/null
@@ -1,94 +0,0 @@
-var _ = require('lodash');
-var zlib = require('zlib');
-var Promise = require('bluebird');
-var request = require('request');
-var tar = require('tar');
-var progressReporter = require('./progressReporter');
-
-module.exports = function (settings, logger) {
-
-  //Attempts to download each url in turn until one is successful
-  function download() {
-    var urls = settings.urls;
-
-    function tryNext() {
-      var sourceUrl = urls.shift();
-      if (!sourceUrl) {
-        throw new Error('Not a valid url.');
-      }
-
-      logger.log('attempting to download ' + sourceUrl);
-
-      return Promise.try(function () {
-        return downloadSingle(sourceUrl, settings.workingPath, settings.timeout, logger)
-        .catch(function (err) {
-          if (err.message === 'ENOTFOUND') {
-            return tryNext();
-          }
-          if (err.message === 'EEXTRACT') {
-            throw (new Error('Error extracting the plugin archive'));
-          }
-          throw (err);
-        });
-      })
-      .catch(function (err) {
-        //Special case for when request.get throws an exception
-        if (err.message.match(/invalid uri/i)) {
-          return tryNext();
-        }
-        throw (err);
-      });
-    }
-
-    return tryNext();
-  }
-
-  //Attempts to download a single url
-  function downloadSingle(source, dest, timeout) {
-    var gunzip = zlib.createGunzip();
-    var tarExtract = tar.Extract({ path: dest, strip: 1 });
-
-    var requestOptions = { url: source };
-    if (timeout !== 0) {
-      requestOptions.timeout = timeout;
-    }
-
-    return wrappedRequest(requestOptions)
-    .then(function (req) {
-      //debugger;
-      var reporter = progressReporter(logger, req);
-
-      req
-      .on('response', reporter.handleResponse)
-      .on('data', reporter.handleData)
-      .on('error', _.partial(reporter.handleError, 'ENOTFOUND'))
-      .pipe(gunzip)
-      .on('error', _.partial(reporter.handleError, 'EEXTRACT'))
-      .pipe(tarExtract)
-      .on('error', _.partial(reporter.handleError, 'EEXTRACT'))
-      .on('end', reporter.handleEnd);
-
-      return reporter.promise;
-    });
-  }
-
-  function wrappedRequest(requestOptions) {
-    //debugger;
-    return Promise.try(function () {
-      //debugger;
-      return request.get(requestOptions);
-    })
-    .catch(function (err) {
-      if (err.message.match(/invalid uri/i)) {
-        throw new Error('ENOTFOUND');
-      }
-      throw err;
-    });
-  }
-
-
-  return {
-    download: download,
-    _downloadSingle: downloadSingle
-  };
-};
\ No newline at end of file
diff --git a/src/server/bin/plugin/settingParser.js b/src/server/bin/plugin/settingParser.js
deleted file mode 100644
index be079efff1845..0000000000000
--- a/src/server/bin/plugin/settingParser.js
+++ /dev/null
@@ -1,108 +0,0 @@
-var path = require('path');
-var expiry = require('expiry-js');
-
-module.exports = function (options) {
-  function parseMilliseconds(val) {
-    var result;
-
-    try {
-      var timeVal = expiry(val);
-      result = timeVal.asMilliseconds();
-    } catch (ex) {
-      result = 0;
-    }
-
-    return result;
-  }
-
-  function generateDownloadUrl(settings) {
-    var version = (settings.version) || 'latest';
-    var filename = settings.package + '-' + version + '.tar.gz';
-
-    return 'https://download.elastic.co/' + settings.organization + '/' + settings.package + '/' + filename;
-  }
-
-  function generateGithubUrl(settings) {
-    var version = (settings.version) || 'master';
-    var filename = version + '.tar.gz';
-
-    return 'https://github.com/' + settings.organization + '/' + settings.package + '/archive/' + filename;
-  }
-
-  function parse() {
-    var parts;
-    var settings = {
-      timeout: 0,
-      silent: false,
-      quiet: false,
-      urls: []
-    };
-
-    settings.workingPath = path.resolve(__dirname, '..', 'plugins', '.plugin.installing');
-
-    if (options.timeout) {
-      settings.timeout = options.timeout;
-    }
-
-    if (options.parent && options.parent.quiet) {
-      settings.quiet = options.parent.quiet;
-    }
-
-    if (options.silent) {
-      settings.silent = options.silent;
-    }
-
-    if (options.url) {
-      settings.urls.push(options.url);
-    }
-
-    if (options.install) {
-      settings.action = 'install';
-      parts = options.install.split('/');
-
-      if (options.url) {
-        if (parts.length !== 1) {
-          throw new Error('Invalid install option. When providing a url, please use the format <plugin>.');
-        }
-
-        settings.package = parts.shift();
-      } else {
-        if (parts.length < 2 || parts.length > 3) {
-          throw new Error('Invalid install option. Please use the format <org>/<plugin>/<version>.');
-        }
-
-        settings.organization = parts.shift();
-        settings.package = parts.shift();
-        settings.version = parts.shift();
-
-        settings.urls.push(generateDownloadUrl(settings));
-        settings.urls.push(generateGithubUrl(settings));
-      }
-    }
-
-    if (options.remove) {
-      settings.action = 'remove';
-      parts = options.remove.split('/');
-
-      if (parts.length !== 1) {
-        throw new Error('Invalid remove option. Please use the format <plugin>.');
-      }
-      settings.package = parts.shift();
-    }
-
-    if (!settings.action || (options.install && options.remove)) {
-      throw new Error('Please specify either --install or --remove.');
-    }
-
-    if (settings.package) {
-      settings.pluginPath = path.resolve(__dirname, '..', 'plugins', settings.package);
-    }
-
-    return settings;
-  }
-
-  return {
-    parse: parse,
-    parseMilliseconds: parseMilliseconds
-  };
-};
\ No newline at end of file
diff --git a/src/server/bin/startup/startup.js b/src/server/bin/startup/startup.js
deleted file mode 100644
index 6aef334811d41..0000000000000
--- a/src/server/bin/startup/startup.js
+++ /dev/null
@@ -1,49 +0,0 @@
-module.exports = function (program) {
-  var _ = require('lodash');
-  var path = require('path');
-  var Kibana = require('../../');
-  var writePidFile = require('../../lib/write_pid_file');
-  var loadSettingsFromYAML = require('../../lib/load_settings_from_yaml');
-  var settings = { 'logging.console.json': true };
-
-  function parseSettings() {
-    if (program.plugins) {
-      settings['kibana.externalPluginsFolder'] = program.plugins;
-    }
-
-    if (program.elasticsearch) {
-      settings['elasticsearch.url'] = program.elasticsearch;
-    }
-
-    if (program.port) {
-      settings['kibana.server.port'] = program.port;
-    }
-
-    if (program.host) {
-      settings['kibana.server.host'] = program.host;
-    }
-
-    if (program.quiet) {
-      settings['logging.quiet'] = program.quiet;
-    }
-
-    if (program.logFile) {
-      settings['logging.file'] = program.logFile;
-    }
-
-    var configPath = program.config || process.env.CONFIG_PATH;
-    if (configPath) {
-      settings = _.defaults(settings, loadSettingsFromYAML(configPath));
-    }
-  }
-
-  parseSettings();
-
-  // Start the Kibana server with the settings fromt he CLI and YAML file
-  var kibana = new Kibana(settings);
-  kibana.listen()
-  .then(writePidFile)
-  .catch(function (err) {
-    process.exit(1);
-  });
-};
\ No newline at end of file
diff --git a/src/server/bin/startup/startupOptions.js b/src/server/bin/startup/startupOptions.js
deleted file mode 100644
index e627a304e3eb5..0000000000000
--- a/src/server/bin/startup/startupOptions.js
+++ /dev/null
@@ -1,9 +0,0 @@
-module.exports = function (program) {
-  program.option('-e, --elasticsearch <uri>', 'Elasticsearch instance');
-  program.option('-c, --config <path>', 'Path to the config file');
-  program.option('-p, --port <port>', 'The port to bind to', parseInt);
-  program.option('-q, --quiet', 'Turns off logging');
-  program.option('-H, --host <host>', 'The host to bind to');
-  program.option('-l, --log-file <path>', 'The file to log to');
-  program.option('--plugins <path>', 'Path to scan for plugins');
-};
\ No newline at end of file
diff --git a/src/server/config/Config.js b/src/server/config/Config.js
new file mode 100644
index 0000000000000..813abd8f0b78b
--- /dev/null
+++ b/src/server/config/Config.js
@@ -0,0 +1,133 @@
+'use strict';
+
+let Promise = require('bluebird');
+let Joi = require('joi');
+let _ = require('lodash');
+let override = require('./override');
+let pkg = require('requirefrom')('src/utils')('packageJson');
+
+module.exports = class Config {
+  constructor(schema, defaults) {
+    this.schema = Joi.object({}).default();
+    this.config = {};
+    this.unappliedDefaults = _.cloneDeep(defaults || {});
+    if (schema) this.extendSchema(schema);
+  }
+
+  extendSchema(key, schema) {
+    if (key && key.isJoi) {
+      return _.each(key._inner.children, function (child) {
+        this.extendSchema(child.key, child.schema);
+      }, this);
+    }
+
+    if (this.has(key)) {
+      throw new Error(`Config schema already has key ${key}`);
+    }
+
+    this.schema = this.schema.keys(_.set({}, key, schema));
+
+    if (this.unappliedDefaults[key]) {
+      this.set(key, this.unappliedDefaults[key]);
+      this.unappliedDefaults[key] = null;
+    } else {
+      this._commit(this.config);
+    }
+
+  }
+
+  resetTo(obj) {
+    this._commit(obj);
+  }
+
+  set(key, value) {
+    // clone and modify the config
+    let config = _.cloneDeep(this.config);
+    if (_.isPlainObject(key)) {
+      config = override(config, key);
+    } else {
+      _.set(config, key, value);
+    }
+
+    // attempt to validate the config value
+    this._commit(config);
+  }
+
+  _commit(newConfig) {
+    // resolve the current environment
+    let env = newConfig.env;
+    delete newConfig.env;
+    if (_.isObject(env)) env = env.name;
+    if (!env) env = process.env.NODE_ENV || 'production';
+
+    // pass the environment as context so that it can be refed in config
+    let context = {
+      env: env,
+      prod: env === 'production',
+      dev: env === 'development',
+      notProd: env !== 'production',
+      notDev: env !== 'development',
+      version: _.get(pkg, 'version'),
+      buildNum: env === 'development' ? Math.pow(2, 53) - 1 : _.get(pkg, 'build.num', NaN)
+    };
+
+    if (!context.dev && !context.prod && !context.test) {
+      throw new TypeError(
+        `Unexpected environment "${env}", expected one of "development" or "production"`
+      );
+    }
+
+    let results = Joi.validate(newConfig, this.schema, {
+      context: context
+    });
+
+    if (results.error) {
+      throw results.error;
+    }
+
+    this.config = results.value;
+  }
+
+  get(key) {
+    if (!key) {
+      return _.cloneDeep(this.config);
+    }
+
+    let value = _.get(this.config, key);
+    if (value === undefined) {
+      if (!this.has(key)) {
+        throw new Error('Unknown config key: ' + key);
+      }
+    }
+    return _.cloneDeep(value);
+  }
+
+  has(key) {
+    function has(key, schema, path) {
+      path = path || [];
+      // Catch the partial paths
+      if (path.join('.') === key) return true;
+      // Only go deep on inner objects with children
+      if (schema._inner.children.length) {
+        for (let i = 0; i < schema._inner.children.length; i++) {
+          let child = schema._inner.children[i];
+          // If the child is an object recurse through it's children and return
+          // true if there's a match
+          if (child.schema._type === 'object') {
+            if (has(key, child.schema, path.concat([child.key]))) return true;
+          // if the child matches, return true
+          } else if (path.concat([child.key]).join('.') === key) {
+            return true;
+          }
+        }
+      }
+    }
+
+    if (_.isArray(key)) {
+      // TODO: add .has() support for array keys
+      key = key.join('.');
+    }
+
+    return !!has(key, this.schema);
+  }
+};
diff --git a/src/server/config/__tests__/config.js b/src/server/config/__tests__/config.js
new file mode 100644
index 0000000000000..d17b9902b2db3
--- /dev/null
+++ b/src/server/config/__tests__/config.js
@@ -0,0 +1,213 @@
+var Config = require('../Config');
+var expect = require('expect.js');
+var _ = require('lodash');
+var Joi = require('joi');
+
+/**
+ * Plugins should defined a config method that takes a joi object. By default
+ * it should return a way to disallow config
+ *
+ * Config should be newed up with a joi schema (containing defaults via joi)
+ *
+ * var schema = { ... }
+ * new Config(schema);
+ *
+ */
+
+var data = {
+  test: {
+    hosts: ['host-01', 'host-02'],
+    client: {
+      type: 'datastore',
+      host: 'store-01',
+      port: 5050
+    }
+  }
+};
+
+var schema = Joi.object({
+  test: Joi.object({
+    enable: Joi.boolean().default(true),
+    hosts: Joi.array().items(Joi.string()),
+    client: Joi.object({
+      type: Joi.string().default('datastore'),
+      host: Joi.string(),
+      port: Joi.number()
+    }).default(),
+    undefValue: Joi.string()
+  }).default()
+}).default();
+
+describe('lib/config/config', function () {
+  describe('class Config()', function () {
+
+    describe('constructor', function () {
+
+      it('should not allow any config if the schema is not passed', function (done) {
+        var config = new Config();
+        var run = function () {
+          config.set('something.enable', true);
+        };
+        expect(run).to.throwException();
+        done();
+      });
+
+      it('should set defaults', function () {
+        var config = new Config(schema);
+        expect(config.get('test.enable')).to.be(true);
+        expect(config.get('test.client.type')).to.be('datastore');
+      });
+
+    });
+
+    describe('#resetTo(object)', function () {
+
+      var config;
+      beforeEach(function () {
+        config = new Config(schema);
+      });
+
+      it('should reset the config object with new values', function () {
+        config.set(data);
+        var newData = config.get();
+        newData.test.enable = false;
+        config.resetTo(newData);
+        expect(config.get()).to.eql(newData);
+      });
+
+    });
+
+    describe('#has(key)', function () {
+
+      var config;
+      beforeEach(function () {
+        config = new Config(schema);
+      });
+
+      it('should return true for fields that exist in the schema', function () {
+        expect(config.has('test.undefValue')).to.be(true);
+      });
+
+      it('should return true for partial objects that exist in the schema', function () {
+        expect(config.has('test.client')).to.be(true);
+      });
+
+      it('should return false for fields that do not exist in the schema', function () {
+        expect(config.has('test.client.pool')).to.be(false);
+      });
+
+    });
+
+    describe('#set(key, value)', function () {
+      var config;
+
+      beforeEach(function () {
+        config = new Config(schema);
+      });
+
+      it('should use a key and value to set a config value', function () {
+        config.set('test.enable', false);
+        expect(config.get('test.enable')).to.be(false);
+      });
+
+      it('should use an object to set config values', function () {
+        var hosts = ['host-01', 'host-02'];
+        config.set({ test: { enable: false, hosts: hosts } });
+        expect(config.get('test.enable')).to.be(false);
+        expect(config.get('test.hosts')).to.eql(hosts);
+      });
+
+      it('should use a flatten object to set config values', function () {
+        var hosts = ['host-01', 'host-02'];
+        config.set({ 'test.enable': false, 'test.hosts': hosts });
+        expect(config.get('test.enable')).to.be(false);
+        expect(config.get('test.hosts')).to.eql(hosts);
+      });
+
+      it('should override values with just the values present', function () {
+        var newData = _.cloneDeep(data);
+        config.set(data);
+        newData.test.enable = false;
+        config.set({ test: { enable: false } });
+        expect(config.get()).to.eql(newData);
+      });
+
+      it('should thow an exception when setting a value with the wrong type', function (done) {
+        var run = function () {
+          config.set('test.enable', 'something');
+        };
+        expect(run).to.throwException(function (err) {
+          expect(err).to.have.property('name', 'ValidationError');
+          expect(err.details[0].message).to.be('"enable" must be a boolean');
+          done();
+        });
+      });
+
+
+    });
+
+    describe('#get(key)', function () {
+
+      var config;
+
+      beforeEach(function () {
+        config = new Config(schema);
+        config.set(data);
+      });
+
+      it('should return the whole config object when called without a key', function () {
+        var newData = _.cloneDeep(data);
+        newData.test.enable = true;
+        expect(config.get()).to.eql(newData);
+      });
+
+      it('should return the value using dot notation', function () {
+        expect(config.get('test.enable')).to.be(true);
+      });
+
+      it('should return the clone of partial object using dot notation', function () {
+        expect(config.get('test.client')).to.not.be(data.test.client);
+        expect(config.get('test.client')).to.eql(data.test.client);
+      });
+
+      it('should throw exception for unknown config values', function () {
+        var run = function () {
+          config.get('test.does.not.exist');
+        };
+        expect(run).to.throwException(/Unknown config key: test.does.not.exist/);
+      });
+
+      it('should not throw exception for undefined known config values', function () {
+        var run = function getUndefValue() {
+          config.get('test.undefValue');
+        };
+        expect(run).to.not.throwException();
+      });
+
+    });
+
+    describe('#extendSchema(key, schema)', function () {
+      var config;
+      beforeEach(function () {
+        config = new Config(schema);
+      });
+
+      it('should allow you to extend the schema at the top level', function () {
+        var newSchema = Joi.object({ test: Joi.boolean().default(true) }).default();
+        config.extendSchema('myTest', newSchema);
+        expect(config.get('myTest.test')).to.be(true);
+      });
+
+      it('should NOT allow you to extend the schema if somethign else is there', function () {
+        var newSchema = Joi.object({ test: Joi.boolean().default(true) }).default();
+        var run = function () {
+          config.extendSchema('test', newSchema);
+        };
+        expect(run).to.throwException();
+      });
+
+    });
+
+  });
+});
+
diff --git a/src/server/config/__tests__/explodeBy.js b/src/server/config/__tests__/explodeBy.js
new file mode 100644
index 0000000000000..cfda593e9d59f
--- /dev/null
+++ b/src/server/config/__tests__/explodeBy.js
@@ -0,0 +1,32 @@
+var explodeBy = require('../explodeBy');
+var expect = require('expect.js');
+
+describe('explode_by(dot, flatObject)', function () {
+
+  it('should explode a flatten object with dots', function () {
+    var flatObject = {
+      'test.enable': true,
+      'test.hosts': ['host-01', 'host-02']
+    };
+    expect(explodeBy('.', flatObject)).to.eql({
+      test: {
+        enable: true,
+        hosts: ['host-01', 'host-02']
+      }
+    });
+  });
+
+  it('should explode a flatten object with slashes', function () {
+    var flatObject = {
+      'test/enable': true,
+      'test/hosts': ['host-01', 'host-02']
+    };
+    expect(explodeBy('/', flatObject)).to.eql({
+      test: {
+        enable: true,
+        hosts: ['host-01', 'host-02']
+      }
+    });
+  });
+
+});
diff --git a/src/server/config/__tests__/flattenWith.js b/src/server/config/__tests__/flattenWith.js
new file mode 100644
index 0000000000000..3795f9ba41d0f
--- /dev/null
+++ b/src/server/config/__tests__/flattenWith.js
@@ -0,0 +1,27 @@
+var flattenWith = require('../flattenWith');
+var expect = require('expect.js');
+
+describe('flatten_with(dot, nestedObj)', function () {
+
+  it('should flatten object with dot', function () {
+    var nestedObj = {
+      test: {
+        enable: true,
+        hosts: ['host-01', 'host-02'],
+        client: {
+          type: 'nosql',
+          pool: [{ port: 5051 }, { port: 5052 }]
+        }
+      }
+    };
+    expect(flattenWith('.', nestedObj)).to.eql({
+      'test.enable': true,
+      'test.hosts': ['host-01', 'host-02'],
+      'test.client.type': 'nosql',
+      'test.client.pool': [{ port: 5051 }, { port: 5052 }]
+    });
+  });
+
+});
+
+
diff --git a/src/server/config/__tests__/override.js b/src/server/config/__tests__/override.js
new file mode 100644
index 0000000000000..cac9e4340cd06
--- /dev/null
+++ b/src/server/config/__tests__/override.js
@@ -0,0 +1,28 @@
+var override = require('../override');
+var expect = require('expect.js');
+
+describe('override(target, source)', function () {
+
+  it('should override the values form source to target', function () {
+    var target = {
+      test: {
+        enable: true,
+        host: ['host-01', 'host-02'],
+        client: {
+          type: 'sql'
+        }
+      }
+    };
+    var source = { test: { client: { type: 'nosql' } } };
+    expect(override(target, source)).to.eql({
+      test: {
+        enable: true,
+        host: ['host-01', 'host-02'],
+        client: {
+          type: 'nosql'
+        }
+      }
+    });
+  });
+
+});
diff --git a/src/server/config/complete.js b/src/server/config/complete.js
new file mode 100644
index 0000000000000..6eeb3fc0ed9b9
--- /dev/null
+++ b/src/server/config/complete.js
@@ -0,0 +1,14 @@
+'use strict';
+
+module.exports = function (kbnServer, server, config) {
+  let _ = require('lodash');
+
+  _.forOwn(config.unappliedDefaults, function (val, key) {
+    if (val === null) return;
+    server.log(['warning', 'config'], {
+      tmpl: 'Settings for "<%= key %>" were not applied, check for spelling errors and ensure the plugin is loaded.',
+      key: key,
+      val: val
+    });
+  });
+};
diff --git a/src/server/lib/config/explode_by.js b/src/server/config/explodeBy.js
similarity index 100%
rename from src/server/lib/config/explode_by.js
rename to src/server/config/explodeBy.js
diff --git a/src/server/lib/config/flatten_with.js b/src/server/config/flattenWith.js
similarity index 100%
rename from src/server/lib/config/flatten_with.js
rename to src/server/config/flattenWith.js
diff --git a/src/server/config/kibana.yml b/src/server/config/kibana.yml
deleted file mode 100644
index 7122761ad5925..0000000000000
--- a/src/server/config/kibana.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-# Kibana is served by a back end server. This controls which port to use.
-# port: 5601
-
-# The host to bind the server to.
-# host: "0.0.0.0"
-
-# The Elasticsearch instance to use for all your queries.
-# elasticsearch_url: "http://localhost:9200"
-
-# preserve_elasticsearch_host true will send the hostname specified in `elasticsearch`. If you set it to false,
-# then the host you use to connect to *this* Kibana instance will be sent.
-# elasticsearch_preserve_host: true
-
-# Kibana uses an index in Elasticsearch to store saved searches, visualizations
-# and dashboards. It will create a new index if it doesn't already exist.
-# kibana_index: ".kibana"
-
-# If your Elasticsearch is protected with basic auth, this is the user credentials
-# used by the Kibana server to perform maintence on the kibana_index at statup. Your Kibana
-# users will still need to authenticate with Elasticsearch (which is proxied thorugh
-# the Kibana server)
-# kibana_elasticsearch_username: user
-# kibana_elasticsearch_password: pass
-
-# If your Elasticsearch requires client certificate and key
-# kibana_elasticsearch_client_crt: /path/to/your/client.crt
-# kibana_elasticsearch_client_key: /path/to/your/client.key
-
-# If you need to provide a CA certificate for your Elasticsearch instance, put
-# the path of the pem file here.
-# ca: /path/to/your/CA.pem
-
-# The default application to load.
-# default_app_id: "discover"
-
-# Time in milliseconds to wait for elasticsearch to respond to pings, defaults to
-# request_timeout setting
-# ping_timeout: 1500
-
-# Time in milliseconds to wait for responses from the back end or elasticsearch.
-# This must be > 0
-# request_timeout: 300000
-
-# Time in milliseconds for Elasticsearch to wait for responses from shards.
-# Set to 0 to disable.
-# shard_timeout: 0
-
-# Time in milliseconds to wait for Elasticsearch at Kibana startup before retrying
-# startup_timeout: 5000
-
-# Set to false to have a complete disregard for the validity of the SSL
-# certificate.
-# verify_ssl: true
-
-# SSL for outgoing requests from the Kibana Server (PEM formatted)
-# ssl_key_file: /path/to/your/server.key
-# ssl_cert_file: /path/to/your/server.crt
-
-# Set the path to where you would like the process id file to be created.
-# pid_file: /var/run/kibana.pid
-
-# If you would like to send the log output to a file you can set the path below.
-# This will also turn off the STDOUT log output.
-# log_file: ./kibana.log
diff --git a/src/server/config/override.js b/src/server/config/override.js
new file mode 100644
index 0000000000000..a14ccb980706c
--- /dev/null
+++ b/src/server/config/override.js
@@ -0,0 +1,11 @@
+var _ = require('lodash');
+var flattenWith = require('./flattenWith');
+var explodeBy = require('./explodeBy');
+
+module.exports = function (target, source) {
+  var _target = flattenWith('.', target);
+  var _source = flattenWith('.', source);
+  return explodeBy('.', _.defaults(_source, _target));
+};
+
+
diff --git a/src/server/config/schema.js b/src/server/config/schema.js
new file mode 100644
index 0000000000000..9b8c16990efa5
--- /dev/null
+++ b/src/server/config/schema.js
@@ -0,0 +1,85 @@
+'use strict';
+
+let get = require('lodash').get;
+let Joi = require('joi');
+let fs = require('fs');
+let path = require('path');
+
+let utils = require('requirefrom')('src/utils');
+let fromRoot = utils('fromRoot');
+
+module.exports = Joi.object({
+  pkg: Joi.object({
+    version: Joi.string().default(Joi.ref('$version')),
+    buildNum: Joi.number().default(Joi.ref('$buildNum'))
+  }).default(),
+
+  env: Joi.object({
+    name: Joi.string().default(Joi.ref('$env')),
+    dev: Joi.boolean().default(Joi.ref('$dev')),
+    prod: Joi.boolean().default(Joi.ref('$prod')),
+    test: Joi.boolean().default(Joi.ref('$test')),
+  }).default(),
+
+  pid: Joi.object({
+    file: Joi.string(),
+    exclusive: Joi.boolean().default(false)
+  }).default(),
+
+  server: Joi.object({
+    host: Joi.string().hostname().default('0.0.0.0'),
+    port: Joi.number().default(5601),
+    autoListen: Joi.boolean().default(true),
+    defaultRoute: Joi.string(),
+    ssl: Joi.object({
+      cert: Joi.string(),
+      key: Joi.string()
+    }).default()
+  }).default(),
+
+  logging: Joi.object().keys({
+    silent: Joi.boolean().default(false),
+
+    quiet: Joi.boolean()
+    .when('silent', {
+      is: true,
+      then: Joi.default(true).valid(true),
+      otherwise: Joi.default(false)
+    }),
+
+    verbose: Joi.boolean()
+    .when('quiet', {
+      is: true,
+      then: Joi.valid(false).default(false),
+      otherwise: Joi.default(false)
+    }),
+
+    events: Joi.any().default({}),
+    dest: Joi.string().default('stdout'),
+
+    json: Joi.boolean()
+    .when('dest', {
+      is: 'stdout',
+      then: Joi.default(!process.stdout.isTTY),
+      otherwise: Joi.default(true)
+    })
+  })
+  .default(),
+
+  plugins: Joi.object({
+    paths: Joi.array().items(Joi.string()).default([]),
+    scanDirs: Joi.array().items(Joi.string()).default([]),
+    initialize: Joi.boolean().default(true)
+  }).default(),
+
+  optimize: Joi.object({
+    enabled: Joi.boolean().default(true),
+    bundleDir: Joi.string().default(fromRoot('optimize/bundles')),
+    viewCaching: Joi.boolean().default(Joi.ref('$prod')),
+    watch: Joi.boolean().default(Joi.ref('$dev')),
+    sourceMaps: Joi.boolean().default(Joi.ref('$dev')),
+    _workerRole: Joi.valid('send', 'receive', null).default(null)
+  }).default()
+
+}).default();
+
diff --git a/src/server/config/setup.js b/src/server/config/setup.js
new file mode 100644
index 0000000000000..0f741cf48c85c
--- /dev/null
+++ b/src/server/config/setup.js
@@ -0,0 +1,11 @@
+'use strict';
+
+module.exports = function (kbnServer, server) {
+  let Config = require('./Config');
+  let schema = require('./schema');
+
+  kbnServer.config = new Config(schema, kbnServer.settings || {});
+  server.decorate('server', 'config', function () {
+    return kbnServer.config;
+  });
+};
diff --git a/src/server/http/getDefaultRoute.js b/src/server/http/getDefaultRoute.js
new file mode 100644
index 0000000000000..843efcd4f9d14
--- /dev/null
+++ b/src/server/http/getDefaultRoute.js
@@ -0,0 +1,16 @@
+'use strict';
+
+let _ = require('lodash');
+
+module.exports = _.once(function (kbnServer) {
+  // user configured default route
+  let defaultConfig = kbnServer.config.get('server.defaultRoute');
+  if (defaultConfig) return defaultConfig;
+
+  // redirect to the single app
+  if (kbnServer.uiExports.apps.length === 1) {
+    return `/app/${kbnServer.uiExports.apps[0].id}`;
+  }
+
+  return '/apps';
+});
diff --git a/src/server/http/index.js b/src/server/http/index.js
new file mode 100644
index 0000000000000..da6d44ab4d4b2
--- /dev/null
+++ b/src/server/http/index.js
@@ -0,0 +1,103 @@
+'use strict';
+
+module.exports = function (kbnServer, server, config) {
+  let _ = require('lodash');
+  let Boom = require('boom');
+  let parse = require('url').parse;
+  let format = require('url').format;
+  let getDefaultRoute = require('./getDefaultRoute');
+
+  // Create a new connection
+  server.connection({
+    host: config.get('server.host'),
+    port: config.get('server.port')
+  });
+
+  // provide a simple way to expose static directories
+  server.decorate('server', 'exposeStaticDir', function (routePath, dirPath) {
+    this.route({
+      path: routePath,
+      method: 'GET',
+      handler: {
+        directory: {
+          path: dirPath,
+          listing: true,
+          lookupCompressed: true
+        }
+      }
+    });
+  });
+
+  // provide a simple way to expose static files
+  server.decorate('server', 'exposeStaticFile', function (routePath, filePath) {
+    this.route({
+      path: routePath,
+      method: 'GET',
+      handler: {
+        file: filePath
+      }
+    });
+  });
+
+  // helper for creating view managers for servers
+  server.decorate('server', 'setupViews', function (path, engines) {
+    this.views({
+      path: path,
+      isCached: config.get('optimize.viewCaching'),
+      engines: _.assign({ jade: require('jade') }, engines || {})
+    });
+  });
+
+  server.decorate('server', 'redirectToSlash', function (route) {
+    this.route({
+      path: route,
+      method: 'GET',
+      handler: function (req, reply) {
+        return reply.redirect(format({
+          search: req.url.search,
+          pathname: req.url.pathname + '/',
+        }));
+      }
+    });
+  });
+
+  // attach the app name to the server, so we can be sure we are actually talking to kibana
+  server.ext('onPreResponse', function (req, reply) {
+    let response = req.response;
+
+    if (response.isBoom) {
+      response.output.headers['x-app-name'] = kbnServer.name;
+      response.output.headers['x-app-version'] = kbnServer.version;
+    } else {
+      response.header('x-app-name', kbnServer.name);
+      response.header('x-app-version', kbnServer.version);
+    }
+
+    return reply.continue();
+  });
+
+  server.route({
+    path: '/',
+    method: 'GET',
+    handler: function (req, reply) {
+      reply.redirect(getDefaultRoute(kbnServer));
+    }
+  });
+
+  server.route({
+    method: 'GET',
+    path: '/{p*}',
+    handler: function (req, reply) {
+      let path = req.path;
+      if (path === '/' || path.charAt(path.length - 1) !== '/') {
+        return reply(Boom.notFound());
+      }
+
+      return reply.redirect(format({
+        search: req.url.search,
+        pathname: path.slice(0, -1),
+      }))
+      .permanent(true);
+    }
+  });
+};
diff --git a/src/server/index.js b/src/server/index.js
deleted file mode 100644
index a0107a1288b6f..0000000000000
--- a/src/server/index.js
+++ /dev/null
@@ -1,68 +0,0 @@
-var _ = require('lodash');
-var Promise = require('bluebird');
-var Hapi = require('hapi');
-var requirePlugins = require('./lib/plugins/require_plugins');
-var extendHapi = require('./lib/extend_hapi');
-var join = require('path').join;
-
-function Kibana(settings, plugins) {
-  plugins = plugins || [];
-  this.server = new Hapi.Server();
-
-  // Extend Hapi with Kibana
-  extendHapi(this.server);
-
-  var config = this.server.config();
-  if (settings) config.set(settings);
-
-  // Load external plugins
-  this.plugins = [];
-  var externalPluginsFolder = config.get('kibana.externalPluginsFolder');
-  if (externalPluginsFolder) {
-    this.plugins = _([externalPluginsFolder])
-      .flatten()
-      .map(requirePlugins)
-      .flatten()
-      .value();
-  }
-
-  this.plugins = this.plugins.concat(plugins);
-
-}
-
-Kibana.prototype.listen = function () {
-  var config = this.server.config();
-  var self = this;
-  // Create a new connection
-  this.server.connection({
-    host: config.get('kibana.server.host'),
-    port: config.get('kibana.server.port')
-  });
-
-  return this.server.loadKibanaPlugins(this.plugins)
-  .then(function () {
-    // Start the server
-    return new Promise(function (resolve, reject) {
-      self.server.start(function (err) {
-        if (err) return reject(err);
-        self.server.log('server', 'Server running at ' + self.server.info.uri);
-        resolve(self.server);
-      });
-    });
-  })
-  .catch(function (err) {
-    self.server.log('fatal', err);
-    console.log(err.stack);
-    return Promise.reject(err);
-  });
-};
-
-Kibana.Plugin = require('./lib/plugins/plugin');
-module.exports = Kibana;
-
-if (require.main === module) {
-  var kibana = new Kibana();
-  kibana.listen().catch(function (err) {
-    process.exit(1);
-  });
-}
diff --git a/src/server/lib/config/check_path.js b/src/server/lib/config/check_path.js
deleted file mode 100644
index bd649fec1e27a..0000000000000
--- a/src/server/lib/config/check_path.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var fs = require('fs');
-module.exports = function checkPath(path) {
-  try {
-    fs.statSync(path);
-    return true;
-  } catch (err) {
-    return false;
-  }
-};
-
diff --git a/src/server/lib/config/config.js b/src/server/lib/config/config.js
deleted file mode 100644
index 32ffdf943bdc9..0000000000000
--- a/src/server/lib/config/config.js
+++ /dev/null
@@ -1,80 +0,0 @@
-var Promise = require('bluebird');
-var Joi = require('joi');
-var _ = require('lodash');
-var override = require('./override');
-
-function Config(schema, config) {
-  config = config || {};
-  this.schema = schema || Joi.object({}).default();
-  this.reset(config);
-}
-
-Config.prototype.extendSchema = function (key, schema) {
-  var additionalSchema = {};
-  if (!this.has(key)) {
-    additionalSchema[key] = schema;
-    this.schema = this.schema.keys(additionalSchema);
-    this.reset(this.config);
-  }
-};
-
-Config.prototype.reset = function (obj) {
-  var results = Joi.validate(obj, this.schema);
-  if (results.error) {
-    throw results.error;
-  }
-  this.config = results.value;
-};
-
-Config.prototype.set = function (key, value) {
-  var config = _.cloneDeep(this.config);
-  if (_.isPlainObject(key)) {
-    config = override(config, key);
-  } else {
-    _.set(config, key, value);
-  }
-  var results = Joi.validate(config, this.schema);
-  if (results.error) {
-    throw results.error;
-  }
-  this.config = results.value;
-};
-
-Config.prototype.get = function (key) {
-  if (!key) {
-    return _.cloneDeep(this.config);
-  }
-
-  var value = _.get(this.config, key);
-  if (value === undefined) {
-    if (!this.has(key)) {
-      throw new Error('Unknown config key: ' + key);
-    }
-  }
-  return _.cloneDeep(value);
-};
-
-Config.prototype.has = function (key) {
-  function has(key, schema, path) {
-    path = path || [];
-    // Catch the partial paths
-    if (path.join('.') === key) return true;
-    // Only go deep on inner objects with children
-    if (schema._inner.children.length) {
-      for (var i = 0; i < schema._inner.children.length; i++) {
-        var child = schema._inner.children[i];
-        // If the child is an object recurse through it's children and return
-        // true if there's a match
-        if (child.schema._type === 'object') {
-          if (has(key, child.schema, path.concat([child.key]))) return true;
-        // if the child matches, return true
-        } else if (path.concat([child.key]).join('.') === key) {
-          return true;
-        }
-      }
-    }
-  }
-  return !!has(key, this.schema);
-};
-
-module.exports = Config;
diff --git a/src/server/lib/config/index.js b/src/server/lib/config/index.js
deleted file mode 100644
index 6d3b2b9507db9..0000000000000
--- a/src/server/lib/config/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-var Config = require('./config');
-var schema = require('./schema');
-var config = new Config(schema);
-module.exports = function () {
-  return config;
-};
diff --git a/src/server/lib/config/override.js b/src/server/lib/config/override.js
deleted file mode 100644
index cebd160f197b9..0000000000000
--- a/src/server/lib/config/override.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var _           = require('lodash');
-var flattenWith = require('./flatten_with');
-var explodeBy   = require('./explode_by');
-
-module.exports = function (target, source) {
-  var _target = flattenWith('.', target);
-  var _source = flattenWith('.', source);
-  return explodeBy('.', _.defaults(_source, _target));
-};
-
-
diff --git a/src/server/lib/config/schema.js b/src/server/lib/config/schema.js
deleted file mode 100644
index 0c3235f687ebf..0000000000000
--- a/src/server/lib/config/schema.js
+++ /dev/null
@@ -1,72 +0,0 @@
-var Joi = require('joi');
-var fs = require('fs');
-var path = require('path');
-var checkPath = require('./check_path');
-var packagePath = path.resolve(__dirname, '..', '..', 'package.json');
-
-// Check if the local public folder is present. This means we are running in
-// the NPM module. If it's not there then we are running in the git root.
-var publicFolder = path.resolve(__dirname, '..', '..', 'public');
-if (!checkPath(publicFolder)) publicFolder = path.resolve(__dirname, '..', '..', '..', 'kibana');
-
-try {
-  fs.statSync(packagePath);
-} catch (err) {
-  packagePath = path.resolve(__dirname, '..', '..', '..', '..', 'package.json');
-}
-
-var bundledPluginsFolder = path.resolve(publicFolder, 'plugins');
-
-
-module.exports = Joi.object({
-  kibana: Joi.object({
-    server: Joi.object({
-      host: Joi.string().hostname().default('0.0.0.0'),
-      port: Joi.number().default(5601),
-      maxSockets: Joi.any().default(Infinity),
-      pidFile: Joi.string(),
-      root: Joi.string().default(path.normalize(path.join(__dirname, '..'))),
-      ssl: Joi.object({
-        cert: Joi.string(),
-        key: Joi.string()
-      }).default()
-    }).default(),
-    index: Joi.string().default('.kibana'),
-    publicFolder: Joi.string().default(publicFolder),
-    externalPluginsFolder: Joi.alternatives().try(Joi.array().items(Joi.string()), Joi.string()),
-    bundledPluginsFolder: Joi.string().default(bundledPluginsFolder),
-    defaultAppId: Joi.string().default('discover'),
-    package: Joi.any().default(require(packagePath)),
-    buildNum: Joi.string().default('@@buildNum'),
-    bundledPluginIds: Joi.array().items(Joi.string())
-  }).default(),
-  elasticsearch: Joi.object({
-    url: Joi.string().uri({ scheme: ['http', 'https'] }).default('http://localhost:9200'),
-    preserveHost: Joi.boolean().default(true),
-    username: Joi.string(),
-    password: Joi.string(),
-    shardTimeout: Joi.number().default(0),
-    requestTimeout: Joi.number().default(30000),
-    pingTimeout: Joi.number().default(30000),
-    startupTimeout: Joi.number().default(5000),
-    ssl: Joi.object({
-      verify: Joi.boolean().default(true),
-      ca: Joi.string(),
-      cert: Joi.string(),
-      key: Joi.string()
-    }).default(),
-    minimumVerison: Joi.string().default('1.4.4')
-  }).default(),
-  logging: Joi.object({
-    quiet: Joi.boolean().default(false),
-    file: Joi.string(),
-    console: Joi.object({
-      ops: Joi.any(),
-      log: Joi.any().default('*'),
-      response: Joi.any().default('*'),
-      error: Joi.any().default('*'),
-      json: Joi.boolean().default(false),
-    }).default()
-  }).default(),
-}).default();
-
diff --git a/src/server/lib/extend_hapi.js b/src/server/lib/extend_hapi.js
deleted file mode 100644
index 8e7505d03bd92..0000000000000
--- a/src/server/lib/extend_hapi.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = function (server) {
-  server.decorate('server', 'config', require('./config'));
-  server.decorate('server', 'loadKibanaPlugins', require('./plugins/load_kibana_plugins'));
-};
diff --git a/src/server/lib/get_status.js b/src/server/lib/get_status.js
deleted file mode 100644
index ed04cff1065b5..0000000000000
--- a/src/server/lib/get_status.js
+++ /dev/null
@@ -1,4 +0,0 @@
-var status = require('./status');
-module.exports = function (name) {
-  return status[name] || { state: 'red' };
-};
diff --git a/src/server/lib/load_settings_from_yaml.js b/src/server/lib/load_settings_from_yaml.js
deleted file mode 100644
index 35d01184e32d0..0000000000000
--- a/src/server/lib/load_settings_from_yaml.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var fs = require('fs');
-var yaml = require('js-yaml');
-module.exports = function (path) {
-  var config = yaml.safeLoad(fs.readFileSync(path, 'utf8'));
-  var settings = {};
-  if (config.port) settings['kibana.server.port'] = config.port;
-  if (config.host) settings['kibana.server.host'] = config.host;
-  if (config.elasticsearch_url) settings['elasticsearch.url'] = config.elasticsearch_url;
-  if (config.elasticsearch_preserve_host) settings['elasticsearch.preserveHost'] = config.elasticsearch_preserve_host;
-  if (config.config_index) settings['config.index'] = config.config_index;
-  if (config.config_elasticsearch_username) settings['elasticsearch.username'] = config.config_elasticsearch_username;
-  if (config.config_elasticsearch_password) settings['elasticsearch.password'] = config.config_elasticsearch_password;
-  if (config.config_elasticsearch_client_crt) settings['elasticsearch.ssl.cert'] = config.config_elasticsearch_client_crt;
-  if (config.config_elasticsearch_client_key) settings['elasticsearch.ssl.key'] = config.config_elasticsearch_client_key;
-  if (config.ca) settings['elasticsearch.ssl.ca'] = config.ca;
-  if (config.verify_ssl) settings['elasticsearch.ssl.verify'] = config.verify_ssl;
-  if (config.default_app_id) settings['kibana.defaultAppId'] = config.default_app_id;
-  if (config.ping_timeout) settings['elasticsearch.pingTimeout'] = config.ping_timeout;
-  if (config.request_timeout) settings['elasticsearch.requestTimeout'] = config.request_timeout;
-  if (config.shard_timeout) settings['elasticsearch.shardTimeout'] = config.shard_timeout;
-  if (config.startup_timeout) settings['elasticsearch.startupTimeout'] = config.startup_timeout;
-  if (config.ssl_cert_file) settings['kibana.server.ssl.cert'] = config.ssl_cert_file;
-  if (config.ssl_key_file) settings['kibana.server.ssl.key'] = config.ssl_key_file;
-  if (config.pid_file) settings['config.server.pidFile'] = config.pid_file;
-  if (config.log_file) settings['logging.file'] = config.log_file;
-  if (config.bundled_plugin_ids) settings['kibana.bundledPluginIds'] = config.bundled_plugin_ids;
-  return settings;
-};
-
diff --git a/src/server/lib/logging/good_reporters/_event_to_json.js b/src/server/lib/logging/good_reporters/_event_to_json.js
deleted file mode 100644
index 84d708ea3656b..0000000000000
--- a/src/server/lib/logging/good_reporters/_event_to_json.js
+++ /dev/null
@@ -1,128 +0,0 @@
-var moment = require('moment');
-var _ = require('lodash');
-var env = process.env.NODE_ENV || 'development';
-var numeral = require('numeral');
-var ansicolors = require('ansicolors');
-var stringify = require('json-stringify-safe');
-var querystring = require('querystring');
-
-function serializeError(err) {
-  return {
-    message: err.message,
-    name: err.name,
-    stack: err.stack,
-    code: err.code,
-    signal: err.signal
-  };
-}
-
-
-var levelColor = function (code) {
-  if (code < 299) {
-    return ansicolors.green(code);
-  }
-  if (code < 399) {
-    return ansicolors.yellow(code);
-  }
-  if (code < 499) {
-    return ansicolors.magenta(code);
-  }
-  return ansicolors.red(code);
-};
-
-function lookup(name) {
-  switch (name) {
-    case 'error':
-      return 'error';
-    default:
-      return 'info';
-  }
-}
-
-module.exports = function (name, event) {
-  var data = {
-    '@timestamp': moment.utc(event.timestamp).format(),
-    level: lookup(event),
-    node_env: env,
-    tags: event.tags,
-    pid: event.pid
-  };
-  if (name === 'response') {
-    _.defaults(data, _.pick(event, [
-      'method',
-      'statusCode'
-    ]));
-
-    data.req = {
-      url: event.path,
-      method: event.method,
-      headers: event.headers,
-      remoteAddress: event.source.remoteAddress,
-      userAgent: event.source.remoteAddress,
-      referer: event.source.referer
-    };
-
-    var contentLength = 0;
-    if (typeof event.responsePayload === 'object') {
-      contentLength = stringify(event.responsePayload).length;
-    } else {
-      contentLength = event.responsePayload.toString().length;
-    }
-
-    data.res = {
-      statusCode: event.statusCode,
-      responseTime: event.responseTime,
-      contentLength: contentLength
-    };
-
-    var query = querystring.stringify(event.query);
-    if (query) data.req.url += '?' + query;
-
-
-    data.message  = data.req.method.toUpperCase() + ' ';
-    data.message += data.req.url;
-    data.message += ' ';
-    data.message += levelColor(data.res.statusCode);
-    data.message += ' ';
-    data.message += ansicolors.brightBlack(data.res.responseTime + 'ms');
-    data.message += ansicolors.brightBlack(' - ' + numeral(contentLength).format('0.0b'));
-  }
-  else if (name === 'ops') {
-    _.defaults(data, _.pick(event, [
-      'pid',
-      'os',
-      'proc',
-      'load'
-    ]));
-    data.message  = ansicolors.brightBlack('memory: ');
-    data.message += numeral(data.proc.mem.heapUsed).format('0.0b');
-    data.message += ' ';
-    data.message += ansicolors.brightBlack('uptime: ');
-    data.message += numeral(data.proc.uptime).format('00:00:00');
-    data.message += ' ';
-    data.message += ansicolors.brightBlack('load: [');
-    data.message += data.os.load.map(function (val) {
-      return numeral(val).format('0.00');
-    }).join(' ');
-    data.message += ansicolors.brightBlack(']');
-    data.message += ' ';
-    data.message += ansicolors.brightBlack('delay: ');
-    data.message += numeral(data.proc.delay).format('0.000');
-  }
-  else if (name === 'error') {
-    data.level = 'error';
-    data.message = event.error.message;
-    data.error = serializeError(event.error);
-    data.url = event.url;
-  }
-  else {
-    if (event.data instanceof Error) {
-      data.level = _.contains(event.tags, 'fatal') ? 'fatal' : 'error';
-      data.message = event.data.message;
-      data.error = serializeError(event.data);
-    } else {
-      data.message = event.data;
-    }
-  }
-  return data;
-};
diff --git a/src/server/lib/logging/good_reporters/console.js b/src/server/lib/logging/good_reporters/console.js
deleted file mode 100644
index cb0c3572d7ca3..0000000000000
--- a/src/server/lib/logging/good_reporters/console.js
+++ /dev/null
@@ -1,58 +0,0 @@
-var ansicolors = require('ansicolors');
-var eventToJson = require('./_event_to_json');
-var GoodReporter = require('good-reporter');
-var util = require('util');
-var moment = require('moment');
-var stringify = require('json-stringify-safe');
-var querystring = require('querystring');
-var numeral = require('numeral');
-
-var colors = {
-  log: 'blue',
-  req: 'green',
-  res: 'green',
-  ops: 'cyan',
-  err: 'red',
-  info: 'blue',
-  error: 'red',
-  fatal: 'magenta'
-};
-
-function stripColors(string) {
-  return string.replace(/\u001b[^m]+m/g, '');
-}
-
-var Console = module.exports = function (events, options) {
-  this._json = options.json;
-  GoodReporter.call(this, events);
-};
-util.inherits(Console, GoodReporter);
-
-Console.prototype.stop = function () { };
-
-Console.prototype._report = function (name, data) {
-  data = eventToJson(name, data);
-  var nameCrayon = ansicolors[colors[name.substr(0, 3)]];
-  var typeCrayon = ansicolors[colors[data.level]];
-  var output;
-  if (this._json) {
-    data.message = stripColors(data.message);
-    output = stringify(data);
-  } else {
-    output = nameCrayon(name.substr(0, 3));
-    output += ': ';
-    output += typeCrayon(data.level.toUpperCase());
-    output += ' ';
-    output += '[ ';
-    output += ansicolors.brightBlack(moment(data.timestamp).format());
-    output += ' ] ';
-
-    if (data.error) {
-      output += ansicolors.red(data.error.stack);
-    } else {
-      output += data.message;
-    }
-
-  }
-  console.log(output);
-};
diff --git a/src/server/lib/logging/good_reporters/file.js b/src/server/lib/logging/good_reporters/file.js
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/src/server/lib/logging/index.js b/src/server/lib/logging/index.js
deleted file mode 100644
index 96ccc8e770fa9..0000000000000
--- a/src/server/lib/logging/index.js
+++ /dev/null
@@ -1,35 +0,0 @@
-var Promise = require('bluebird');
-var good = require('good');
-var path = require('path');
-var join = path.join;
-var Console = require('./good_reporters/console');
-
-
-module.exports = function (server) {
-  return new Promise(function (resolve, reject) {
-    var reporters = [];
-    var config = server.config();
-
-    // If we are not quite then add the console logger
-    var filters = {};
-    if (!config.get('logging.quiet')) {
-      if (config.get('logging.console.ops') != null) filters.ops = config.get('logging.console.ops');
-      if (config.get('logging.console.log') != null) filters.log = config.get('logging.console.log');
-      if (config.get('logging.console.response') != null) filters.response = config.get('logging.console.response');
-      if (config.get('logging.console.error') != null) filters.error = config.get('logging.console.error');
-    }
-    reporters.push({ reporter: Console, args: [filters, { json: config.get('logging.console.json') } ] });
-    server.register({
-      register: good,
-      options: {
-        opsInterval: 5000,
-        logRequestHeaders: true,
-        logResponsePayload: true,
-        reporters: reporters
-      }
-    }, function (err) {
-      if (err) return reject(err);
-      resolve(server);
-    });
-  });
-};
diff --git a/src/server/lib/plugins/add_statics_for_public.js b/src/server/lib/plugins/add_statics_for_public.js
deleted file mode 100644
index ed946bb24ba9d..0000000000000
--- a/src/server/lib/plugins/add_statics_for_public.js
+++ /dev/null
@@ -1,18 +0,0 @@
-var Promise = require('bluebird');
-module.exports = function (plugin) {
-  if (plugin.publicPath) {
-    plugin.server.route({
-      config: {
-        id: plugin.name + ':public'
-      },
-      method: 'GET',
-      path: '/' + plugin.name + '/{paths*}',
-      handler: {
-        directory: {
-          path: plugin.publicPath
-        }
-      }
-    });
-  }
-  return Promise.resolve(plugin);
-};
diff --git a/src/server/lib/plugins/check_dependencies.js b/src/server/lib/plugins/check_dependencies.js
deleted file mode 100644
index be79aabb2b3c2..0000000000000
--- a/src/server/lib/plugins/check_dependencies.js
+++ /dev/null
@@ -1,18 +0,0 @@
-var _ = require('lodash');
-var checkDependencies = module.exports = function (name, deps, callStack) {
-  if (!deps[name]) throw new Error('Missing dependency: ' + name);
-  callStack = callStack || [];
-  if (_.contains(callStack, name)) {
-    callStack.push(name);
-    throw new Error('Circular dependency: ' + callStack.join(' -> '));
-  }
-  for (var i = 0; i < deps[name].length; i++) {
-    var task = deps[name][i];
-    if (!deps[task]) throw new Error('Missing dependency: ' + task);
-    if (deps[task].length) {
-      checkDependencies(task, deps, callStack.concat(name));
-    }
-  }
-  return true;
-};
-
diff --git a/src/server/lib/plugins/list_plugins.js b/src/server/lib/plugins/list_plugins.js
deleted file mode 100644
index f984efa09ef39..0000000000000
--- a/src/server/lib/plugins/list_plugins.js
+++ /dev/null
@@ -1,27 +0,0 @@
-var _ = require('lodash');
-var glob = require('glob');
-var path = require('path');
-
-var plugins = function (dir) {
-  if (!dir) return [];
-  var files = glob.sync(path.join(dir, '*', 'index.js')) || [];
-  return files.map(function (file) {
-    dir = dir.replace(/\\/g, '/');
-    return file.replace(dir, 'plugins').replace(/\.js$/, '');
-  });
-};
-
-var cache;
-
-module.exports = function (server) {
-  var config = server.config();
-  if (!cache) {
-    var bundled_plugin_ids = config.get('kibana.bundledPluginIds') || [];
-    var bundled_plugins = plugins(config.get('kibana.bundledPluginsFolder'));
-    var external_plugins = _(server.plugins).map(function (plugin, name) {
-      return plugin.self && plugin.self.publicPlugins || [];
-    }).flatten().value();
-    cache = bundled_plugin_ids.concat(bundled_plugins, external_plugins);
-  }
-  return cache;
-};
\ No newline at end of file
diff --git a/src/server/lib/plugins/load_kibana_plugins.js b/src/server/lib/plugins/load_kibana_plugins.js
deleted file mode 100644
index bc8c190a37e12..0000000000000
--- a/src/server/lib/plugins/load_kibana_plugins.js
+++ /dev/null
@@ -1,21 +0,0 @@
-var Promise = require('bluebird');
-var registerPlugins = require('./register_plugins');
-var requirePlugins = require('./require_plugins');
-var logging = require('../logging/');
-var registerPluginConfigs = require('./register_plugin_configs');
-
-module.exports = function (externalPlugins) {
-  // require all the internal plugins then concat witht the external
-  // plugins passed in from the start method.
-  var plugins = requirePlugins().concat(externalPlugins);
-  // setup logging then register the plugins
-  return logging(this)
-  // Setup the config schema for the plugins
-  .then(function (server) {
-    return registerPluginConfigs(server, plugins);
-  })
-  // Register the plugins
-  .then(function (server) {
-    return registerPlugins(server, plugins);
-  });
-};
diff --git a/src/server/lib/plugins/plugin.js b/src/server/lib/plugins/plugin.js
deleted file mode 100644
index 63a7049b23e8a..0000000000000
--- a/src/server/lib/plugins/plugin.js
+++ /dev/null
@@ -1,18 +0,0 @@
-var _ = require('lodash');
-var Promise = require('bluebird');
-
-function Plugin(options) {
-  this.server = null;
-  this.status = null;
-  this.publicPath = null;
-  this.require = [];
-  this.init = function (server, options) {
-    return Promise.reject(new Error('You must override the init function for plugins'));
-  };
-  this.config = function (Joi) {
-    return Joi.object({}).default();
-  };
-  _.assign(this, options);
-}
-
-module.exports = Plugin;
diff --git a/src/server/lib/plugins/register_plugin_configs.js b/src/server/lib/plugins/register_plugin_configs.js
deleted file mode 100644
index 682889b18f43e..0000000000000
--- a/src/server/lib/plugins/register_plugin_configs.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var Promise = require('bluebird');
-var Joi = require('joi');
-/**
- * Execute the #config() call on each of the plugins and attach their schema's
- * to the main config object under their namespace.
- * @param {object} server Kibana server
- * @param {array} plugins Plugins for Kibana
- * @returns {Promise}
- */
-module.exports = function (server, plugins) {
-  var config = server.config();
-  return Promise.each(plugins, function (plugin) {
-    return Promise.resolve(plugin.config(Joi)).then(function (schema) {
-      var pluginSchema = {};
-      if (schema) {
-        config.extendSchema(plugin.name, schema);
-      }
-    });
-  }).then(function () {
-    return server;
-  });
-};
diff --git a/src/server/lib/plugins/register_plugins.js b/src/server/lib/plugins/register_plugins.js
deleted file mode 100644
index 20deed50a0496..0000000000000
--- a/src/server/lib/plugins/register_plugins.js
+++ /dev/null
@@ -1,104 +0,0 @@
-var _ = require('lodash');
-var Promise = require('bluebird');
-var checkDependencies = require('./check_dependencies');
-var status = require('../status');
-var addStaticsForPublic = require('./add_statics_for_public');
-
-/**
- * Check to see if there are any circular dependencies for the task tree
- * @param {array} plugins an array of plugins
- * @returns {type} description
- */
-function checkForCircularDependency(plugins) {
-  var deps = {};
-  plugins.forEach(function (task) {
-    deps[task.name] = [];
-    if (task.require) deps[task.name] = task.require;
-  });
-  return _(deps)
-  .keys()
-  .map(function (task) {
-    return checkDependencies(task, deps);
-  })
-  .every(function (result) {
-    return result;
-  });
-}
-
-module.exports = function (server, plugins) {
-  var total = plugins.length;
-  var results = {};
-  var running = {};
-  var finished = false;
-  var todo = plugins.concat();
-
-  /**
-   * Checks to see if all the tasks are completed for an array of dependencies
-   * @param {array} tasks  An array of plugin names
-   * @returns {boolean} if all the tasks are done this it will return true
-   */
-  function allDone(tasks) {
-    var done = _.keys(results);
-    return tasks.every(function (dep) {
-      return _.contains(done, dep);
-    });
-  }
-
-  /**
-   * Register a plugin with the Kibana server
-   *
-   * This includes setting up the status object and setting the reference to
-   * the plugin's server
-   *
-   * @param {object} plugin The plugin to register
-   * @returns {Promise}
-   */
-  function registerPlugin(plugin) {
-    var config = server.config();
-    return new Promise(function (resolve, reject) {
-      var register = function (server, options, next) {
-        plugin.server = server;
-        plugin.server.expose('self', plugin);
-        status.createStatus(plugin);
-        Promise.try(plugin.init, [server, options], plugin).nodeify(next);
-      };
-      register.attributes = { name: plugin.name };
-      var options = config.get(plugin.name) || {};
-      server.register({ register: register, options: options }, function (err) {
-        if (err) return reject(err);
-        // Only change the plugin status to green if the intial status has not
-        // been updated from yellow - Initializing
-        if (plugin.status.state === undefined) {
-          plugin.status.green('Ready');
-        }
-        resolve(plugin);
-      });
-    });
-  }
-
-  return new Promise(function (resolve, reject) {
-    // Check to see if we have a circular dependency
-    if (checkForCircularDependency(plugins)) {
-      (function runPending() {
-        plugins.forEach(function (plugin) {
-          // The running tasks are the same length as the results then we are
-          // done with all the plugin initalization tasks
-          if (_.keys(results).length === total) return resolve(results);
-          // If the current plugin is done or running the continue to the next one
-          if (results[plugin.name] || running[plugin.name]) return;
-          // If the current plugin doesn't have dependencies or all the dependencies
-          // are fullfilled then try running the plugin.
-          if (!plugin.require || (plugin.require && allDone(plugin.require))) {
-            running[plugin.name] = true;
-            registerPlugin(plugin)
-            .then(addStaticsForPublic)
-            .then(function () {
-              results[plugin.name] = true;
-              runPending();
-            }).catch(reject);
-          }
-        });
-      })();
-    }
-  });
-};
diff --git a/src/server/lib/plugins/require_plugins.js b/src/server/lib/plugins/require_plugins.js
deleted file mode 100644
index 161f8a80d7711..0000000000000
--- a/src/server/lib/plugins/require_plugins.js
+++ /dev/null
@@ -1,32 +0,0 @@
-var path = require('path');
-var join = path.join;
-var glob = require('glob');
-var Promise = require('bluebird');
-var checkPath = require('../config/check_path');
-
-module.exports = function (globPath) {
-  globPath = globPath || join(__dirname, '..', '..', 'plugins', '*', 'index.js');
-  return glob.sync(globPath).map(function (file) {
-    var module = require(file);
-    var regex = new RegExp('([^/]+)/index.js');
-
-    var matches = file.match(regex);
-    if (!module.name && matches) {
-      module.name = matches[1];
-    }
-
-    // has a public folder?
-    var publicPath = (module.publicPath || join(path.dirname(file), 'public')).replace(/\\/g, '/');
-    if (checkPath(publicPath)) {
-      module.publicPath = publicPath;
-      if (!module.publicPlugins) {
-        module.publicPlugins = glob.sync(join(publicPath, 'plugins', '*', 'index.js'));
-        module.publicPlugins = module.publicPlugins.map(function (file) {
-          return file.replace(publicPath, module.name).replace(/\.js$/, '');
-        });
-      }
-    }
-
-    return module;
-  });
-};
\ No newline at end of file
diff --git a/src/server/lib/plugins/validate_plugin.js b/src/server/lib/plugins/validate_plugin.js
deleted file mode 100644
index 34d6234072d6d..0000000000000
--- a/src/server/lib/plugins/validate_plugin.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = function (plugin) {
-  return !!plugin.name;
-};
diff --git a/src/server/lib/run_setup_tasks.js b/src/server/lib/run_setup_tasks.js
deleted file mode 100644
index a110576e7c479..0000000000000
--- a/src/server/lib/run_setup_tasks.js
+++ /dev/null
@@ -1,6 +0,0 @@
-var Promise = require('bluebird');
-module.exports = function (server, tasks) {
-  return Promise.each(tasks, function (task) {
-    return task(server);
-  });
-};
diff --git a/src/server/lib/set_status.js b/src/server/lib/set_status.js
deleted file mode 100644
index bf7457f90053a..0000000000000
--- a/src/server/lib/set_status.js
+++ /dev/null
@@ -1,4 +0,0 @@
-var status = require('./status');
-module.exports = function (name, color, message ) {
-  status[name] = { state: color, message: message };
-};
diff --git a/src/server/lib/start.js b/src/server/lib/start.js
deleted file mode 100644
index e1fde4e1251d0..0000000000000
--- a/src/server/lib/start.js
+++ /dev/null
@@ -1,61 +0,0 @@
-var _ = require('lodash');
-var Promise = require('bluebird');
-var Hapi = require('hapi');
-var requirePlugins = require('./plugins/require_plugins');
-var validatePlugin = require('./plugins/validate_plugin');
-var extendHapi = require('./extend_hapi');
-var join = require('path').join;
-
-
-module.exports = function (settings, plugins) {
-  // Plugin authors can use this to add plugins durring development
-  plugins = plugins || [];
-
-  if (plugins.length && !plugins.every(validatePlugin)) {
-    return Promise.reject(new Error('Plugins must have a name attribute.'));
-  }
-
-  // Initalize the Hapi server
-  var server = new Hapi.Server();
-
-  // Extend Hapi with Kibana
-  extendHapi(server);
-
-  var config = server.config();
-  if (settings) config.set(settings);
-
-  // Create a new connection
-  server.connection({
-    host: config.get('kibana.server.host'),
-    port: config.get('kibana.server.port')
-  });
-
-  // Load external plugins
-  var externalPlugins = [];
-  var externalPluginsFolder = config.get('kibana.externalPluginsFolder');
-  if (externalPluginsFolder) {
-    externalPlugins = _([externalPluginsFolder])
-      .flatten()
-      .map(requirePlugins)
-      .flatten()
-      .value();
-  }
-
-  // Load the plugins
-  return server.loadKibanaPlugins(externalPlugins.concat(plugins))
-  .then(function () {
-    // Start the server
-    return new Promise(function (resolve, reject) {
-      server.start(function (err) {
-        if (err) return reject(err);
-        server.log('server', 'Server running at ' + server.info.uri);
-        resolve(server);
-      });
-    });
-  })
-  .catch(function (err) {
-    server.log('fatal', err);
-    console.log(err.stack);
-    return Promise.reject(err);
-  });
-};
diff --git a/src/server/lib/status/index.js b/src/server/lib/status/index.js
deleted file mode 100644
index a7b9a96cab41f..0000000000000
--- a/src/server/lib/status/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var logStatusChange = require('./log_status_change');
-var Status = require('./status');
-
-function SystemStatus() {
-  this.data = {};
-}
-
-SystemStatus.prototype.createStatus = function (plugin) {
-  plugin.status = new Status(plugin.name);
-  plugin.server.expose('status', plugin.status);
-  plugin.status.on('change', logStatusChange(plugin));
-  this.data[plugin.name] = plugin.status;
-};
-
-SystemStatus.prototype.toJSON = function () {
-  return this.data;
-};
-
-module.exports = new SystemStatus();
diff --git a/src/server/lib/status/log_status_change.js b/src/server/lib/status/log_status_change.js
deleted file mode 100644
index 1d606dacf099a..0000000000000
--- a/src/server/lib/status/log_status_change.js
+++ /dev/null
@@ -1,7 +0,0 @@
-var util = require('util');
-module.exports = function (plugin) {
-  return function (current, previous) {
-    var logMsg = util.format('[ %s ] Change status from %s to %s - %s', plugin.name, previous.state, current.state, current.message);
-    plugin.server.log('plugin', logMsg);
-  };
-};
diff --git a/src/server/lib/status/status.js b/src/server/lib/status/status.js
deleted file mode 100644
index 1c934d73f6ed0..0000000000000
--- a/src/server/lib/status/status.js
+++ /dev/null
@@ -1,35 +0,0 @@
-var util = require('util');
-var EventEmitter = require('events').EventEmitter;
-
-util.inherits(Status, EventEmitter);
-function Status(name) {
-  this.name = name;
-  this.state = undefined;
-  this.message = 'uninitialized';
-  EventEmitter.call(this);
-  var self = this;
-}
-
-function createStatusFn(color) {
-  return function (message) {
-    var previous = {
-      state: this.state,
-      message: this.message
-    };
-    this.state = color;
-    this.message = message;
-    if (previous.state === this.state && previous.message === this.message) return;
-    this.emit(color, message, previous);
-    this.emit('change', this.toJSON(), previous);
-  };
-}
-
-Status.prototype.green = createStatusFn('green');
-Status.prototype.yellow = createStatusFn('yellow');
-Status.prototype.red = createStatusFn('red');
-
-Status.prototype.toJSON = function () {
-  return { state: this.state, message: this.message };
-};
-
-module.exports = Status;
diff --git a/src/server/lib/write_pid_file.js b/src/server/lib/write_pid_file.js
deleted file mode 100644
index d7ac5bc74a472..0000000000000
--- a/src/server/lib/write_pid_file.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var fs = require('fs');
-var Promise = require('bluebird');
-module.exports = function (server) {
-  return new Promise(function (resolve, reject) {
-    var config = server.config();
-    var pidFile = config.get('kibana.server.pidFile');
-    if (!pidFile) return resolve(server);
-    fs.writeFile(pidFile, process.pid, function (err) {
-      if (err) {
-        server.log('error', { err: err });
-        return reject(err);
-      }
-      resolve(server);
-    });
-  });
-};
diff --git a/src/server/logging/LogFormat.js b/src/server/logging/LogFormat.js
new file mode 100644
index 0000000000000..0056cd71c9c31
--- /dev/null
+++ b/src/server/logging/LogFormat.js
@@ -0,0 +1,134 @@
+'use strict';
+
+let Stream = require('stream');
+let moment = require('moment');
+let _ = require('lodash');
+let numeral = require('numeral');
+let ansicolors = require('ansicolors');
+let stringify = require('json-stringify-safe');
+let querystring = require('querystring');
+let inspect = require('util').inspect;
+
+function serializeError(err) {
+  return {
+    message: err.message,
+    name: err.name,
+    stack: err.stack,
+    code: err.code,
+    signal: err.signal
+  };
+}
+
+let levelColor = function (code) {
+  if (code < 299) return ansicolors.green(code);
+  if (code < 399) return ansicolors.yellow(code);
+  if (code < 499) return ansicolors.magenta(code);
+  return ansicolors.red(code);
+};
+
+module.exports = class TransformObjStream extends Stream.Transform {
+  constructor() {
+    super({
+      readableObjectMode: false,
+      writableObjectMode: true
+    });
+  }
+
+  _transform(event, enc, next) {
+    var data = this.readEvent(event);
+    this.push(this.format(data) + '\n');
+    next();
+  }
+
+  readEvent(event) {
+    var data = {
+      type: event.event,
+      '@timestamp': moment.utc(event.timestamp).format(),
+      tags: [].concat(event.tags || []),
+      pid: event.pid
+    };
+
+    if (data.type === 'response') {
+      _.defaults(data, _.pick(event, [
+        'method',
+        'statusCode'
+      ]));
+
+      data.req = {
+        url: event.path,
+        method: event.method,
+        headers: event.headers,
+        remoteAddress: event.source.remoteAddress,
+        userAgent: event.source.remoteAddress,
+        referer: event.source.referer
+      };
+
+      var contentLength = 0;
+      if (typeof event.responsePayload === 'object') {
+        contentLength = stringify(event.responsePayload).length;
+      } else {
+        contentLength = String(event.responsePayload).length;
+      }
+
+      data.res = {
+        statusCode: event.statusCode,
+        responseTime: event.responseTime,
+        contentLength: contentLength
+      };
+
+      var query = querystring.stringify(event.query);
+      if (query) data.req.url += '?' + query;
+
+
+      data.message  = data.req.method.toUpperCase() + ' ';
+      data.message += data.req.url;
+      data.message += ' ';
+      data.message += levelColor(data.res.statusCode);
+      data.message += ' ';
+      data.message += ansicolors.brightBlack(data.res.responseTime + 'ms');
+      data.message += ansicolors.brightBlack(' - ' + numeral(contentLength).format('0.0b'));
+    }
+    else if (data.type === 'ops') {
+      _.defaults(data, _.pick(event, [
+        'pid',
+        'os',
+        'proc',
+        'load'
+      ]));
+      data.message  = ansicolors.brightBlack('memory: ');
+      data.message += numeral(data.proc.mem.heapUsed).format('0.0b');
+      data.message += ' ';
+      data.message += ansicolors.brightBlack('uptime: ');
+      data.message += numeral(data.proc.uptime).format('00:00:00');
+      data.message += ' ';
+      data.message += ansicolors.brightBlack('load: [');
+      data.message += data.os.load.map(function (val) {
+        return numeral(val).format('0.00');
+      }).join(' ');
+      data.message += ansicolors.brightBlack(']');
+      data.message += ' ';
+      data.message += ansicolors.brightBlack('delay: ');
+      data.message += numeral(data.proc.delay).format('0.000');
+    }
+    else if (data.type === 'error') {
+      data.level = 'error';
+      data.message = event.error.message;
+      data.error = serializeError(event.error);
+      data.url = event.url;
+    }
+    else if (event.data instanceof Error) {
+      data.level = _.contains(event.tags, 'fatal') ? 'fatal' : 'error';
+      data.message = event.data.message;
+      data.error = serializeError(event.data);
+    }
+    else if (_.isPlainObject(event.data) && event.data.tmpl) {
+      _.assign(data, event.data);
+      data.tmpl = undefined;
+      data.message = _.template(event.data.tmpl)(event.data);
+    }
+    else {
+      data.message = _.isString(event.data) ? event.data : inspect(event.data);
+    }
+    return data;
+  }
+};
diff --git a/src/server/logging/LogFormatJson.js b/src/server/logging/LogFormatJson.js
new file mode 100644
index 0000000000000..2bc7a3d598749
--- /dev/null
+++ b/src/server/logging/LogFormatJson.js
@@ -0,0 +1,15 @@
+'use strict';
+
+let LogFormat = require('./LogFormat');
+let stringify = require('json-stringify-safe');
+
+let stripColors = function (string) {
+  return string.replace(/\u001b[^m]+m/g, '');
+};
+
+module.exports = class KbnLoggerJsonFormat extends LogFormat {
+  format(data) {
+    data.message = stripColors(data.message);
+    return stringify(data);
+  }
+};
diff --git a/src/server/logging/LogFormatString.js b/src/server/logging/LogFormatString.js
new file mode 100644
index 0000000000000..05d16aa511f48
--- /dev/null
+++ b/src/server/logging/LogFormatString.js
@@ -0,0 +1,52 @@
+'use strict';
+
+let _ = require('lodash');
+let ansicolors = require('ansicolors');
+let moment = require('moment');
+
+let LogFormat = require('./LogFormat');
+
+let typeColors = {
+  log: 'blue',
+  req: 'green',
+  res: 'green',
+  ops: 'cyan',
+  err: 'red',
+  info: 'green',
+  error: 'red',
+  warning: 'red',
+  fatal: 'magenta',
+  status: 'yellow',
+  debug: 'brightBlack',
+  server: 'brightBlack',
+  optmzr: 'white',
+  optimize: 'magenta',
+  listening: 'magenta'
+};
+
+let color = _.memoize(function (name) {
+  return ansicolors[typeColors[name]] || _.identity;
+});
+
+let type = _.memoize(function (t) {
+  return color(t)(_.pad(t, 7).slice(0, 7));
+});
+
+let workerType = process.env.kbnWorkerType ? `${type(process.env.kbnWorkerType)} ` : '';
+
+module.exports = class KbnLoggerJsonFormat extends LogFormat {
+  format(data) {
+    let time = color('time')(moment(data.timestamp).format('HH:mm:ss.SSS'));
+    let msg = data.error ? color('error')(data.error.stack) : color('message')(data.message);
+
+    let tags = _(data.tags)
+    .sortBy(function (tag) {
+      return color(tag) === _.identity ? `1${tag}` : `0${tag}`;
+    })
+    .reduce(function (s, t) {
+      return s + `[${ color(t)(t) }]`;
+    }, '');
+
+    return `${workerType}${type(data.type)} [${time}] ${tags} ${msg}`;
+  }
+};
diff --git a/src/server/logging/LogReporter.js b/src/server/logging/LogReporter.js
new file mode 100644
index 0000000000000..0ee276e7da501
--- /dev/null
+++ b/src/server/logging/LogReporter.js
@@ -0,0 +1,35 @@
+'use strict';
+
+let _ = require('lodash');
+let Squeeze = require('good-squeeze').Squeeze;
+let writeStr = require('fs').createWriteStream;
+
+let LogFormatJson = require('./LogFormatJson');
+let LogFormatString = require('./LogFormatString');
+
+module.exports = class KbnLogger {
+  constructor(events, config) {
+    this.squeeze = new Squeeze(events);
+    this.format = config.json ? new LogFormatJson() : new LogFormatString();
+
+    if (config.dest === 'stdout') {
+      this.dest = process.stdout;
+    } else {
+      this.dest = writeStr(config.dest, {
+        mode: 'a',
+        encoding: 'utf8'
+      });
+    }
+  }
+
+  init(readstream, emitter, callback) {
+    readstream
+    .pipe(this.squeeze)
+    .pipe(this.format)
+    .pipe(this.dest);
+
+    emitter.on('stop', _.noop);
+
+    callback();
+  }
+};
diff --git a/src/server/logging/index.js b/src/server/logging/index.js
new file mode 100644
index 0000000000000..57a480ce35636
--- /dev/null
+++ b/src/server/logging/index.js
@@ -0,0 +1,58 @@
+'use strict';
+
+let _ = require('lodash');
+let fromNode = require('bluebird').fromNode;
+
+module.exports = function (kbnServer, server, config) {
+  return fromNode(function (cb) {
+    let events = config.get('logging.events');
+
+    if (config.get('logging.silent')) {
+      _.defaults(events, {});
+    }
+    else if (config.get('logging.quiet')) {
+      _.defaults(events, {
+        log: ['listening', 'error', 'fatal'],
+        error: '*'
+      });
+    }
+    else if (config.get('logging.verbose')) {
+      _.defaults(events, {
+        log: '*',
+        ops: '*',
+        request: '*',
+        response: '*',
+        error: '*'
+      });
+    }
+    else {
+      _.defaults(events, {
+        log: ['info', 'warning', 'error', 'fatal'],
+        response: config.get('logging.json') ? '*' : '!',
+        error: '*'
+      });
+    }
+
+    server.register({
+      register: require('good'),
+      options: {
+        opsInterval: 5000,
+        requestHeaders: true,
+        requestPayload: true,
+        reporters: [
+          {
+            reporter: require('./LogReporter'),
+            config: {
+              json: config.get('logging.json'),
+              dest: config.get('logging.dest')
+            },
+            events: _.transform(events, function (filtered, val, key) {
+              // provide a string compatible way to remove events
+              if (val !== '!') filtered[key] = val;
+            }, {})
+          }
+        ]
+      }
+    }, cb);
+  });
+};
diff --git a/src/server/pid/index.js b/src/server/pid/index.js
new file mode 100644
index 0000000000000..774eae3d82d44
--- /dev/null
+++ b/src/server/pid/index.js
@@ -0,0 +1,51 @@
+var _ = require('lodash');
+var Promise = require('bluebird');
+var writeFile = Promise.promisify(require('fs').writeFile);
+var unlink = require('fs').unlinkSync;
+
+module.exports = Promise.method(function (kbnServer, server, config) {
+  var path = config.get('pid.file');
+  if (!path) return;
+
+  var pid = String(process.pid);
+
+  return writeFile(path, pid, { flag: 'wx' })
+  .catch(function (err) {
+    if (err.code !== 'EEXIST') throw err;
+
+    var log = {
+      tmpl: 'pid file already exists at <%= path %>',
+      path: path,
+      pid: pid
+    };
+
+    if (config.get('pid.exclusive')) {
+      server.log(['pid', 'fatal'], log);
+      process.exit(1);
+    } else {
+      server.log(['pid', 'warning'], log);
+    }
+
+    return writeFile(path, pid);
+  })
+  .then(function () {
+
+    server.log(['pid', 'debug'], {
+      tmpl: 'wrote pid file to <%= path %>',
+      path: path,
+      pid: pid
+    });
+
+    var clean = _.once(function (code) {
+      unlink(path);
+    });
+
+    process.once('exit', clean); // for "natural" exits
+    process.once('SIGINT', function () { // for Ctrl-C exits
+      clean();
+
+      // resend SIGINT
+      process.kill(process.pid, 'SIGINT');
+    });
+  });
+});
diff --git a/src/server/plugins/Plugin.js b/src/server/plugins/Plugin.js
new file mode 100644
index 0000000000000..cc1004d2fb089
--- /dev/null
+++ b/src/server/plugins/Plugin.js
@@ -0,0 +1,104 @@
+'use strict';
+
+let _ = require('lodash');
+let inherits = require('util').inherits;
+let Joi = require('joi');
+let Promise = require('bluebird');
+let resolve = require('path').resolve;
+
+const defaultConfigSchema = Joi.object({
+  enabled: Joi.boolean().default(true)
+}).default();
+
+module.exports = class Plugin {
+  constructor(kbnServer, path, pkg, opts) {
+    this.kbnServer = kbnServer;
+    this.pkg = pkg;
+    this.path = path;
+
+    this.id = opts.id || pkg.name;
+    this.uiExportsSpecs = opts.uiExports || {};
+    this.requiredIds = opts.require || [];
+    this.version = opts.version || pkg.version;
+    this.publicDir = opts.publicDir !== false ? resolve(path, 'public') : null;
+    this.externalCondition = opts.initCondition || _.constant(true);
+    this.externalInit = opts.init || _.noop;
+    this.getConfigSchema = opts.config || _.noop;
+    this.init = _.once(this.init);
+  }
+
+  static scoped(kbnServer, path, pkg) {
+    return class ScopedPlugin extends Plugin {
+      constructor(opts) {
+        super(kbnServer, path, pkg, opts || {});
+      }
+    };
+  }
+
+  init() {
+    let self = this;
+
+    let id = self.id;
+    let version = self.version;
+    let kbnStatus = self.kbnServer.status;
+    let server = self.kbnServer.server;
+    let config = self.kbnServer.config;
+
+    server.log(['plugins', 'debug'], {
+      tmpl: 'Initializing plugin <%= plugin.id %>',
+      plugin: self
+    });
+
+    self.status = kbnStatus.create(`plugin:${self.id}`);
+    return Promise.try(function () {
+      return self.getConfigSchema(Joi);
+    })
+    .then(function (schema) {
+      if (schema) config.extendSchema(id, schema);
+      else config.extendSchema(id, defaultConfigSchema);
+    })
+    .then(function () {
+      if (config.get([id, 'enabled'])) {
+        return self.externalCondition(config);
+      }
+    })
+    .then(function (enabled) {
+      if (!enabled) {
+        // Only change the plugin status if it wasn't set by the externalCondition
+        if (self.status.state === 'uninitialized') {
+          self.status.disabled();
+        }
+        return;
+      }
+
+      let register = function (server, options, next) {
+        server.expose('status', self.status);
+        Promise.try(self.externalInit, [server, options], self).nodeify(next);
+      };
+
+      register.attributes = { name: id, version: version };
+
+      return Promise.fromNode(function (cb) {
+        server.register({
+          register: register,
+          options: config.has(id) ? config.get(id) : null
+        }, cb);
+      })
+      .then(function () {
+        // Only change the plugin status to green if the
+        // intial status has not been updated
+        if (self.status.state === 'uninitialized') {
+          self.status.green('Ready');
+        }
+      });
+    });
+  }
+
+  toJSON() {
+    return this.pkg;
+  }
+
+  toString() {
+    return `${this.id}@${this.version}`;
+  }
+};
diff --git a/src/server/plugins/PluginApi.js b/src/server/plugins/PluginApi.js
new file mode 100644
index 0000000000000..f1f8c303d92f4
--- /dev/null
+++ b/src/server/plugins/PluginApi.js
@@ -0,0 +1,17 @@
+'use strict';
+
+let _ = require('lodash');
+let Plugin = require('./Plugin');
+let basename = require('path').basename;
+let 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');
+    this.Plugin = Plugin.scoped(kibana, pluginPath, this.package);
+    this.mixin = _.bindKey(kibana, 'mixin');
+  }
+};
diff --git a/src/server/plugins/Plugins.js b/src/server/plugins/Plugins.js
new file mode 100644
index 0000000000000..62b5daae339bb
--- /dev/null
+++ b/src/server/plugins/Plugins.js
@@ -0,0 +1,33 @@
+'use strict';
+
+let _ = require('lodash');
+let inspect = require('util').inspect;
+let PluginApi = require('./PluginApi');
+
+module.exports = class Plugins extends Array {
+
+  constructor(kbnServer) {
+    super();
+    this.kbnServer = kbnServer;
+  }
+
+  new(path) {
+    var self = this;
+    var api = new PluginApi(this.kbnServer, path);
+
+    [].concat(require(path)(api) || [])
+    .forEach(function (out) {
+      if (out instanceof api.Plugin) {
+        self._byId = null;
+        self.push(out);
+      } else {
+        throw new TypeError('unexpected plugin export ' + inspect(out));
+      }
+    });
+  }
+
+  get byId() {
+    return this._byId || (this._byId = _.indexBy(this, 'id'));
+  }
+
+};
diff --git a/src/server/plugins/config/index.js b/src/server/plugins/config/index.js
deleted file mode 100644
index b771570d6fb91..0000000000000
--- a/src/server/plugins/config/index.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var _ = require('lodash');
-var Promise = require('bluebird');
-var kibana = require('../../');
-var listPlugins = require('../../lib/plugins/list_plugins');
-
-module.exports = new kibana.Plugin({
-  init: function (server, options) {
-
-    server.route({
-      method: 'GET',
-      path: '/config',
-      handler: function (request, reply) {
-        var config = server.config();
-        reply({
-          kibana_index: config.get('kibana.index'),
-          default_app_id: config.get('kibana.defaultAppId'),
-          shard_timeout: config.get('elasticsearch.shardTimeout'),
-          plugins: listPlugins(server)
-        });
-      }
-    });
-
-  }
-});
diff --git a/src/server/plugins/elasticsearch/index.js b/src/server/plugins/elasticsearch/index.js
deleted file mode 100644
index b95d86275ddc3..0000000000000
--- a/src/server/plugins/elasticsearch/index.js
+++ /dev/null
@@ -1,47 +0,0 @@
-var url = require('url');
-var http = require('http');
-var fs = require('fs');
-var resolve = require('url').resolve;
-var querystring = require('querystring');
-var kibana = require('../../');
-var healthCheck = require('./lib/health_check');
-var exposeClient = require('./lib/expose_client');
-var createProxy = require('./lib/create_proxy');
-
-module.exports = new kibana.Plugin({
-
-  init: function (server, options) {
-    var config = server.config();
-
-    // Expose the client to the server
-    exposeClient(server);
-
-
-    createProxy(server, 'GET', '/elasticsearch/{paths*}');
-    createProxy(server, 'POST', '/elasticsearch/_mget');
-    createProxy(server, 'POST', '/elasticsearch/_msearch');
-
-    function noBulkCheck(request, reply) {
-      if (/\/_bulk/.test(request.path)) {
-        return reply({
-          error: 'You can not send _bulk requests to this interface.'
-        }).code(400).takeover();
-      }
-      return reply.continue();
-    }
-
-    createProxy(
-      server,
-      ['PUT', 'POST', 'DELETE'],
-      '/elasticsearch/' + config.get('kibana.index') + '/{paths*}',
-      {
-        prefix: '/' + config.get('kibana.index'),
-        config: { pre: [ noBulkCheck ] }
-      }
-    );
-
-    // Set up the health check service and start it.
-    healthCheck(this, server).start();
-
-  }
-});
diff --git a/src/server/plugins/elasticsearch/lib/check_es_version.js b/src/server/plugins/elasticsearch/lib/check_es_version.js
deleted file mode 100644
index 3c53415719f6e..0000000000000
--- a/src/server/plugins/elasticsearch/lib/check_es_version.js
+++ /dev/null
@@ -1,37 +0,0 @@
-var _ = require('lodash');
-var esBool = require('./es_bool');
-var versionMath = require('./version_math');
-var SetupError = require('./setup_error');
-module.exports = function (server) {
-  return function () {
-    var client = server.plugins.elasticsearch.client;
-    var minimumElasticsearchVersion = server.config().get('elasticsearch.minimumVerison');
-    return client.nodes.info()
-      .then(function (info) {
-        var badNodes = _.filter(info.nodes, function (node) {
-          // remove client nodes (Logstash)
-          var isClient = _.get(node, 'attributes.client');
-          if (isClient != null && esBool(isClient) === true) {
-            return false;
-          }
-
-          // remove nodes that are gte the min version
-          var v = node.version.split('-')[0];
-          return !versionMath.gte(minimumElasticsearchVersion, v);
-        });
-
-        if (!badNodes.length) return true;
-
-        var badNodeNames = badNodes.map(function (node) {
-          return 'Elasticsearch v' + node.version + ' @ ' + node.http_address + ' (' + node.ip + ')';
-        });
-
-        var message = 'This version of Kibana requires Elasticsearch ' +
-          minimumElasticsearchVersion + ' or higher on all nodes. ' +
-          'I found the following incompatible nodes in your cluster: ' +
-          badNodeNames.join(',');
-        server.plugins.elasticsearch.status.red(message);
-        throw new SetupError(server, message);
-      });
-  };
-};
diff --git a/src/server/plugins/elasticsearch/lib/health_check.js b/src/server/plugins/elasticsearch/lib/health_check.js
deleted file mode 100644
index de56dafe61af5..0000000000000
--- a/src/server/plugins/elasticsearch/lib/health_check.js
+++ /dev/null
@@ -1,90 +0,0 @@
-var Promise = require('bluebird');
-var elasticsearch = require('elasticsearch');
-var exposeClient = require('./expose_client');
-var migrateConfig = require('./migrate_config');
-var createKibanaIndex = require('./create_kibana_index');
-var checkEsVersion = require('./check_es_version');
-var NoConnections = elasticsearch.errors.NoConnections;
-var util = require('util');
-var format = util.format;
-module.exports = function (plugin, server) {
-  var config = server.config();
-  var client = server.plugins.elasticsearch.client;
-
-  plugin.status.yellow('Waiting for Elasticsearch');
-
-
-  function waitForPong() {
-    return client.ping({ requestTimeout: 1500 }).catch(function (err) {
-      if (!(err instanceof NoConnections)) throw err;
-
-      plugin.status.red(format('Unable to connect to Elasticsearch at %s. Retrying in 2.5 seconds.', config.get('elasticsearch.url')));
-
-      return Promise.delay(2500).then(waitForPong);
-    });
-  }
-
-  function waitForShards() {
-    return client.cluster.health({
-      timeout: '5s', // tells es to not sit around and wait forever
-      index: config.get('kibana.index')
-    })
-    .then(function (resp) {
-      // if "timed_out" === true then elasticsearch could not
-      // find any idices matching our filter within 5 seconds
-      if (resp.timed_out) {
-        plugin.status.yellow('No existing Kibana index found');
-        return createKibanaIndex(server);
-      }
-
-      // If status === "red" that means that index(es) were found
-      // but the shards are not ready for queries
-      if (resp.status === 'red') {
-        plugin.status.red('Elasticsearch is still initializing the kibana index... Trying again in 2.5 second.');
-        return Promise.delay(2500).then(waitForShards);
-      }
-
-      // otherwise we are g2g
-      plugin.status.green('Kibana index ready');
-    });
-  }
-
-  var running = false;
-
-  function runHealthCheck() {
-    if (running) {
-      setTimeout(function () {
-        healthCheck()
-        .then(runHealthCheck)
-        .catch(function (err) {
-          server.log('error', err);
-          runHealthCheck();
-        });
-      }, 2500);
-    }
-  }
-
-  function healthCheck() {
-    return waitForPong()
-    .then(checkEsVersion(server))
-    .then(waitForShards)
-    .then(migrateConfig(server));
-  }
-
-  return {
-    isRunning: function () {
-      return running;
-    },
-    run: function () {
-      return healthCheck();
-    },
-    start: function () {
-      running = true;
-      return healthCheck().then(runHealthCheck, runHealthCheck);
-    },
-    stop: function () {
-      running = false;
-    }
-  };
-
-};
diff --git a/src/server/plugins/elasticsearch/lib/is_upgradeable.js b/src/server/plugins/elasticsearch/lib/is_upgradeable.js
deleted file mode 100644
index 30418c68740de..0000000000000
--- a/src/server/plugins/elasticsearch/lib/is_upgradeable.js
+++ /dev/null
@@ -1,33 +0,0 @@
-var semver = require('semver');
-var rcVersionRegex = /(\d+\.\d+\.\d+)\-rc(\d+)/i;
-
-module.exports = function (server, doc) {
-  var config = server.config();
-  if (/beta|snapshot/i.test(doc._id)) return false;
-  if (!doc._id) return false;
-  if (doc._id === config.get('kibana.package.version')) return false;
-
-  var packageRcRelease = Infinity;
-  var rcRelease = Infinity;
-  var packageVersion = config.get('kibana.package.version');
-  var version = doc._id;
-  var matches = doc._id.match(rcVersionRegex);
-  var packageMatches = config.get('kibana.package.version').match(rcVersionRegex);
-
-  if (matches) {
-    version = matches[1];
-    rcRelease = parseInt(matches[2], 10);
-  }
-
-  if (packageMatches) {
-    packageVersion = packageMatches[1];
-    packageRcRelease = parseInt(packageMatches[2], 10);
-  }
-
-  try {
-    if (semver.gte(version, packageVersion) && rcRelease >= packageRcRelease) return false;
-  } catch (e) {
-    return false;
-  }
-  return true;
-};
diff --git a/src/server/plugins/elasticsearch/lib/migrate_config.js b/src/server/plugins/elasticsearch/lib/migrate_config.js
deleted file mode 100644
index efa845ce55c08..0000000000000
--- a/src/server/plugins/elasticsearch/lib/migrate_config.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var upgrade = require('./upgrade_config');
-
-module.exports = function (server) {
-  return function () {
-    var config = server.config();
-    var client = server.plugins.elasticsearch.client;
-    var options =  {
-      index: config.get('kibana.index'),
-      type: 'config',
-      body: {
-        size: 1000,
-        sort: [ { buildNum: { order: 'desc' } } ]
-      }
-    };
-
-    return client.search(options).then(upgrade(server));
-  };
-};
-
-
diff --git a/src/server/plugins/elasticsearch/lib/upgrade_config.js b/src/server/plugins/elasticsearch/lib/upgrade_config.js
deleted file mode 100644
index 303ee87cb3bfa..0000000000000
--- a/src/server/plugins/elasticsearch/lib/upgrade_config.js
+++ /dev/null
@@ -1,58 +0,0 @@
-var Promise = require('bluebird');
-var isUpgradeable = require('./is_upgradeable');
-var _ = require('lodash');
-var format = require('util').format;
-module.exports = function (server) {
-
-  var MAX_INTEGER = Math.pow(2, 53) - 1;
-
-  var client = server.plugins.elasticsearch.client;
-  var config = server.config();
-  return function (response) {
-    var newConfig = {};
-
-    // Check to see if there are any doc. If not then we set the build number and id
-    if (response.hits.hits.length === 0) {
-      var isProduction = process.env.NODE_ENV === 'production';
-      return client.create({
-          index: config.get('kibana.index'),
-          type: 'config',
-          body: {
-            buildNum: isProduction ? config.get('kibana.buildNum') : MAX_INTEGER
-          },
-          id: isProduction ? config.get('kibana.package.version') : '@@version'
-        });
-    }
-
-    // if we already have a the current version in the index then we need to stop
-    if (_.find(response.hits.hits, function currentVersion(hit) {
-      var versionSpecified = hit._id !== '@@version';
-      var indexVersionMatchesConfig = hit._id === config.get('kibana.package.version');
-      return versionSpecified && indexVersionMatchesConfig;
-    })) {
-      return Promise.resolve();
-    }
-
-    // Look for upgradeable configs. If none of them are upgradeable
-    // then resolve with null.
-    var body = _.find(response.hits.hits, isUpgradeable.bind(null, server));
-    if (!body) return Promise.resolve();
-
-    // if the build number is still the template string (which it wil be in development)
-    // then we need to set it to the max interger. Otherwise we will set it to the build num
-    body._source.buildNum = MAX_INTEGER;
-    if (!/^@@/.test(config.get('kibana.buildNum'))) {
-      body._source.buildNum = parseInt(config.get('kibana.buildNum'), 10);
-    }
-
-    var logMsg = format('[ elasticsearch ] Upgrade config from %s to %s', body._id, config.get('kibana.package.version'));
-    server.log('plugin', logMsg);
-    return client.create({
-      index: config.get('kibana.index'),
-      type: 'config',
-      body: body._source,
-      id: config.get('kibana.package.version')
-    });
-  };
-};
-
diff --git a/src/server/plugins/index.js b/src/server/plugins/index.js
new file mode 100644
index 0000000000000..dadb13f8d4a1f
--- /dev/null
+++ b/src/server/plugins/index.js
@@ -0,0 +1,25 @@
+module.exports = function (kbnServer, server, config) {
+  var _ = require('lodash');
+  var Promise = require('bluebird');
+  var Boom = require('boom');
+  var join = require('path').join;
+
+  server.exposeStaticDir('/plugins/{id}/{path*}', function (req) {
+    var id = req.params.id;
+    var plugin = kbnServer.plugins.byId[id];
+    return (plugin && plugin.publicDir) ? plugin.publicDir : Boom.notFound();
+  });
+
+  server.method('kbnPluginById', function (id, next) {
+    if (kbnServer.plugins.byId[id]) {
+      next(null, kbnServer.plugins.byId[id]);
+    } else {
+      next(Boom.notFound(`no plugin with the id "${id}"`));
+    }
+  });
+
+  return kbnServer.mixin(
+    require('./scan'),
+    require('./load')
+  );
+};
diff --git a/src/server/plugins/load.js b/src/server/plugins/load.js
new file mode 100644
index 0000000000000..31b2f1fbee40c
--- /dev/null
+++ b/src/server/plugins/load.js
@@ -0,0 +1,54 @@
+'use strict';
+
+module.exports = function (kbnServer, server, config) {
+  let _ = require('lodash');
+  let resolve = require('bluebird').resolve;
+  let all = require('bluebird').all;
+  let attempt = require('bluebird').attempt;
+
+  var Plugins = require('./Plugins');
+  var plugins = kbnServer.plugins = new Plugins(kbnServer);
+
+  let path = [];
+  let step = function (id, block) {
+    return resolve(id)
+    .then(function (id) {
+      if (_.includes(path, id)) {
+        throw new Error(`circular dependencies found: "${path.concat(id).join(' -> ')}"`);
+      }
+
+      path.push(id);
+      return block();
+    })
+    .then(function () {
+      path.pop(id);
+    });
+  };
+
+  return resolve(kbnServer.pluginPaths)
+  .map(function (path) {
+    return plugins.new(path);
+  })
+  .then(function () {
+    if (!config.get('plugins.initialize')) {
+      server.log(['info'], 'Plugin initialization disabled.');
+      return [];
+    }
+
+    return _.toArray(plugins);
+  })
+  .each(function loadReqsAndInit(plugin) {
+    return step(plugin.id, function () {
+      return resolve(plugin.requiredIds).map(function (reqId) {
+        if (!plugins.byId[reqId]) {
+          throw new Error(`Unmet requirement "${reqId}" for plugin "${plugin.id}"`);
+        }
+
+        return loadReqsAndInit(plugins.byId[reqId]);
+      })
+      .then(function () {
+        return plugin.init();
+      });
+    });
+  });
+};
diff --git a/src/server/plugins/scan.js b/src/server/plugins/scan.js
new file mode 100644
index 0000000000000..481878d7d74ec
--- /dev/null
+++ b/src/server/plugins/scan.js
@@ -0,0 +1,64 @@
+'use strict';
+
+module.exports = function (kbnServer, server, config) {
+  let _ = require('lodash');
+  let Promise = require('bluebird');
+  let readdir = Promise.promisify(require('fs').readdir);
+  let stat = Promise.promisify(require('fs').stat);
+  let resolve = require('path').resolve;
+
+  let scanDirs = [].concat(config.get('plugins.scanDirs') || []);
+  let absolutePaths = [].concat(config.get('plugins.paths') || []);
+  let debug = _.bindKey(server, 'log', ['plugins', 'debug']);
+  let warning = _.bindKey(server, 'log', ['plugins', 'warning']);
+
+  return Promise.map(scanDirs, function (dir) {
+    debug({ tmpl: 'Scanning `<%= dir %>` for plugins', dir: dir });
+
+    return readdir(dir)
+    .catch(function (err) {
+      if (err.code !== 'ENOENT') {
+        throw err;
+      }
+
+      warning({
+        tmpl: '<%= err.code %>: Unable to scan non-existent directory for plugins "<%= dir %>"',
+        err: err,
+        dir: dir
+      });
+
+      return [];
+    })
+    .map(function (file) {
+      if (file === '.' || file === '..') return false;
+      let path = resolve(dir, file);
+
+      return stat(path).then(function (stat) {
+        return stat.isDirectory() ? path : false;
+      });
+    });
+  })
+  .then(function (dirs) {
+    return _([dirs, absolutePaths])
+    .flattenDeep()
+    .compact()
+    .uniq()
+    .value();
+  })
+  .filter(function (dir) {
+    let path;
+    try { path = require.resolve(dir); } catch (e) {}
+
+    if (!path) {
+      warning({ tmpl: 'Skipping non-plugin directory at <%= dir %>', dir: dir });
+      return false;
+    } else {
+      require(path);
+      debug({ tmpl: 'Found plugin at <%= dir %>', dir: dir });
+      return true;
+    }
+  })
+  .then(function (pluginPaths) {
+    kbnServer.pluginPaths = pluginPaths;
+  });
+};
diff --git a/src/server/plugins/static/index.js b/src/server/plugins/static/index.js
deleted file mode 100644
index a814fbc3744c5..0000000000000
--- a/src/server/plugins/static/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var kibana = require('../../');
-
-module.exports = new kibana.Plugin({
-  init: function (server, options) {
-    var config = server.config();
-    server.route({
-      method: 'GET',
-      path: '/{param*}',
-      handler: {
-        directory: {
-          path: config.get('kibana.publicFolder')
-        }
-      }
-    });
-  }
-});
diff --git a/src/server/plugins/status/index.js b/src/server/plugins/status/index.js
deleted file mode 100644
index 7b8922cf87dd3..0000000000000
--- a/src/server/plugins/status/index.js
+++ /dev/null
@@ -1,60 +0,0 @@
-var join = require('path').join;
-var kibana = require('../../');
-var status = require('../../lib/status');
-var Series = require('./lib/series');
-
-module.exports = new kibana.Plugin({
-
-  init: function (server, options) {
-
-    var config = server.config();
-
-    var fiveMinuteData = {
-      rss: new Series(60),
-      heapTotal: new Series(60),
-      heapUsed: new Series(60),
-      load: new Series(60),
-      delay: new Series(60),
-      concurrency: new Series(60),
-      responseTimeAvg: new Series(60),
-      responseTimeMax: new Series(60),
-      requests: new Series(60),
-    };
-
-    server.plugins.good.monitor.on('ops', function (event) {
-      var port = String(config.get('kibana.server.port'));
-      fiveMinuteData.rss.push(event.psmem.rss);
-      fiveMinuteData.heapTotal.push(event.psmem.heapTotal);
-      fiveMinuteData.heapUsed.push(event.psmem.heapUsed);
-      fiveMinuteData.load.push(event.osload);
-      fiveMinuteData.delay.push(event.psdelay);
-      fiveMinuteData.concurrency.push(parseInt(event.concurrents[port], 0));
-      if (event.responseTimes[port]) {
-        var responseTimeAvg =  event.responseTimes[port].avg;
-        if (isNaN(responseTimeAvg)) responseTimeAvg = 0;
-        fiveMinuteData.responseTimeAvg.push(responseTimeAvg);
-        fiveMinuteData.responseTimeMax.push(event.responseTimes[port].max);
-      } else {
-        fiveMinuteData.responseTimeAvg.push(0);
-        fiveMinuteData.responseTimeMax.push(0);
-      }
-      if (event.requests[port]) {
-        fiveMinuteData.requests.push(event.requests[port].total);
-      } else {
-        fiveMinuteData.requests.push(0);
-      }
-    });
-
-    server.route({
-      method: 'GET',
-      path: '/status/health',
-      handler: function (request, reply) {
-        return reply({
-          metrics: fiveMinuteData,
-          status: status
-        });
-      }
-    });
-  }
-
-});
diff --git a/src/server/plugins/status/lib/series.js b/src/server/plugins/status/lib/series.js
deleted file mode 100644
index 11fbbda92183b..0000000000000
--- a/src/server/plugins/status/lib/series.js
+++ /dev/null
@@ -1,15 +0,0 @@
-function Series(size) {
-  this.size = size;
-  this.data = [];
-}
-
-Series.prototype.push = function (value) {
-  this.data.unshift([Date.now(), value]);
-  if (this.data.length > this.size) this.data.pop();
-};
-
-Series.prototype.toJSON = function () {
-  return this.data;
-};
-
-module.exports = Series;
diff --git a/src/server/plugins/status/public/.jshintrc b/src/server/plugins/status/public/.jshintrc
deleted file mode 100644
index cb9888b80036a..0000000000000
--- a/src/server/plugins/status/public/.jshintrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../../../../.jshintrc.browser"
-}
diff --git a/src/server/plugins/status/public/index.html b/src/server/plugins/status/public/index.html
deleted file mode 100644
index 2b9ab5d17c1b7..0000000000000
--- a/src/server/plugins/status/public/index.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>Kibana Status</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <link rel="shortcut icon" href="/styles/theme/elk.ico">
-    <link rel="stylesheet" href="/styles/main.css?_b=@@buildNum">
-    <link rel="stylesheet" href="styles/main.css?_b=@@buildNum">
-  </head>
-  <body>
-    <div class="container" ng-controller="StatusPage">
-      <header>
-        <h1>
-          <strong>Kibana</strong>&nbsp;Status Page
-        </h1>
-      </header>
-      <div>
-        <section class="section">
-          <h4>What is this page?</h4>
-          <p>This page is your sanity check, and your savior. You can check for potential problems</p>
-          <p>Here is the status of your kibana instance and the plugins you have installed along with some statistics to asses potential problems.</p>
-        </section>
-        <div class="system_status_wrapper system_status_{{ui.systemStatus().label}}">
-          <h3 class="title">
-            <b>System Status:</b> {{ui.systemStatus().msg}}
-          </h3>
-          <table id="plugin_table">
-            <tr class="plugin_table_header plugin_row">
-              <td class="col-xs-1 plugin_key">Plugin</td>
-              <td class="col-xs-11 plugin_state">Status</td>
-            </tr>
-            <tr ng-repeat="(key, plugin) in ui.plugins" class="plugin_table_plugin plugin_row plugin_status_{{plugin.uiStatus}}">
-              <td class="col-xs-1 plugin_key">{{key}}</td>
-              <td class="col-xs-11 plugin_state">{{plugin.message}}</td>
-            </tr>
-          </table>
-        </div>
-        <h2>Server Metrics</h2>
-        <p>Interval of 5 seconds, with a max history of 5 minutes.</p>
-        <div id="chart_cont" class="row">
-          <div ng-repeat="(key, chart) in ui.charts" class="status_chart_wrapper col-md-4">
-            <h3 class="title">{{chart.niceName}}</h2>
-            <h4 class="average">
-              <span ng-repeat="average in chart.average track by $index"><span ng-if="$index">, </span>{{average}}</span>
-            </h4>
-            <nvd3 options="chart.options" data="chart.data"></nvd3>
-          </div>
-          <div class="clearfix"></div>
-        </div>
-      </div>
-      <footer></footer>
-    </div>
-    <script type="text/javascript" src="/bower_components/requirejs/require.js?_b=@@buildNum"></script>
-    <script type="text/javascript" src="/status/require.config.js?_b=@@buildNum"></script>
-    <script type="text/javascript">
-      require(['/status/index.js'], function(kibanaStatus) { kibanaStatus.init(); });
-    </script>
-  </body>
-</html>
diff --git a/src/server/plugins/status/public/index.js b/src/server/plugins/status/public/index.js
deleted file mode 100644
index 6ccdd49b7e664..0000000000000
--- a/src/server/plugins/status/public/index.js
+++ /dev/null
@@ -1,229 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var $ = require('jquery');
-  var _ = require('lodash');
-  var moment = require('moment');
-  var numeral = require('numeral');
-  require('nvd3_directives');
-
-  // Make sure we don't have to deal with statuses by hand
-  function getStatus(plugin) {
-    var statusMap = {
-      green: {
-        label: 'success',
-        msg: 'Ready',
-        idx: 1
-      },
-      yellow: {
-        label: 'warning',
-        msg: 'S.N.A.F.U.',
-        idx: 2
-      },
-      red: {
-        label: 'danger',
-        msg: 'Danger Will Robinson! Danger!',
-        idx: 3
-      },
-      loading: {
-        label: 'info',
-        msg: 'Loading...',
-        idx: 0
-      }
-    };
-    if (!_.isObject(plugin) || _.isUndefined(plugin)) {
-      plugin = {state: plugin};
-    }
-    return statusMap[plugin.state];
-  }
-
-  function getLabel(plugin) { return getStatus(plugin).label; }
-
-  // Turns thisIsASentence to
-  // This Is A Sentence
-  function niceName(name) {
-    return name
-      .split(/(?=[A-Z])/)
-      .map(function (word) { return word[0].toUpperCase() + _.rest(word).join(''); })
-      .join(' ');
-  }
-
-  function formatNumber(num, which) {
-    var format = '0.00';
-    var postfix = '';
-    switch (which) {
-      case 'time':
-        return moment(num).format('HH:mm:ss');
-      case 'byte':
-        format += 'b';
-        break;
-      case 'ms':
-        postfix = 'ms';
-        break;
-    }
-    return numeral(num).format(format) + postfix;
-  }
-
-  function numberType(key) {
-    var byteMetrics = ['heapTotal', 'heapUsed', 'rss'];
-    var msMetrics = ['delay', 'responseTimeAvg', 'responseTimeMax'];
-    var preciseMetric = ['requests', 'load'];
-    if ( byteMetrics.indexOf(key) > -1 ) {
-      return 'byte';
-    } else if (msMetrics.indexOf(key) > -1 ) {
-      return 'ms';
-    } else {
-      return 'precise';
-    }
-  }
-
-  var makeChartOptions = _.memoize(function (type) {
-    return {
-      chart: {
-        type: 'lineChart',
-        height: 200,
-        showLegend: false,
-        showXAxis: false,
-        showYAxis: false,
-        useInteractiveGuideline: true,
-        tooltips: true,
-        pointSize: 0,
-        color: ['#444', '#777', '#aaa'],
-        margin: {
-          top: 10,
-          left: 0,
-          right: 0,
-          bottom: 20
-        },
-        xAxis: { tickFormat: function (d) { return formatNumber(d, 'time'); } },
-        yAxis: { tickFormat: function (d) { return formatNumber(d, type); }, },
-        y: function (d) { return d.y; },
-        x: function (d) { return d.x; }
-      }
-    };
-  });
-
-  // The Kibana App
-  require('modules')
-  .get('KibanaStatusApp', ['nvd3'])
-  .controller('StatusPage', function ($scope, $http, $window, $timeout) {
-    // the object representing all of the elements the ui touches
-    $scope.ui = {
-      // show the system status by going through all of the plugins,
-      // and making sure they're green.
-      systemStatus: (function () {
-        // for convenience
-        function getIdx(plugin) { return getStatus(plugin).idx; }
-
-        return function () {
-          var currentStatus = 'loading';
-          var currentIdx = getIdx(currentStatus);
-
-          // FIXME eh, not too thrilled about this.
-          var status = _.reduce($scope.ui.plugins, function (curr, plugin, key) {
-              var pluginIdx = getIdx(plugin);
-              if (pluginIdx > currentIdx) {
-                // set the current status
-                currentStatus = plugin.state;
-                currentIdx = getIdx(plugin);
-              }
-              return currentStatus;
-            }, 'loading');
-
-          // give the ui the label for colors and such
-          return getStatus(status);
-        };
-      }()),
-      charts: {},
-      plugins: []
-    };
-
-    var windowHasFocus = true;
-    angular.element($window).bind({
-      blur: function () { windowHasFocus = false; },
-      focus: function () {
-        windowHasFocus = true;
-        getAppStatus();
-      }
-    });
-
-    function getAppStatus() {
-      // go ahead and get the info you want
-      $http
-      .get('/status/health')
-      .success(function (data) {
-        // Assign the propper variables to the scope and change them as necessary
-
-        // setup The charts
-        // wrap the metrics data and append the average
-        $scope.ui.charts = _.mapValues(data.metrics, function (metric, name) {
-
-          // Metric Values format
-          // metric: [[xValue, yValue], ...]
-          // LoadMetric:
-          // metric: [[xValue, [yValue, yValue2, yValue3]], ...]
-          // return [
-          //    {type: 'line', key: name, yAxis: 1, values: [{x: xValue, y: yValue}, ...]},
-          //    {type: 'line', key: name, yAxis: 1, values: [{x: xValue, y: yValue1}, ...]},
-          //    {type: 'line', key: name, yAxis: 1, values: [{x: xValue, y: yValue2}, ...]}]
-          //
-          // Go through all of the metric values and split the values out.
-          // returns an array of all of the averages
-          var metricList = [];
-          var metricNumberType = numberType(name);
-
-          // convert the [x,y] into {x: x, y: y}
-          metric.forEach(function (vector) {
-            vector = _.flatten(vector);
-            var x = vector.shift();
-            vector.forEach(function (yValue, idx) {
-              if (!metricList[idx]) {
-                metricList[idx] = {
-                  key: name + idx,
-                  values: []
-                };
-              }
-              // unshift to make sure they're in the correct order
-              metricList[idx].values.unshift({x: x, y: yValue});
-            });
-          });
-
-          var average = metricList.map(function (data) {
-            var uglySum = data.values.reduce(function (sumSoFar, vector) {
-              return sumSoFar + vector.y;
-            }, 0);
-            return formatNumber(uglySum / data.values.length, metricNumberType);
-          });
-          var options = makeChartOptions(metricNumberType);
-
-          return { data: metricList, average: average, niceName: niceName(name), options: options };
-        });
-
-        // give the plugins their proper name so CSS classes can be properply applied
-        $scope.ui.plugins = _.mapValues(data.status, function (plugin) {
-          plugin.uiStatus = getLabel(plugin);
-          return plugin;
-        });
-
-        if (windowHasFocus) {
-          // go ahead and get another status in 5 seconds
-          $timeout(getAppStatus, 5000);
-        }
-      })
-      .error(function () {
-        window.alert('Something went terribly wrong while making the request!!! Perhaps your server is down?');
-      });
-    }
-
-    // Start it all up
-    getAppStatus();
-  });
-
-  return {
-    init: function () {
-      $(function () {
-        angular.bootstrap(window.document, ['nvd3', 'KibanaStatusApp']);
-      });
-    }
-  };
-
-});
diff --git a/src/server/plugins/status/public/require.config.js b/src/server/plugins/status/public/require.config.js
deleted file mode 100644
index 01db17f3fa476..0000000000000
--- a/src/server/plugins/status/public/require.config.js
+++ /dev/null
@@ -1,23 +0,0 @@
-require.config({
-  baseUrl: '/',
-  paths: {
-    angular: '/bower_components/angular/angular',
-    css: '/bower_components/require-css/css',
-    d3: '/bower_components/d3/d3',
-    jquery: '/bower_components/jquery/dist/jquery',
-    lodash: '/utils/lodash-mixins/index',
-    lodash_src: '/bower_components/lodash/lodash',
-    moment: '/bower_components/moment/moment',
-    nvd3: '/bower_components/nvd3/build/nv.d3',
-    nvd3_directives: '/bower_components/angular-nvd3/dist/angular-nvd3',
-    numeral: '/bower_components/numeral/numeral'
-  },
-  shim: {
-    angular: {
-      deps: ['jquery'],
-      exports: 'angular'
-    },
-    nvd3: ['css!bower_components/nvd3/build/nv.d3.css', 'd3'],
-    nvd3_directives: ['angular', 'nvd3']
-  }
-});
diff --git a/src/server/plugins/status/public/styles/main.less b/src/server/plugins/status/public/styles/main.less
deleted file mode 100644
index b9db9befa3fa3..0000000000000
--- a/src/server/plugins/status/public/styles/main.less
+++ /dev/null
@@ -1,115 +0,0 @@
-.section {
-  margin-bottom:15px;
-}
-.system_status_wrapper {
-  border:1px solid #0a8e03;
-  border-radius:5px;
-  overflow:hidden;
-  .title {
-    color:#ffffff;
-    height:50px;
-    line-height:50px;
-    background-color:#0a8e03;
-    margin:0 0 10px 0;
-    padding:0 15px;
-    background:-moz-linear-gradient(left,#0a8e03 0%,#96f501 100%);
-    background:-webkit-gradient(linear,left top,right top,color-stop(0%,#0a8e03),color-stop(100%,#96f501));
-    background:-webkit-linear-gradient(left,#0a8e03 0%,#96f501 100%);
-    background:-o-linear-gradient(left,#0a8e03 0%,#96f501 100%);
-    background:-ms-linear-gradient(left,#0a8e03 0%,#96f501 100%);
-    background:linear-gradient(to right,#0a8e03 0%,#96f501 100%);
-    filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0a8e03',endColorstr='#96f501',GradientType=1);
-  }
-}
-.system_status_wrapper.system_status_danger {
-  border-color:#da1e04;
-  .title {
-    border-color:#da1e04;
-    background:#da1e04;
-    background:-moz-linear-gradient(left,#da1e04 0%,#ff730f 100%);
-    background:-webkit-gradient(linear,left top,right top,color-stop(0%,#da1e04),color-stop(100%,#ff730f));
-    background:-webkit-linear-gradient(left,#da1e04 0%,#ff730f 100%);
-    background:-o-linear-gradient(left,#da1e04 0%,#ff730f 100%);
-    background:-ms-linear-gradient(left,#da1e04 0%,#ff730f 100%);
-    background:linear-gradient(to right,#da1e04 0%,#ff730f 100%);
-    filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#da1e04',endColorstr='#ff730f',GradientType=1);
-  }
-}
-.system_status_wrapper.system_status_warning {
-  border-color:#fdee00;
-  .title {
-    border-color:#fdee00;
-    background:#fdee00;
-    background:-moz-linear-gradient(left,#fdee00 0%,#c16f00 100%);
-    background:-webkit-gradient(linear,left top,right top,color-stop(0%,#fdee00),color-stop(100%,#c16f00));
-    background:-webkit-linear-gradient(left,#fdee00 0%,#c16f00 100%);
-    background:-o-linear-gradient(left,#fdee00 0%,#c16f00 100%);
-    background:-ms-linear-gradient(left,#fdee00 0%,#c16f00 100%);
-    background:linear-gradient(to right,#fdee00 0%,#c16f00 100%);
-    filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdee00',endColorstr='#c16f00',GradientType=1);
-  }
-}
-#plugin_table {
-  margin:0 15px 15px 15px;
-  .plugin_row {
-    height:30px;
-    line-height:30px;
-    + .plugin_row {
-      border-top:1px solid #ebebeb;
-    }
-  }
-  .plugin_table_header {
-    font-size:10px;
-    color:#a9a9a9;
-    height:25px;
-    line-height:25px;
-  }
-  .plugin_state {
-    border-left:1px solid #ebebeb;
-    padding:0;
-    padding-left:15px;
-  }
-  .plugin_table_plugin {
-    color:#608b32;
-  }
-  .plugin_key {
-    font-weight:bold;
-    padding:0px 5px;
-  }
-  .plugin_status_danger {
-    color:#da1e04;
-  }
-}
-.status_chart_wrapper {
-  border-top:1px solid #ebebeb;
-  border-left:1px solid #ebebeb;
-  .average {
-    font-size: 42px;
-    line-height:45px;
-    margin-top:0;
-    font-weight:bold;
-  }
-  .title {
-    margin:0 0 5px 0;
-    text-transform:capitalize;
-  }
-}
-#chart_cont {
-  margin-top:35px;
-}
-.status_chart_wrapper:nth-child(2), .status_chart_wrapper:nth-child(3) {
-  border-top:0 none transparent;
-}
-.status_chart_wrapper:first-child {
-  border-top:0 none transparent;
-  border-left:0 none transparent;
-}
-.status_chart_wrapper:nth-child(3n + 1) {
-  border-left:0 none transparent;
-}
-.status_chart_wrapper:nth-child(n + 4) {
-  padding-top:20px;
-}
-.nv-axis.nv-x .tick line {
-  display:none;
-}
diff --git a/src/server/status/Samples.js b/src/server/status/Samples.js
new file mode 100644
index 0000000000000..879c93d1f7c18
--- /dev/null
+++ b/src/server/status/Samples.js
@@ -0,0 +1,26 @@
+var _ = require('lodash');
+
+function Samples(max) {
+  this.vals = {};
+  this.max = max || Infinity;
+  this.length = 0;
+}
+
+Samples.prototype.add = function (sample) {
+  var vals = this.vals;
+  var length = this.length = Math.min(this.length + 1, this.max);
+
+  _.forOwn(sample, function (val, name) {
+    if (val == null) val = null;
+
+    if (!vals[name]) vals[name] = new Array(length);
+    vals[name].unshift([Date.now(), val]);
+    vals[name].length = length;
+  });
+};
+
+Samples.prototype.toJSON = function () {
+  return this.vals;
+};
+
+module.exports = Samples;
diff --git a/src/server/status/ServerStatus.js b/src/server/status/ServerStatus.js
new file mode 100644
index 0000000000000..11dfeb37bc7fb
--- /dev/null
+++ b/src/server/status/ServerStatus.js
@@ -0,0 +1,74 @@
+'use strict';
+
+let _ = require('lodash');
+
+let states = require('./states');
+let Status = require('./Status');
+
+module.exports = class ServerStatus {
+  constructor(server) {
+    this.server = server;
+    this._created = {};
+  }
+
+  create(name) {
+    return (this._created[name] = new Status(name, this.server));
+  }
+
+  each(fn) {
+    let self = this;
+    _.forOwn(self._created, function (status, i, list) {
+      if (status.state !== 'disabled') {
+        fn.call(self, status, i, list);
+      }
+    });
+  }
+
+  get(name) {
+    return this._created[name];
+  }
+
+  getState(name) {
+    return _.get(this._created, [name, 'state'], 'uninitialized');
+  }
+
+  overall() {
+    var state = _(this._created)
+    .map(function (status) {
+      return states.get(status.state);
+    })
+    .sortBy('severity')
+    .pop();
+
+    var statuses = _.where(this._created, { state: state.id });
+    var since = _.get(_.sortBy(statuses, 'since'), [0, 'since']);
+
+    return {
+      state: state.id,
+      title: state.title,
+      nickname: _.sample(state.nicknames),
+      icon: state.icon,
+      since: since,
+    };
+  }
+
+  isGreen() {
+    return (this.overall().state === 'green');
+  }
+
+  notGreen() {
+    return !this.isGreen();
+  }
+
+  toString() {
+    var overall = this.overall();
+    return `${overall.title} – ${overall.nickname}`;
+  }
+
+  toJSON() {
+    return {
+      overall: this.overall(),
+      statuses: _.values(this._created)
+    };
+  }
+};
diff --git a/src/server/status/Status.js b/src/server/status/Status.js
new file mode 100644
index 0000000000000..63367bac35f72
--- /dev/null
+++ b/src/server/status/Status.js
@@ -0,0 +1,60 @@
+'use strict';
+
+let _ = require('lodash');
+let EventEmitter = require('events').EventEmitter;
+let states = require('./states');
+
+class Status extends EventEmitter {
+  constructor(name, server) {
+    super();
+
+    this.name = name;
+    this.since = new Date();
+    this.state = 'uninitialized';
+    this.message = 'uninitialized';
+
+    this.on('change', function (previous, previousMsg) {
+      this.since = new Date();
+      server.log(['status', name, 'info'], {
+        tmpl: 'Status changed from <%= prevState %> to <%= state %><% message && print(` - ${message}`) %>',
+        name: name,
+        state: this.state,
+        message: this.message,
+        prevState: previous,
+        prevMsg: previousMsg
+      });
+    });
+  }
+
+  toJSON() {
+    return {
+      name: this.name,
+      state: this.state,
+      icon: states.get(this.state).icon,
+      message: this.message,
+      since: this.since
+    };
+  }
+}
+
+states.all.forEach(function (state) {
+  Status.prototype[state.id] = function (message) {
+    if (this.state === 'disabled') return;
+
+    let previous = this.state;
+    let previousMsg = this.message;
+
+    this.state = state.id;
+    this.message = message || state.title;
+
+    if (previous === this.state && previousMsg === this.message) {
+      // noop
+      return;
+    }
+
+    this.emit(state.id, previous, previousMsg);
+    this.emit('change', previous, previousMsg);
+  };
+});
+
+module.exports = Status;
diff --git a/src/server/status/__tests__/ServerStatus.js b/src/server/status/__tests__/ServerStatus.js
new file mode 100644
index 0000000000000..08187c0b8bcd6
--- /dev/null
+++ b/src/server/status/__tests__/ServerStatus.js
@@ -0,0 +1,88 @@
+var _ = require('lodash');
+var expect = require('expect.js');
+var sinon = require('sinon');
+
+var states = require('../states');
+var Status = require('../Status');
+var ServerStatus = require('../ServerStatus');
+
+describe('ServerStatus class', function () {
+  var server;
+  var serverStatus;
+
+  beforeEach(function () {
+    server = { expose: sinon.stub(), log: sinon.stub() };
+    serverStatus = new ServerStatus(server);
+  });
+
+  describe('#create(name)', function () {
+    it('should create a new status by name', function () {
+      var status = serverStatus.create('name');
+      expect(status).to.be.a(Status);
+    });
+  });
+
+  describe('#get(name)', function () {
+    it('exposes plugins by name', function () {
+      var status = serverStatus.create('name');
+      expect(serverStatus.get('name')).to.be(status);
+    });
+  });
+
+  describe('#getState(name)', function () {
+    it('should expose the state of the plugin by name', function () {
+      var status = serverStatus.create('name');
+      status.green();
+      expect(serverStatus.getState('name')).to.be('green');
+    });
+  });
+
+  describe('#overall()', function () {
+    it('considers each status to produce a summary', function () {
+      var status = serverStatus.create('name');
+
+      expect(serverStatus.overall().state).to.be('uninitialized');
+
+      var match = function (overall, state) {
+        expect(overall).to.have.property('state', state.id);
+        expect(overall).to.have.property('title', state.title);
+        expect(overall).to.have.property('icon', state.icon);
+        expect(overall).to.have.property('icon', state.icon);
+        expect(state.nicknames).contain(overall.nickname);
+      };
+
+      status.green();
+      match(serverStatus.overall(), states.get('green'));
+
+      status.yellow();
+      match(serverStatus.overall(), states.get('yellow'));
+
+      status.red();
+      match(serverStatus.overall(), states.get('red'));
+    });
+  });
+
+
+  describe('#toJSON()', function () {
+    it('serializes to overall status and individuals', function () {
+      var one = serverStatus.create('one');
+      var two = serverStatus.create('two');
+      var three = serverStatus.create('three');
+
+      one.green();
+      two.yellow();
+      three.red();
+
+      var obj = JSON.parse(JSON.stringify(serverStatus));
+      expect(obj).to.have.property('overall');
+      expect(obj.overall.state).to.eql(serverStatus.overall().state);
+      expect(obj.statuses).to.have.length(3);
+
+      var outs = _.indexBy(obj.statuses, 'name');
+      expect(outs.one).to.have.property('state', 'green');
+      expect(outs.two).to.have.property('state', 'yellow');
+      expect(outs.three).to.have.property('state', 'red');
+    });
+  });
+
+});
diff --git a/src/server/status/__tests__/Status.js b/src/server/status/__tests__/Status.js
new file mode 100644
index 0000000000000..8563500a34af0
--- /dev/null
+++ b/src/server/status/__tests__/Status.js
@@ -0,0 +1,101 @@
+var expect = require('expect.js');
+var sinon = require('sinon');
+var Status = require('../Status');
+var ServerStatus = require('../ServerStatus');
+
+describe('Status class', function () {
+
+  var server;
+  var serverStatus;
+
+  beforeEach(function () {
+    server = { expose: sinon.stub(), log: sinon.stub() };
+    serverStatus = new ServerStatus(server);
+  });
+
+  it('should have an "uninitialized" state initially', function () {
+    expect(serverStatus.create('test')).to.have.property('state', 'uninitialized');
+  });
+
+  it('emits change when the status is set', function (done) {
+    var status = serverStatus.create('test');
+
+    status.once('change', function (prev, prevMsg) {
+      expect(status.state).to.be('green');
+      expect(status.message).to.be('GREEN');
+      expect(prev).to.be('uninitialized');
+
+      status.once('change', function (prev, prevMsg) {
+        expect(status.state).to.be('red');
+        expect(status.message).to.be('RED');
+        expect(prev).to.be('green');
+        expect(prevMsg).to.be('GREEN');
+
+        done();
+      });
+
+      status.red('RED');
+    });
+
+    status.green('GREEN');
+  });
+
+  it('should only trigger the change listener when something changes', function () {
+    var status = serverStatus.create('test');
+    var stub = sinon.stub();
+    status.on('change', stub);
+    status.green('Ready');
+    status.green('Ready');
+    status.red('Not Ready');
+    sinon.assert.calledTwice(stub);
+  });
+
+  it('should create a JSON representation of the status', function () {
+    var status = serverStatus.create('test');
+    status.green('Ready');
+
+    var json = status.toJSON();
+    expect(json.state).to.eql('green');
+    expect(json.message).to.eql('Ready');
+  });
+
+  function testState(color) {
+    it(`should change the state to ${color} when #${color}() is called`, function () {
+      var status = serverStatus.create('test');
+      var message = 'testing ' + color;
+      status[color](message);
+      expect(status).to.have.property('state', color);
+      expect(status).to.have.property('message', message);
+    });
+
+    it(`should trigger the "change" listner when #${color}() is called`, function (done) {
+      var status = serverStatus.create('test');
+      var message = 'testing ' + color;
+      status.on('change', function (prev, prevMsg) {
+        expect(status.state).to.be(color);
+        expect(status.message).to.be(message);
+
+        expect(prev).to.be('uninitialized');
+        expect(prevMsg).to.be('uninitialized');
+        done();
+      });
+      status[color](message);
+    });
+
+    it(`should trigger the "${color}" listner when #${color}() is called`, function (done) {
+      var status = serverStatus.create('test');
+      var message = 'testing ' + color;
+      status.on(color, function (prev, prevMsg) {
+        expect(status.state).to.be(color);
+        expect(status.message).to.be(message);
+        done();
+      });
+      status[color](message);
+    });
+  }
+
+  testState('green');
+  testState('yellow');
+  testState('red');
+
+});
diff --git a/src/server/status/index.js b/src/server/status/index.js
new file mode 100644
index 0000000000000..b3b6dbcd9778d
--- /dev/null
+++ b/src/server/status/index.js
@@ -0,0 +1,55 @@
+module.exports = function (kbnServer) {
+  var _ = require('lodash');
+  var Samples = require('./Samples');
+  var ServerStatus = require('./ServerStatus');
+  var join = require('path').join;
+
+  var server = kbnServer.server;
+  var config = server.config();
+
+  kbnServer.status = new ServerStatus(kbnServer.server);
+  kbnServer.metrics = new Samples(60);
+
+  if (server.plugins.good) {
+    server.plugins.good.monitor.on('ops', function (event) {
+      var port = config.get('server.port');
+      kbnServer.metrics.add({
+        rss: event.psmem.rss,
+        heapTotal: event.psmem.heapTotal,
+        heapUsed: event.psmem.heapUsed,
+        load: event.osload,
+        delay: event.psdelay,
+        concurrency: _.get(event, ['concurrents', port]),
+        responseTimeAvg: _.get(event, ['responseTimes', port, 'avg']),
+        responseTimeMax: _.get(event, ['responseTimes', port, 'max']),
+        requests: _.get(event, ['requests', port, 'total'], 0)
+      });
+    });
+  }
+
+  server.route({
+    method: 'GET',
+    path: '/api/status',
+    handler: function (request, reply) {
+      return reply({
+        status: kbnServer.status.toJSON(),
+        metrics: kbnServer.metrics
+      });
+    }
+  });
+
+  server.decorate('reply', 'renderStatusPage', function () {
+    var app = _.get(kbnServer, 'uiExports.apps.hidden.byId.statusPage');
+    var resp = app ? this.renderApp(app) : this(kbnServer.status.toString());
+    resp.code(kbnServer.status.isGreen() ? 200 : 503);
+    return resp;
+  });
+
+  server.route({
+    method: 'GET',
+    path: '/status',
+    handler: function (request, reply) {
+      return reply.renderStatusPage();
+    }
+  });
+};
diff --git a/src/server/status/states.js b/src/server/status/states.js
new file mode 100644
index 0000000000000..54cb2001fc93d
--- /dev/null
+++ b/src/server/status/states.js
@@ -0,0 +1,64 @@
+'use strict';
+
+let _ = require('lodash');
+
+exports.all = [
+  {
+    id: 'red',
+    title: 'Red',
+    icon: 'danger',
+    severity: 1000,
+    nicknames: [
+      'Danger Will Robinson! Danger!'
+    ]
+  },
+  {
+    id: 'uninitialized',
+    title: 'Uninitialized',
+    icon: 'spinner',
+    severity: 900,
+    nicknames: [
+      'Initializing'
+    ]
+  },
+  {
+    id: 'yellow',
+    title: 'Yellow',
+    icon: 'warning',
+    severity: 800,
+    nicknames: [
+      'S.N.A.F.U',
+      'I\'ll be back',
+      'brb'
+    ]
+  },
+  {
+    id: 'green',
+    title: 'Green',
+    icon: 'success',
+    severity: 0,
+    nicknames: [
+      'Looking good'
+    ]
+  },
+  {
+    id: 'disabled',
+    title: 'Disabled',
+    severity: -1,
+    icon: 'toggle-off',
+    nicknames: [
+      'I\'m I even a thing?'
+    ]
+  }
+];
+
+exports.allById = _.indexBy(exports.all, 'id');
+
+exports.defaults = {
+  icon: 'question',
+  severity: Infinity
+};
+
+exports.get = function (id) {
+  return exports.allById[id] || _.defaults({ id: id }, exports.defaults);
+};
diff --git a/src/server/views/index.jade b/src/server/views/index.jade
new file mode 100644
index 0000000000000..07d1b8932c400
--- /dev/null
+++ b/src/server/views/index.jade
@@ -0,0 +1,6 @@
+html
+  head
+    title Kibana Status
+  body
+    h1 Kibana Status Page
+    p Statusy stuff goes here... it's goign to be totally awesome!
diff --git a/src/testUtils/noDigestPromises.js b/src/testUtils/noDigestPromises.js
new file mode 100644
index 0000000000000..f0f6c78ddac2b
--- /dev/null
+++ b/src/testUtils/noDigestPromises.js
@@ -0,0 +1,36 @@
+var Bluebird = require('bluebird');
+require('ui/promises');
+
+/**
+ * replace the Promise service with Bluebird so that tests
+ * can use promises without having to call $rootScope.apply()
+ *
+ * var nonDigestPromises = require('testUtils/non_digest_promises');
+ *
+ * describe('some module that does complex shit with promises', function () {
+ *   beforeEach(nonDigestPromises.activate);
+ *
+ * });
+ */
+
+var active = false;
+
+require('ui/modules')
+.get('kibana')
+.config(function ($provide) {
+  $provide.decorator('Promise', function ($delegate) {
+    return active ? Bluebird : $delegate;
+  });
+});
+
+function activate() { active = true; }
+function deactivate() { active = false; }
+
+module.exports = {
+  activate: activate,
+  deactivate: deactivate,
+  activateForSuite: function () {
+    before(activate);
+    after(deactivate);
+  }
+};
diff --git a/src/testUtils/simulateKeys.js b/src/testUtils/simulateKeys.js
new file mode 100644
index 0000000000000..c70f54967ba89
--- /dev/null
+++ b/src/testUtils/simulateKeys.js
@@ -0,0 +1,105 @@
+define(function (require) {
+  var $ = require('jquery');
+  var _ = require('lodash');
+  var Promise = require('bluebird');
+  var keyMap = require('ui/utils/key_map');
+  var reverseKeyMap = _.mapValues(_.invert(keyMap), _.ary(_.parseInt, 1));
+  var KeyboardEvent = window.KeyboardEvent;
+
+  /**
+   * Simulate keyboard events in an element. This allows testing the way that
+   * elements respond to keyboard input.
+   *
+   * # sequence style
+   * keyboard events occur in a sequence, this array of events describe that sequence.
+   *
+   * ## event
+   * an object with a type property, or a string which will be turned into a single press
+   *
+   * ## event types
+   * ### press
+   * represents a key press
+   *   - `key`: the key for the button pressed
+   *   - `events`: optional list of events that occur before this press completes
+   *
+   * ### wait
+   * represents a pause in a sequence
+   *   - `ms`: the number of milliseconds that the pause takes
+   *
+   * ### repeat
+   * represents a key being repeated because it is held down. Should only exist as a
+   * sub event of `press` events.
+   *   - `count`: the number of times the repeat occurs
+   *
+   * @param  {element} $el - jQuery element where events should occur
+   * @param  {[type]} sequence - an array of events
+   * @async
+   */
+  return function ($el, sequence) {
+    var modifierState = {
+      ctrlKey: false,
+      shiftKey: false,
+      altKey: false,
+      metaKey: false
+    };
+
+    return doList(_.clone(sequence));
+
+    function setModifier(key, state) {
+      var name = key + 'Key';
+      if (modifierState.hasOwnProperty(name)) {
+        modifierState[name] = !!state;
+      }
+    }
+
+    function doList(list) {
+      return Promise.try(function () {
+        if (!list || !list.length) return;
+
+        var event = list[0];
+        if (_.isString(event)) {
+          event = { type: 'press', key: event };
+        }
+
+        switch (event.type) {
+        case 'press':
+          return Promise.resolve()
+          .then(_.partial(fire, 'keydown', event.key))
+          .then(_.partial(fire, 'keypress', event.key))
+          .then(_.partial(doList, event.events))
+          .then(_.partial(fire, 'keyup', event.key));
+
+        case 'wait':
+          return Promise.delay(event.ms);
+
+        case 'repeat':
+          return (function again(remaining) {
+            if (!remaining) return Promise.resolve();
+            remaining = remaining - 1;
+            return Promise.resolve()
+            .then(_.partial(fire, 'keydown', event.key, true))
+            .then(_.partial(fire, 'keypress', event.key, true))
+            .then(_.partial(again, remaining));
+          }(event.count));
+
+        default:
+          throw new TypeError('invalid event type "' + event.type + '"');
+        }
+      })
+      .then(function () {
+        if (_.size(list) > 1) return doList(list.slice(1));
+      });
+    }
+
+    function fire(type, key, repeat) {
+      var keyCode = reverseKeyMap[key];
+      if (!keyCode) throw new TypeError('invalid key "' + key + '"');
+
+      if (type === 'keydown') setModifier(key, true);
+      if (type === 'keyup') setModifier(key, false);
+
+      var $target = _.isFunction($el) ? $el() : $el;
+      $target.trigger($.Event(type, _.defaults({ keyCode: keyCode }, modifierState)));
+    }
+  };
+});
\ No newline at end of file
diff --git a/src/testUtils/stubIndexPattern.js b/src/testUtils/stubIndexPattern.js
new file mode 100644
index 0000000000000..158de3ac526df
--- /dev/null
+++ b/src/testUtils/stubIndexPattern.js
@@ -0,0 +1,45 @@
+define(function (require) {
+  return function (Private) {
+    var _ = require('lodash');
+    var sinon = require('sinon');
+    var IndexedArray = require('ui/IndexedArray');
+    var IndexPattern = require('ui/index_patterns/_index_pattern');
+    var fieldFormats = Private(require('ui/registry/field_formats'));
+    var flattenHit = Private(require('ui/index_patterns/_flatten_hit'));
+    var formatHit = require('ui/index_patterns/_format_hit');
+    var getComputedFields = require('ui/index_patterns/_get_computed_fields');
+
+    var Field = Private(require('ui/index_patterns/_field'));
+
+    function StubIndexPattern(pattern, timeField, fields) {
+      this.id = pattern;
+      this.popularizeField = sinon.spy();
+      this.timeFieldName = timeField;
+      this.getNonScriptedFields = sinon.spy();
+      this.getScriptedFields = sinon.spy();
+      this.metaFields = ['_id', '_type', '_source'];
+      this.fieldFormatMap = {};
+      this.routes = IndexPattern.prototype.routes;
+
+      this.toIndexList = _.constant([pattern]);
+      this.getComputedFields = _.bind(getComputedFields, this);
+      this.flattenHit = flattenHit(this);
+      this.formatHit = formatHit(this, fieldFormats.getDefaultInstance('string'));
+      this.formatField = this.formatHit.formatField;
+
+      this._indexFields = function () {
+        this.fields = new IndexedArray({
+          index: ['name'],
+          group: ['type'],
+          initialSet: fields.map(function (field) {
+            return new Field(this, field);
+          }, this)
+        });
+      };
+
+      this._indexFields();
+    }
+
+    return StubIndexPattern;
+  };
+});
diff --git a/src/ui/UiApp.js b/src/ui/UiApp.js
new file mode 100644
index 0000000000000..8d0224c18b8ac
--- /dev/null
+++ b/src/ui/UiApp.js
@@ -0,0 +1,56 @@
+'use strict';
+
+var _ = require('lodash');
+var join = require('path').join;
+var autoload = require('./autoload');
+
+class UiApp {
+  constructor(uiExports, spec) {
+    this.uiExports = uiExports;
+    this.spec = spec || {};
+
+    this.id = this.spec.id;
+    if (!this.id) {
+      throw new Error('Every app must specify it\'s id');
+    }
+
+    this.main = this.spec.main;
+    this.title = this.spec.title;
+    this.description = this.spec.description;
+    this.icon = this.spec.icon;
+    this.hidden = this.spec.hidden;
+    this.autoloadOverrides = this.spec.autoload;
+    this.templateName = this.spec.templateName || 'uiApp';
+    this.requireOptimizeGreen = this.spec.requireOptimizeGreen !== false;
+    this.getModules = _.once(this.getModules);
+  }
+
+  getModules() {
+    return _([
+      this.autoloadOverrides || autoload.require,
+      this.uiExports.find(_.get(this, 'spec.uses', [])),
+    ])
+    .flatten()
+    .uniq()
+    .push(this.main)
+    .value();
+  }
+
+  getRelatedPlugins() {
+    var pluginsById = this.uiExports.kbnServer.plugins.byId;
+    return _.transform(this.getModules(), function (plugins, id) {
+      var matches = id.match(/^plugins\/([^\/]+)(?:\/|$)/);
+      if (!matches) return;
+
+      var plugin = pluginsById[matches[1]];
+      if (_.includes(plugins, plugin)) return;
+      plugins.push(plugin);
+    }, []);
+  }
+
+  toJSON() {
+    return _.pick(this, ['id', 'title', 'description', 'icon', 'main']);
+  }
+}
+
+module.exports = UiApp;
diff --git a/src/ui/UiApps.js b/src/ui/UiApps.js
new file mode 100644
index 0000000000000..377ec869083c6
--- /dev/null
+++ b/src/ui/UiApps.js
@@ -0,0 +1,44 @@
+'use strict';
+
+let _ = require('lodash');
+let UiApp = require('./UiApp');
+
+module.exports = class UiApps extends Array {
+
+  constructor(uiExports, parent) {
+    super();
+
+    this.uiExports = uiExports;
+
+    if (!parent) {
+      this.claimedIds = [];
+      this.hidden = new UiApps(uiExports, this);
+    } else {
+      this.claimedIds = parent.claimedIds;
+    }
+
+  }
+
+  new(spec) {
+    if (this.hidden && spec.hidden) {
+      return this.hidden.new(spec);
+    }
+
+    let app = new UiApp(this.uiExports, spec);
+
+    if (_.includes(this.claimedIds, app.id)) {
+      throw new Error('Unable to create two apps with the id ' + app.id + '.');
+    } else {
+      this.claimedIds.push(app.id);
+    }
+
+    this._byId = null;
+    this.push(app);
+    return app;
+  }
+
+  get byId() {
+    return this._byId || (this._byId = _.indexBy(this, 'id'));
+  }
+
+};
diff --git a/src/ui/UiExports.js b/src/ui/UiExports.js
new file mode 100644
index 0000000000000..b999f9d1e3154
--- /dev/null
+++ b/src/ui/UiExports.js
@@ -0,0 +1,87 @@
+'use strict';
+
+var _ = require('lodash');
+var minimatch = require('minimatch');
+
+var UiApps = require('./UiApps');
+
+class UiExports {
+  constructor(kbnServer) {
+    this.kbnServer = kbnServer;
+    this.apps = new UiApps(this);
+    this.aliases = {};
+    this.exportConsumer = _.memoize(this.exportConsumer);
+
+    kbnServer.plugins.forEach(_.bindKey(this, 'consumePlugin'));
+  }
+
+  consumePlugin(plugin) {
+    var self = this;
+    var types = _.keys(plugin.uiExportsSpecs);
+
+    if (!types) return false;
+
+    var unkown = _.reject(types, self.exportConsumer, self);
+    if (unkown.length) {
+      throw new Error('unknown export types ' + unkown.join(', ') + ' in plugin ' + plugin.id);
+    }
+
+    types.forEach(function (type) {
+      self.exportConsumer(type)(plugin, plugin.uiExportsSpecs[type]);
+    });
+  }
+
+  exportConsumer(type) {
+    var self = this;
+    switch (type) {
+    case 'app':
+      return function (plugin, spec) {
+        spec = _.defaults({}, spec, { id: plugin.id });
+        plugin.app = self.apps.new(spec);
+      };
+
+    case 'visTypes':
+    case 'fieldFormats':
+    case 'spyModes':
+      return function (plugin, spec) {
+        self.aliases[type] = _.union(self.aliases[type] || [], spec);
+      };
+
+    case 'modules':
+    case 'loaders':
+    case 'noParse':
+      return function (plugin, spec) {
+        plugin.uiExportsSpecs[type] = spec;
+      };
+
+    case 'aliases':
+      return function (plugin, specs) {
+        _.forOwn(specs, function (spec, adhocType) {
+          self.aliases[adhocType] = _.union(self.aliases[adhocType] || [], spec);
+        });
+      };
+    }
+  }
+
+  find(patterns) {
+    var aliases = this.aliases;
+    var names = _.keys(aliases);
+    var matcher = _.partialRight(minimatch.filter, { matchBase: true });
+
+    return _.chain(patterns)
+    .map(function (pattern) {
+      var matches = names.filter(matcher(pattern));
+      if (!matches.length) {
+        throw new Error('Unable to find uiExports for pattern ' + pattern);
+      }
+      return matches;
+    })
+    .flattenDeep()
+    .reduce(function (found, name) {
+      return found.concat(aliases[name]);
+    }, [])
+    .value();
+  }
+}
+
+module.exports = UiExports;
diff --git a/src/ui/autoload.js b/src/ui/autoload.js
new file mode 100644
index 0000000000000..6ac6c25de074f
--- /dev/null
+++ b/src/ui/autoload.js
@@ -0,0 +1,81 @@
+var _ = require('lodash');
+var resolve = require('path').resolve;
+var basename = require('path').basename;
+var readdir = require('fs').readdirSync;
+
+var utils = require('requirefrom')('src/utils');
+var fromRoot = utils('fromRoot');
+
+function scan(type) {
+  var dir = fromRoot('src/ui/public', type);
+
+  return _.chain(readdir(dir))
+  .reject(function (name) {
+    return name[0] === '.' || name[0] === '_';
+  })
+  .map(function (filename) {
+    var path = resolve(dir, filename);
+    var name = basename(filename, '.js');
+    return `ui/${type}/${name}`;
+  })
+  .value();
+}
+
+function findStyles() {
+  var base = ['ui/styles/theme.less', 'ui/styles/base.less'];
+  var exclude = ['ui/styles/mixins.less', 'ui/styles/variables.less'];
+  var found = scan('styles', true);
+
+  return _.difference(_.union(base, found), exclude);
+}
+
+exports.reload = function () {
+  exports.directives = scan('directives');
+  exports.filters = scan('filters');
+  exports.styles = findStyles();
+  exports.modules = [
+    'angular',
+    'ui/chrome',
+    'ui/chrome/context',
+    'ui/bind',
+    'ui/bound_to_config_obj',
+    'ui/config',
+    'ui/courier',
+    'ui/debounce',
+    'ui/doc_title',
+    'ui/elastic_textarea',
+    'ui/es',
+    'ui/events',
+    'ui/fancy_forms',
+    'ui/filter_bar',
+    'ui/filter_manager',
+    'ui/index_patterns',
+    'ui/listen',
+    'ui/notify',
+    'ui/persisted_log',
+    'ui/private',
+    'ui/promises',
+    'ui/state_management/app_state',
+    'ui/state_management/global_state',
+    'ui/storage',
+    'ui/stringify/register',
+    'ui/styleCompile',
+    'ui/timefilter',
+    'ui/timepicker',
+    'ui/tooltip',
+    'ui/typeahead',
+    'ui/url',
+    'ui/validateDateInterval',
+    'ui/validate_query',
+    'ui/watch_multi'
+  ];
+
+  exports.require = _.flatten([
+    exports.directives,
+    exports.filters,
+    exports.styles,
+    exports.modules
+  ]);
+};
+
+exports.reload();
diff --git a/src/ui/index.js b/src/ui/index.js
new file mode 100644
index 0000000000000..4e2e52ec68088
--- /dev/null
+++ b/src/ui/index.js
@@ -0,0 +1,91 @@
+'use strict';
+
+module.exports = function (kbnServer, server, config) {
+  let _ = require('lodash');
+  let join = require('path').join;
+  let Boom = require('boom');
+  let formatUrl = require('url').format;
+  let resolve = require('path').resolve;
+
+  let UiExports = require('./UiExports');
+
+  let uiExports = kbnServer.uiExports = new UiExports(kbnServer);
+  let apps = uiExports.apps;
+  let hiddenApps = uiExports.apps.hidden;
+
+  // render all views from the ui/views directory
+  server.setupViews(resolve(__dirname, 'views'));
+
+  // serve the app switcher
+  server.route({
+    path: '/apps',
+    method: 'GET',
+    handler: function (req, reply) {
+      let switcher = hiddenApps.byId.switcher;
+      if (!switcher) return reply(Boom.notFound('app switcher not installed'));
+      return reply.renderApp(switcher);
+    }
+  });
+
+  // serve the app switcher
+  server.route({
+    path: '/api/apps',
+    method: 'GET',
+    handler: function (req, reply) {
+      return reply(apps);
+    }
+  });
+
+  server.route({
+    path: '/app/{id}',
+    method: 'GET',
+    handler: function (req, reply) {
+      let id = req.params.id;
+      let app = apps.byId[id];
+      if (!app) return reply(Boom.notFound('Unkown app ' + id));
+
+      if (kbnServer.status.isGreen()) {
+        return reply.renderApp(app);
+      } else {
+        return reply.renderStatusPage();
+      }
+    }
+  });
+
+  server.decorate('reply', 'renderApp', function (app) {
+    if (app.requireOptimizeGreen) {
+      let optimizeStatus = kbnServer.status.get('optimize');
+      switch (optimizeStatus && optimizeStatus.state) {
+      case 'yellow':
+        return this(`
+          <html>
+            <head><meta http-equiv="refresh" content="1"></head>
+            <body>${optimizeStatus.message}</body>
+          </html>
+        `).code(503);
+
+      case 'red':
+        return this(`
+          <html><body>${optimizeStatus.message}</body></html>
+        `).code(500);
+      }
+    }
+
+    let payload = {
+      app: app,
+      appCount: apps.length,
+      version: kbnServer.version,
+      buildSha: _.get(kbnServer, 'build.sha', '@@buildSha'),
+      buildNumber: _.get(kbnServer, 'build.number', '@@buildNum'),
+      cacheBust: _.get(kbnServer, 'build.number', ''),
+      kbnIndex: config.get('kibana.index'),
+      esShardTimeout: config.get('elasticsearch.shardTimeout')
+    };
+
+    return this.view(app.templateName, {
+      app: app,
+      cacheBust: payload.cacheBust,
+      kibanaPayload: payload
+    });
+  });
+};
diff --git a/src/ui/public/ConfigTemplate.js b/src/ui/public/ConfigTemplate.js
new file mode 100644
index 0000000000000..3b8307ab8481a
--- /dev/null
+++ b/src/ui/public/ConfigTemplate.js
@@ -0,0 +1,36 @@
+define(function (require) {
+  var _ = require('lodash');
+
+  function ConfigTemplate(templates) {
+    var template = this;
+    template.current = null;
+    template.toggle = _.partial(update, null);
+    template.open = _.partial(update, true);
+    template.close = _.partial(update, false);
+
+    function update(newState, name) {
+      var toUpdate = templates[name];
+      var curState = template.is(name);
+      if (newState == null) newState = !curState;
+
+      if (newState) {
+        template.current = toUpdate;
+      } else {
+        template.current = null;
+      }
+
+      return newState;
+    }
+
+    template.is = function (name) {
+      return template.current === templates[name];
+    };
+
+    template.toString = function () {
+      return template.current;
+    };
+  }
+
+  return ConfigTemplate;
+
+});
diff --git a/src/ui/public/IndexedArray/IndexedArray.js b/src/ui/public/IndexedArray/IndexedArray.js
new file mode 100644
index 0000000000000..e42b67bbf7502
--- /dev/null
+++ b/src/ui/public/IndexedArray/IndexedArray.js
@@ -0,0 +1,160 @@
+define(function (require) {
+
+  var _ = require('lodash');
+
+  var inflector = require('ui/IndexedArray/inflector');
+  var pathGetter = _(_.get).rearg(1, 0).ary(2);
+  var inflectIndex = inflector('by');
+  var inflectOrder = inflector('in', 'Order');
+
+  var CLEAR_CACHE = {};
+  var OPT_NAMES = IndexedArray.OPT_NAMES = ['index', 'group', 'order', 'initialSet', 'immutable'];
+
+  /**
+   * Generic extension of Array class, which will index (and reindex) the
+   * objects it contains based on their properties.
+   *
+   * @class  IndexedArray
+   * @module utils
+   * @constructor
+   * @param {object}   [config]            - describes the properties of this registry object
+   * @param {string[]} [config.index]      - a list of props/paths that should be used to index the docs.
+   * @param {string[]} [config.group]      - a list of keys/paths to group docs by.
+   * @param {string[]} [config.order]      - a list of keys/paths to order the keys by.
+   * @param {object[]} [config.initialSet] - the initial dataset the IndexedArray should contain.
+   * @param {boolean}  [config.immutable]  - a flag that hints to people reading the implementation
+   *                                       that this IndexedArray should not be modified. It's modification
+   *                                       methods are also removed
+   */
+  _.class(IndexedArray).inherits(Array);
+  function IndexedArray(config) {
+    IndexedArray.Super.call(this);
+
+    // just to remind future us that this list is important
+    config = _.pick(config || {}, OPT_NAMES);
+
+    this.raw = [];
+
+    // setup indices
+    this._indexNames = _.union(
+      this._setupIndices(config.group, inflectIndex, _.organizeBy),
+      this._setupIndices(config.index, inflectIndex, _.indexBy),
+      this._setupIndices(config.order, inflectOrder, _.sortBy)
+    );
+
+    if (config.initialSet) {
+      this.push.apply(this, config.initialSet);
+    }
+
+    if (config.immutable) {
+      // just a hint, bugs caused by updates not propogating would be very
+      // very very hard to track down
+      this.push = this.splice = undefined;
+    }
+  }
+
+  /**
+   * Create indices for a group of object properties. getters and setters are used to
+   * read and control the indices.
+   *
+   * @param  {string[]} props   - the properties that should be used to index docs
+   * @param  {function} inflect - a function that will be called with a property name, and
+   *                            creates the public property at which the index will be exposed
+   * @param  {function} op      - the function that will be used to create the indices, it is passed
+   *                            the raw representaion of the registry, and a getter for reading the
+   *                            right prop
+   *
+   * @returns {string[]}        - the public keys of all indices created
+   */
+  IndexedArray.prototype._setupIndices = function (props, inflect, op) {
+    // shortcut for empty props
+    if (!props || props.length === 0) return;
+
+    var self = this;
+    return props.map(function (prop) {
+
+      var from = pathGetter.partial(prop).value();
+      var to = inflect(prop);
+      var cache;
+
+      Object.defineProperty(self, to, {
+        enumerable: false,
+        configurable: false,
+
+        set: function (val) {
+          // can't set any value other than the CLEAR_CACHE constant
+          if (val === CLEAR_CACHE) {
+            cache = false;
+          } else {
+            throw new TypeError(to + ' can not be set, it is a computed index of values');
+          }
+        },
+        get: function () {
+          return cache || (cache = op(self.raw, from));
+        }
+      });
+
+      return to;
+    });
+
+  };
+
+  /**
+   * (Re)run index/group/order procedures to create indices of
+   * sub-objects.
+   *
+   * @return {undefined}
+   */
+  IndexedArray.prototype._clearIndices = function () {
+    var self = this;
+    self._indexNames.forEach(function (name) {
+      self[name] = CLEAR_CACHE;
+    });
+  };
+
+  /**
+   * Copy all array methods which have side-effects, and wrap them
+   * in a function that will reindex after each call, as well
+   * as duplex the operation to the .raw version of the IndexedArray.
+   *
+   * @param  {[type]} method [description]
+   * @return {[type]}        [description]
+   */
+  'pop push shift splice unshift reverse'.split(' ').forEach(function (method) {
+    var orig = Array.prototype[method];
+
+    IndexedArray.prototype[method] = function (/* args... */) {
+      // call the original method with this context
+      orig.apply(this, arguments);
+
+      // run the indexers
+      this._clearIndices();
+
+      // call the original method on our "raw" array, and return the result(s)
+      return orig.apply(this.raw, arguments);
+    };
+  });
+
+  /**
+  * Remove items from this based on a predicate
+  * @param {function|object|string} predicate - the predicate used to decide what is removed
+  * @param {object} context - this binding for predicate
+  * @return {array} - the removed data
+  */
+  IndexedArray.prototype.remove = function (predicate, context) {
+    var out = _.remove(this, predicate, context);
+    _.remove(this.raw, predicate, context);
+    this._clearIndices();
+    return out;
+  };
+
+  /**
+   * provide a hook for the JSON serializer
+   * @return {array} - a plain, vanilla array with our same data
+   */
+  IndexedArray.prototype.toJSON = function () {
+    return this.raw;
+  };
+
+  return IndexedArray;
+});
diff --git a/src/ui/public/IndexedArray/__tests__/IndexedArray.js b/src/ui/public/IndexedArray/__tests__/IndexedArray.js
new file mode 100644
index 0000000000000..c3f19ef00456a
--- /dev/null
+++ b/src/ui/public/IndexedArray/__tests__/IndexedArray.js
@@ -0,0 +1,150 @@
+
+var _ = require('lodash');
+var expect = require('expect.js');
+var IndexedArray = require('ui/IndexedArray');
+
+// this is generally a data-structure that IndexedArray is good for managing
+var users = [
+  { name: 'John', id: 69, username: 'beast', group: 'admins' },
+  { name: 'Anon', id:  0, username: 'shhhh', group: 'secret' },
+  { name: 'Fern', id: 42, username: 'kitty', group: 'editor' },
+  { name: 'Mary', id: 55, username: 'sheep', group: 'editor' }
+];
+
+// this is how we used to accomplish this, before IndexedArray
+users.byName = _.indexBy(users, 'name');
+users.byUsername = _.indexBy(users, 'username');
+users.byGroup = _.groupBy(users, 'group');
+users.inIdOrder = _.sortBy(users, 'id');
+
+// then things started becoming unruly... so IndexedArray!
+
+describe('IndexedArray', function () {
+  describe('Basics', function () {
+    var reg;
+
+    beforeEach(function () {
+      reg = new IndexedArray();
+    });
+
+    it('Extends Array', function () {
+      expect(reg).to.be.a(Array);
+    });
+
+    it('fails basic lodash check', function () {
+      expect(_.isArray(reg)).to.be(false);
+    });
+
+    it('clones to an object', function () {
+      expect(_.isPlainObject(_.clone(reg))).to.be(true);
+      expect(_.isArray(_.clone(reg))).to.be(false);
+    });
+  });
+
+  describe('Indexing', function () {
+    it('provides the initial set', function () {
+      var reg = new IndexedArray({
+        initialSet: [1, 2, 3]
+      });
+
+      expect(reg).to.have.length(3);
+
+      reg.forEach(function (v, i) {
+        expect(v).to.eql(i + 1);
+      });
+    });
+
+    it('indexes the initial set', function () {
+      var reg = new IndexedArray({
+        index: ['username'],
+        initialSet: users
+      });
+
+      expect(reg).to.have.property('byUsername');
+      expect(reg.byUsername).to.eql(users.byUsername);
+    });
+
+    it('updates indices after values are added', function () {
+      // split up the user list, and add it in chunks
+      var firstUser = users.slice(0, 1).pop();
+      var otherUsers = users.slice(1);
+
+      // start off with all but the first
+      var reg = new IndexedArray({
+        group: ['group'],
+        order: ['id'],
+        initialSet: otherUsers
+      });
+
+      // add the first
+      reg.push(firstUser);
+
+      // end up with the same structure that is in the users fixture
+      expect(reg.byGroup).to.eql(users.byGroup);
+      expect(reg.inIdOrder).to.eql(users.inIdOrder);
+    });
+
+    it('updates indices after values are removed', function () {
+      // start off with all
+      var reg = new IndexedArray({
+        group: ['group'],
+        order: ['id'],
+        initialSet: users
+      });
+
+      // remove the last
+      reg.pop();
+
+      var expectedCount = users.length - 1;
+      // indexed lists should be updated
+      expect(reg).to.have.length(expectedCount);
+
+      var sumOfGroups = _.reduce(reg.byGroup, function (note, group) {
+        return note + group.length;
+      }, 0);
+      expect(sumOfGroups).to.eql(expectedCount);
+    });
+
+    it('removes items based on a predicate', function () {
+      var reg = new IndexedArray({
+        group: ['group'],
+        order: ['id'],
+        initialSet: users
+      });
+
+      reg.remove({name: 'John'});
+
+      expect(_.eq(reg.raw, reg.slice(0))).to.be(true);
+      expect(reg.length).to.be(3);
+      expect(reg[0].name).to.be('Anon');
+    });
+
+    it('updates indices after values are re-ordered', function () {
+      var rawUsers = users.slice(0);
+
+      // collect and shuffle the ids available
+      var ids = [];
+      _.times(rawUsers.length, function (i) { ids.push(i); });
+      ids = _.shuffle(ids);
+
+      // move something here
+      var toI = ids.shift();
+      // from here
+      var fromI = ids.shift();
+      // do the move
+      var move = function (arr) { arr.splice(toI, 0, arr.splice(fromI, 1)[0]); };
+
+      var reg = new IndexedArray({
+        index: ['username'],
+        initialSet: rawUsers
+      });
+
+      var index = reg.byUsername;
+
+      move(reg);
+
+      expect(reg.byUsername).to.eql(index);
+      expect(reg.byUsername).to.not.be(index);
+    });
+  });
+});
diff --git a/src/ui/public/IndexedArray/__tests__/inflector.js b/src/ui/public/IndexedArray/__tests__/inflector.js
new file mode 100644
index 0000000000000..eb4f04696702a
--- /dev/null
+++ b/src/ui/public/IndexedArray/__tests__/inflector.js
@@ -0,0 +1,44 @@
+var inflector = require('ui/IndexedArray/inflector');
+var expect = require('expect.js');
+
+describe('IndexedArray Inflector', function () {
+  it('returns a function', function () {
+    var getter = inflector();
+    expect(getter).to.be.a('function');
+  });
+
+  describe('fn', function () {
+    it('prepends a prefix', function () {
+      var inflect = inflector('my');
+
+      expect(inflect('Family')).to.be('myFamily');
+      expect(inflect('family')).to.be('myFamily');
+      expect(inflect('fAmIlY')).to.be('myFAmIlY');
+    });
+
+    it('adds both a prefix and suffix', function () {
+      var inflect = inflector('foo', 'Bar');
+
+      expect(inflect('box')).to.be('fooBoxBar');
+      expect(inflect('box.car.MAX')).to.be('fooBoxCarMaxBar');
+      expect(inflect('BaZzY')).to.be('fooBaZzYBar');
+    });
+
+    it('ignores prefix if it is already at the end of the inflected string', function () {
+      var inflect = inflector('foo', 'Bar');
+      expect(inflect('fooBox')).to.be('fooBoxBar');
+      expect(inflect('FooBox')).to.be('FooBoxBar');
+    });
+
+    it('ignores postfix if it is already at the end of the inflected string', function () {
+      var inflect = inflector('foo', 'Bar');
+      expect(inflect('bar')).to.be('fooBar');
+      expect(inflect('showBoxBar')).to.be('fooShowBoxBar');
+    });
+
+    it('works with "name"', function () {
+      var inflect = inflector('in', 'Order');
+      expect(inflect('name')).to.be('inNameOrder');
+    });
+  });
+});
diff --git a/src/kibana/utils/indexed_array/_inflector.js b/src/ui/public/IndexedArray/inflector.js
similarity index 100%
rename from src/kibana/utils/indexed_array/_inflector.js
rename to src/ui/public/IndexedArray/inflector.js
diff --git a/src/ui/public/StackTraceMapper/SourceMapReader.js b/src/ui/public/StackTraceMapper/SourceMapReader.js
new file mode 100644
index 0000000000000..122a89317d697
--- /dev/null
+++ b/src/ui/public/StackTraceMapper/SourceMapReader.js
@@ -0,0 +1,15 @@
+var _ = require('lodash');
+var SourceMapConsumer = require('source-map/lib/source-map/source-map-consumer').SourceMapConsumer;
+var parse = require('url').parse;
+
+function SourceMapReader(url, map) {
+  this.smc = new SourceMapConsumer(map);
+  this.url = parse(url);
+  this.re = new RegExp('(^|/)' + _.escapeRegExp(this.url.pathname.slice(1)) + '($|\\?|#)');
+}
+
+SourceMapReader.prototype.matchUrl = function (stackFileName) {
+  return this.re.test(stackFileName);
+};
+
+module.exports = SourceMapReader;
diff --git a/src/ui/public/StackTraceMapper/StackTraceMapper.js b/src/ui/public/StackTraceMapper/StackTraceMapper.js
new file mode 100644
index 0000000000000..ba6f46e5cfa88
--- /dev/null
+++ b/src/ui/public/StackTraceMapper/StackTraceMapper.js
@@ -0,0 +1,65 @@
+var _ = require('lodash');
+var $ = require('jquery');
+var resolve = require('bluebird').resolve;
+var fetch = require('exports?window.fetch!imports?Promise=bluebird!whatwg-fetch');
+
+var setErrorStack = require('./setErrorStack');
+var translateStackLine = require('./translateStackLine');
+var stackLineFormat = require('./stackLineFormat');
+var SourceMapReader = require('./SourceMapReader');
+
+function StackTraceMapper() {
+  this.maps = [];
+  this.init = _.once(this.init);
+  this.getMapFor = _.memoize(this.getMapFor);
+  _.bindAll(this, 'init', 'mapError', 'getMapFor', 'mapLine', 'loadMaps');
+}
+
+StackTraceMapper.prototype.init = function (mapUrls) {
+  return this.loadMaps(mapUrls).return(this);
+};
+
+StackTraceMapper.prototype.mapError = function (err) {
+  if (!stackLineFormat || !err.stack) return err;
+
+  var stack = err.stack.replace(stackLineFormat, this.mapLine);
+  return setErrorStack(err, this.mapLine);
+};
+
+StackTraceMapper.prototype.mapLine = function (match, filename, line, col) {
+  return translateStackLine(this.getMapFor(filename), match, filename, line, col);
+};
+
+StackTraceMapper.prototype.getMapFor = function (url) {
+  return _.find(this.maps, function (map) {
+    return map.matchUrl(url);
+  });
+};
+
+StackTraceMapper.prototype.loadMaps = function (mapUrls) {
+  mapUrls = _.clone(mapUrls || {});
+
+  var maps = this.maps;
+
+  $('script[src][src-map]').each(function () {
+    var $el = $(this);
+    mapUrls[$el.attr('src')] = $el.attr('src-map');
+  });
+
+  return resolve(_.pairs(mapUrls))
+  .map(
+    _.spread(function (url, mapUrl) {
+      return fetch(mapUrl)
+      .then(function (resp) { return resp.json(); })
+      .then(function (map) {
+        maps.push(new SourceMapReader(url, map));
+      });
+    })
+  );
+};
+
+StackTraceMapper.getInstance = _.once(function () {
+  return (new StackTraceMapper()).init();
+});
+
+module.exports = StackTraceMapper;
diff --git a/src/ui/public/StackTraceMapper/setErrorStack.js b/src/ui/public/StackTraceMapper/setErrorStack.js
new file mode 100644
index 0000000000000..db6fc5fdc341f
--- /dev/null
+++ b/src/ui/public/StackTraceMapper/setErrorStack.js
@@ -0,0 +1,34 @@
+var _ = require('lodash');
+
+var err = new Error();
+setByAssignment(err, 'john');
+
+// err.stack is not always writeable, so we
+// do some detection for support and fallback to a
+// shadowing method, which "copies" the error but
+// keeps the original as the prototype so that
+// the error is still an instance of the same
+// classes as the original error
+if (err.stack === 'john') module.exports = setByAssignment;
+else module.exports = setByShadowing;
+
+function setByShadowing(err, stack) {
+  var props = _.mapValues(err, function (val) {
+    return {
+      enumerable: true,
+      value: val
+    };
+  });
+
+  props.stack = {
+    enumerable: true,
+    value: stack
+  };
+
+  return Object.create(err, props);
+}
+
+function setByAssignment(err, stack) {
+  err.stack = stack;
+  return err;
+}
diff --git a/src/ui/public/StackTraceMapper/stackLineFormat.js b/src/ui/public/StackTraceMapper/stackLineFormat.js
new file mode 100644
index 0000000000000..27706a165a5c1
--- /dev/null
+++ b/src/ui/public/StackTraceMapper/stackLineFormat.js
@@ -0,0 +1,19 @@
+var _ = require('lodash');
+
+var opts = [
+  /@((?:[!#$&-;=?-\[\]_a-z~]|%[0-9a-f]{2})+\.js)\:(\d+)(?:\:(\d+)|())/ig,
+  /(?: \(|at )((?:[!#$&-;=?-\[\]_a-z~]|%[0-9a-f]{2})+\.js)\:(\d+)(?:\:(\d+)|())/ig
+];
+
+var sample;
+try { throw new Error('msg'); } catch (e) { sample = e.stack; }
+
+var format = _.find(opts, function (format) {
+  return format.test(sample);
+});
+
+if (!format && window.console && window.console.log) {
+  window.console.log('unable to pick format with stack trace sample ' + sample);
+}
+
+module.exports = format;
diff --git a/src/ui/public/StackTraceMapper/translateStackLine.js b/src/ui/public/StackTraceMapper/translateStackLine.js
new file mode 100644
index 0000000000000..de6eae6347b03
--- /dev/null
+++ b/src/ui/public/StackTraceMapper/translateStackLine.js
@@ -0,0 +1,41 @@
+var _ = require('lodash');
+
+module.exports = function (map, match, filename, line, col) {
+  if (!map) return match;
+
+  var position = {
+    line: parseFloat(line) || 0,
+    column: parseFloat(col) || 0
+  };
+
+  var srcPosition = map.smc.originalPositionFor(position);
+  if (!srcPosition || !srcPosition.source) return match;
+
+  var srcFilename = srcPosition.source;
+  var srcLine = srcPosition.line;
+  var srcCol = srcPosition.column;
+
+  if (srcCol === 0 && position.column) {
+    // TODO: teach sourcemaps correct column
+    //
+    // since our bundles are not yet minified we can copy the column
+    // this won't always be the case
+    srcCol = position.column;
+  }
+
+  // fold the components into the original match, so that supporting
+  // characters (parens, periods, etc) from the format are kept, and so
+  // we don't accidentally replace the wrong part we use splitting and consumption
+  var resp = '';
+  var remainingResp = match;
+  var fold = function (replace, replacement) {
+    var wrappingContent = remainingResp.split(replace);
+    resp += wrappingContent.shift() + replacement;
+    remainingResp = wrappingContent.join(replace);
+  };
+
+  fold(filename, srcFilename);
+  fold(line, srcLine);
+  if (_.isString(col)) fold(col, srcCol);
+  return resp;
+};
diff --git a/src/kibana/components/vis/AggConfig.js b/src/ui/public/Vis/AggConfig.js
similarity index 99%
rename from src/kibana/components/vis/AggConfig.js
rename to src/ui/public/Vis/AggConfig.js
index fca276c617ef4..652c9a81f42d4 100644
--- a/src/kibana/components/vis/AggConfig.js
+++ b/src/ui/public/Vis/AggConfig.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function AggConfigFactory(Private, fieldTypeFilter) {
     var _ = require('lodash');
-    var fieldFormats = Private(require('registry/field_formats'));
+    var fieldFormats = Private(require('ui/registry/field_formats'));
 
     function AggConfig(vis, opts) {
       var self = this;
diff --git a/src/kibana/components/vis/AggConfigResult.js b/src/ui/public/Vis/AggConfigResult.js
similarity index 100%
rename from src/kibana/components/vis/AggConfigResult.js
rename to src/ui/public/Vis/AggConfigResult.js
diff --git a/src/kibana/components/vis/AggConfigs.js b/src/ui/public/Vis/AggConfigs.js
similarity index 95%
rename from src/kibana/components/vis/AggConfigs.js
rename to src/ui/public/Vis/AggConfigs.js
index 0ccb0ef674903..11c8c979d0034 100644
--- a/src/kibana/components/vis/AggConfigs.js
+++ b/src/ui/public/Vis/AggConfigs.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function AggConfigsFactory(Private) {
     var _ = require('lodash');
-    var AggConfig = Private(require('components/vis/AggConfig'));
-    var IndexedArray = require('utils/indexed_array/index');
+    var AggConfig = Private(require('ui/Vis/AggConfig'));
+    var IndexedArray = require('ui/IndexedArray');
 
-    AggConfig.aggTypes = Private(require('components/agg_types/index'));
+    AggConfig.aggTypes = Private(require('ui/agg_types/index'));
 
     _.class(AggConfigs).inherits(IndexedArray);
     function AggConfigs(vis, configStates) {
diff --git a/src/kibana/components/vis/Renderbot.js b/src/ui/public/Vis/Renderbot.js
similarity index 100%
rename from src/kibana/components/vis/Renderbot.js
rename to src/ui/public/Vis/Renderbot.js
diff --git a/src/kibana/components/vis/Schemas.js b/src/ui/public/Vis/Schemas.js
similarity index 79%
rename from src/kibana/components/vis/Schemas.js
rename to src/ui/public/Vis/Schemas.js
index d5126e587fad6..d3b4159f985ee 100644
--- a/src/kibana/components/vis/Schemas.js
+++ b/src/ui/public/Vis/Schemas.js
@@ -1,8 +1,8 @@
 define(function (require) {
   return function VisTypeSchemasFactory(Private) {
     var _ = require('lodash');
-    var IndexedArray = require('utils/indexed_array/index');
-    var AggParams = Private(require('components/agg_types/_agg_params'));
+    var IndexedArray = require('ui/IndexedArray');
+    var AggParams = Private(require('ui/agg_types/AggParams'));
 
     function Schemas(schemas) {
       var self = this;
@@ -18,9 +18,9 @@ define(function (require) {
               default: true
             }
           ];
-          schema.editor = require('text!plugins/kbn_vislib_vis_types/controls/rows_or_columns.html');
+          schema.editor = require('plugins/kbn_vislib_vis_types/controls/rows_or_columns.html');
         } else if (schema.name === 'radius') {
-          schema.editor = require('text!plugins/kbn_vislib_vis_types/controls/radius_ratio_option.html');
+          schema.editor = require('plugins/kbn_vislib_vis_types/controls/radius_ratio_option.html');
         }
 
         _.defaults(schema, {
diff --git a/src/ui/public/Vis/Vis.js b/src/ui/public/Vis/Vis.js
new file mode 100644
index 0000000000000..cdfddd4246496
--- /dev/null
+++ b/src/ui/public/Vis/Vis.js
@@ -0,0 +1,123 @@
+define(function (require) {
+  return function VisFactory(Notifier, Private) {
+    var _ = require('lodash');
+    var aggTypes = Private(require('ui/agg_types/index'));
+    var visTypes = Private(require('ui/registry/vis_types'));
+    var AggConfigs = Private(require('ui/Vis/AggConfigs'));
+
+    var notify = new Notifier({
+      location: 'Vis'
+    });
+
+    function Vis(indexPattern, state) {
+      state = state || {};
+
+      if (_.isString(state)) {
+        state = {
+          type: state
+        };
+      }
+
+      this.indexPattern = indexPattern;
+
+      // http://aphyr.com/data/posts/317/state.gif
+      this.setState(state);
+    }
+
+    Vis.convertOldState = function (type, oldState) {
+      if (!type || _.isString(type)) {
+        type = visTypes.byName[type || 'histogram'];
+      }
+
+      var schemas = type.schemas;
+
+      var aggs = _.transform(oldState, function (newConfigs, oldConfigs, oldGroupName) {
+        var schema = schemas.all.byName[oldGroupName];
+
+        if (!schema) {
+          notify.log('unable to match old schema', oldGroupName, 'to a new schema');
+          return;
+        }
+
+        oldConfigs.forEach(function (oldConfig) {
+          var agg = {
+            schema: schema.name,
+            type: oldConfig.agg,
+          };
+
+          var aggType = aggTypes.byName[agg.type];
+          if (!aggType) {
+            notify.log('unable to find an agg type for old confg', oldConfig);
+            return;
+          }
+
+          agg.params = _.pick(oldConfig, _.keys(aggType.params.byName));
+
+          newConfigs.push(agg);
+        });
+      }, []);
+
+      return {
+        type: type,
+        aggs: aggs
+      };
+    };
+
+    Vis.prototype.type = 'histogram';
+
+    Vis.prototype.setState = function (state) {
+      this.type = state.type || this.type;
+      if (_.isString(this.type)) this.type = visTypes.byName[this.type];
+
+      this.listeners = _.assign({}, state.listeners, this.type.listeners);
+      this.params = _.defaults({}, _.cloneDeep(state.params || {}), this.type.params.defaults || {});
+
+      this.aggs = new AggConfigs(this, state.aggs);
+    };
+
+    Vis.prototype.getState = function () {
+      return {
+        type: this.type.name,
+        params: this.params,
+        aggs: this.aggs.map(function (agg) {
+          return agg.toJSON();
+        }).filter(Boolean),
+        listeners: this.listeners
+      };
+    };
+
+    Vis.prototype.createEditableVis = function () {
+      return this._editableVis || (this._editableVis = this.clone());
+    };
+
+    Vis.prototype.getEditableVis = function () {
+      return this._editableVis || undefined;
+    };
+
+    Vis.prototype.clone = function () {
+      return new Vis(this.indexPattern, this.getState());
+    };
+
+    Vis.prototype.requesting = function () {
+      _.invoke(this.aggs.getRequestAggs(), 'requesting');
+    };
+
+    Vis.prototype.isHierarchical = function () {
+      if (_.isFunction(this.type.hierarchicalData)) {
+        return !!this.type.hierarchicalData(this);
+      } else {
+        return !!this.type.hierarchicalData;
+      }
+    };
+
+    Vis.prototype.hasSchemaAgg = function (schemaName, aggTypeName) {
+      var aggs = this.aggs.bySchemaName[schemaName] || [];
+      return aggs.some(function (agg) {
+        if (!agg.type || !agg.type.name) return false;
+        return agg.type.name === aggTypeName;
+      });
+    };
+
+    return Vis;
+  };
+});
diff --git a/src/kibana/components/vis/VisType.js b/src/ui/public/Vis/VisType.js
similarity index 90%
rename from src/kibana/components/vis/VisType.js
rename to src/ui/public/Vis/VisType.js
index df7a4304f1ae4..0c995bd108b14 100644
--- a/src/kibana/components/vis/VisType.js
+++ b/src/ui/public/Vis/VisType.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function VisTypeFactory(Private) {
-    var VisTypeSchemas = Private(require('components/vis/Schemas'));
+    var VisTypeSchemas = Private(require('ui/Vis/Schemas'));
 
     function VisType(opts) {
       opts = opts || {};
diff --git a/src/ui/public/Vis/__tests__/_AggConfig.js b/src/ui/public/Vis/__tests__/_AggConfig.js
new file mode 100644
index 0000000000000..579c120fc7e13
--- /dev/null
+++ b/src/ui/public/Vis/__tests__/_AggConfig.js
@@ -0,0 +1,290 @@
+describe('AggConfig', function () {
+  var sinon = require('auto-release-sinon');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var Vis;
+  var AggType;
+  var AggConfig;
+  var indexPattern;
+  var fieldFormat;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    Vis = Private(require('ui/Vis'));
+    AggType = Private(require('ui/agg_types/AggType'));
+    AggConfig = Private(require('ui/Vis/AggConfig'));
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    fieldFormat = Private(require('ui/registry/field_formats'));
+  }));
+
+  describe('#toDsl', function () {
+    it('calls #write()', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          {
+            type: 'date_histogram',
+            schema: 'segment'
+          }
+        ]
+      });
+
+      var aggConfig = vis.aggs.byTypeName.date_histogram[0];
+      var stub = sinon.stub(aggConfig, 'write').returns({ params: {} });
+
+      aggConfig.toDsl();
+      expect(stub.callCount).to.be(1);
+    });
+
+    it('uses the type name as the agg name', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          {
+            type: 'date_histogram',
+            schema: 'segment'
+          }
+        ]
+      });
+
+      var aggConfig = vis.aggs.byTypeName.date_histogram[0];
+      sinon.stub(aggConfig, 'write').returns({ params: {} });
+
+      var dsl = aggConfig.toDsl();
+      expect(dsl).to.have.property('date_histogram');
+    });
+
+    it('uses the params from #write() output as the agg params', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          {
+            type: 'date_histogram',
+            schema: 'segment'
+          }
+        ]
+      });
+
+      var aggConfig = vis.aggs.byTypeName.date_histogram[0];
+      var football = {};
+
+      sinon.stub(aggConfig, 'write').returns({ params: football });
+
+      var dsl = aggConfig.toDsl();
+      expect(dsl.date_histogram).to.be(football);
+    });
+
+    it('includes subAggs from #write() output', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          {
+            type: 'avg',
+            schema: 'metric'
+          },
+          {
+            type: 'date_histogram',
+            schema: 'segment'
+          }
+        ]
+      });
+
+      var histoConfig = vis.aggs.byTypeName.date_histogram[0];
+      var avgConfig = vis.aggs.byTypeName.avg[0];
+      var football = {};
+
+      sinon.stub(histoConfig, 'write').returns({ params: {}, subAggs: [avgConfig] });
+      sinon.stub(avgConfig, 'write').returns({ params: football });
+
+      var dsl = histoConfig.toDsl();
+
+      // didn't use .eql() because of variable key names, and final check is strict
+      expect(dsl).to.have.property('aggs');
+      expect(dsl.aggs).to.have.property(avgConfig.id);
+      expect(dsl.aggs[avgConfig.id]).to.have.property('avg');
+      expect(dsl.aggs[avgConfig.id].avg).to.be(football);
+    });
+  });
+
+  describe('::ensureIds', function () {
+    it('accepts an array of objects and assigns ids to them', function () {
+      var objs = [
+        {},
+        {},
+        {},
+        {}
+      ];
+      AggConfig.ensureIds(objs);
+      expect(objs[0]).to.have.property('id', '1');
+      expect(objs[1]).to.have.property('id', '2');
+      expect(objs[2]).to.have.property('id', '3');
+      expect(objs[3]).to.have.property('id', '4');
+    });
+
+    it('assigns ids relative to the other items in the list', function () {
+      var objs = [
+        { id: '100' },
+        {},
+      ];
+      AggConfig.ensureIds(objs);
+      expect(objs[0]).to.have.property('id', '100');
+      expect(objs[1]).to.have.property('id', '101');
+    });
+
+    it('assigns ids relative to the other items in the list', function () {
+      var objs = [
+        { id: '100' },
+        { id: '200' },
+        { id: '500' },
+        { id: '350' },
+        {},
+      ];
+      AggConfig.ensureIds(objs);
+      expect(objs[0]).to.have.property('id', '100');
+      expect(objs[1]).to.have.property('id', '200');
+      expect(objs[2]).to.have.property('id', '500');
+      expect(objs[3]).to.have.property('id', '350');
+      expect(objs[4]).to.have.property('id', '501');
+    });
+
+    it('uses ::nextId to get the starting value', function () {
+      sinon.stub(AggConfig, 'nextId').returns(534);
+      var objs = AggConfig.ensureIds([{}]);
+      expect(objs[0]).to.have.property('id', '534');
+    });
+
+    it('only calls ::nextId once', function () {
+      var start = 420;
+      sinon.stub(AggConfig, 'nextId').returns(start);
+      var objs = AggConfig.ensureIds([{}, {}, {}, {}, {}, {}, {}]);
+
+      expect(AggConfig.nextId).to.have.property('callCount', 1);
+      objs.forEach(function (obj, i) {
+        expect(obj).to.have.property('id', String(start + i));
+      });
+    });
+  });
+
+  describe('::nextId', function () {
+    it('accepts a list of objects and picks the next id', function () {
+      var next = AggConfig.nextId([ {id: 100}, {id: 500} ]);
+      expect(next).to.be(501);
+    });
+
+    it('handles an empty list', function () {
+      var next = AggConfig.nextId([]);
+      expect(next).to.be(1);
+    });
+
+    it('fails when the list is not defined', function () {
+      expect(function () {
+        AggConfig.nextId();
+      }).to.throwError();
+    });
+  });
+
+  describe('#toJSON', function () {
+    it('includes the aggs id, params, type and schema', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          {
+            type: 'date_histogram',
+            schema: 'segment'
+          }
+        ]
+      });
+
+      var aggConfig = vis.aggs.byTypeName.date_histogram[0];
+      expect(aggConfig.id).to.be('1');
+      expect(aggConfig.params).to.be.an('object');
+      expect(aggConfig.type).to.be.an(AggType).and.have.property('name', 'date_histogram');
+      expect(aggConfig.schema).to.be.an('object').and.have.property('name', 'segment');
+
+      var state = aggConfig.toJSON();
+      expect(state).to.have.property('id', '1');
+      expect(state.params).to.be.an('object');
+      expect(state).to.have.property('type', 'date_histogram');
+      expect(state).to.have.property('schema', 'segment');
+    });
+  });
+
+  describe('#fieldFormatter', function () {
+    it('returns the fields format unless the agg type has a custom getFormat handler', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          {
+            type: 'date_histogram',
+            schema: 'segment',
+            params: { field: '@timestamp' }
+          }
+        ]
+      });
+      expect(vis.aggs[0].fieldFormatter()).to.be(vis.aggs[0].field().format.getConverterFor());
+
+      vis = new Vis(indexPattern, {
+        type: 'metric',
+        aggs: [
+          {
+            type: 'count',
+            schema: 'metric',
+            params: { field: '@timestamp' }
+          }
+        ]
+      });
+      expect(vis.aggs[0].fieldFormatter()).to.be(fieldFormat.getDefaultInstance('number').getConverterFor());
+    });
+
+    it('returns the string format if the field does not have a format', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          {
+            type: 'date_histogram',
+            schema: 'segment',
+            params: { field: '@timestamp' }
+          }
+        ]
+      });
+
+      var agg = vis.aggs[0];
+      agg.params.field = { type: 'date', format: null };
+      expect(agg.fieldFormatter()).to.be(fieldFormat.getDefaultInstance('string').getConverterFor());
+    });
+
+    it('returns the string format if their is no field', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          {
+            type: 'date_histogram',
+            schema: 'segment',
+            params: { field: '@timestamp' }
+          }
+        ]
+      });
+
+      var agg = vis.aggs[0];
+      delete agg.params.field;
+      expect(agg.fieldFormatter()).to.be(fieldFormat.getDefaultInstance('string').getConverterFor());
+    });
+
+    it('returns the html converter if "html" is passed in', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          {
+            type: 'avg',
+            schema: 'metric',
+            params: { field: 'ssl' }
+          }
+        ]
+      });
+
+      var field = indexPattern.fields.byName.ssl;
+      expect(vis.aggs[0].fieldFormatter('html')).to.be(field.format.getConverterFor('html'));
+    });
+  });
+});
diff --git a/src/ui/public/Vis/__tests__/_AggConfigResult.js b/src/ui/public/Vis/__tests__/_AggConfigResult.js
new file mode 100644
index 0000000000000..9a48b95f433be
--- /dev/null
+++ b/src/ui/public/Vis/__tests__/_AggConfigResult.js
@@ -0,0 +1,107 @@
+describe('AggConfigResult', function () {
+  var _ = require('lodash');
+  var AggConfigResult = require('ui/Vis/AggConfigResult');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var AggConfig;
+  var indexPattern;
+  var Vis;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    Vis = Private(require('ui/Vis'));
+    AggConfig = Private(require('ui/Vis/AggConfig'));
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+  }));
+
+  describe('initialization', function () {
+    it('should set the type to bucket for bucket based results', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [ { type: 'terms', schema: 'segment', params: { field: '_type' } } ]
+      });
+      var aggConfig = vis.aggs.byTypeName.terms[0];
+      var results = new AggConfigResult(aggConfig, null, 10, 'apache');
+      expect(results).to.have.property('aggConfig', aggConfig);
+      expect(results).to.have.property('$parent', null);
+      expect(results).to.have.property('type', 'bucket');
+      expect(results).to.have.property('value', 10);
+      expect(results).to.have.property('key', 'apache');
+    });
+
+    it('should set the type to metric for metric based results', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [ { type: 'avg', schema: 'metric', params: { field: 'bytes' } } ]
+      });
+      var aggConfig = vis.aggs.byTypeName.avg[0];
+      var results = new AggConfigResult(aggConfig, null, 1024);
+      expect(results).to.have.property('aggConfig', aggConfig);
+      expect(results).to.have.property('$parent', null);
+      expect(results).to.have.property('type', 'metric');
+      expect(results).to.have.property('value', 1024);
+      expect(results).to.have.property('key', undefined);
+    });
+  });
+
+
+  describe('hierarchical', function () {
+    describe('getPath()', function () {
+
+      it('should return the parent and itself (in an array) for the path', function () {
+        var vis = new Vis(indexPattern, {
+          type: 'histogram',
+          aggs: [
+            { type: 'terms', schema: 'segment', params: { field: '_type' } },
+            { type: 'terms', schema: 'segment', params: { field: 'extension' } }
+          ]
+        });
+        var parentAggConfig = vis.aggs.byTypeName.terms[0];
+        var aggConfig = vis.aggs.byTypeName.terms[1];
+        var parentResult = new AggConfigResult(parentAggConfig, null, 20, 'apache');
+        var result = new AggConfigResult(aggConfig, parentResult, 15, 'php');
+        var path = result.getPath();
+        expect(path).to.be.an(Array);
+        expect(path).to.have.length(2);
+        expect(path[0]).to.be(parentResult);
+        expect(path[1]).to.be(result);
+      });
+
+      it('should return itself (in an array) for the path', function () {
+        var vis = new Vis(indexPattern, {
+          type: 'histogram',
+          aggs: [
+            { type: 'terms', schema: 'segment', params: { field: 'extension' } }
+          ]
+        });
+        var aggConfig = vis.aggs.byTypeName.terms[0];
+        var result = new AggConfigResult(aggConfig, null, 15, 'php');
+        var path = result.getPath();
+        expect(path).to.be.an(Array);
+        expect(path).to.have.length(1);
+        expect(path[0]).to.be(result);
+      });
+
+    });
+
+    describe('createFilter', function () {
+      it('should return a filter object that represents the result', function () {
+        var vis = new Vis(indexPattern, {
+          type: 'histogram',
+          aggs: [
+            { type: 'terms', schema: 'segment', params: { field: 'extension' } }
+          ]
+        });
+        var aggConfig = vis.aggs.byTypeName.terms[0];
+        var result = new AggConfigResult(aggConfig, null, 15, 'php');
+        var filter = result.createFilter();
+        expect(filter).to.have.property('query');
+        expect(filter.query).to.have.property('match');
+        expect(filter.query.match).to.have.property('extension');
+        expect(filter.query.match.extension).to.have.property('query', 'php');
+        expect(filter.query.match.extension).to.have.property('type', 'phrase');
+      });
+    });
+  });
+});
diff --git a/src/ui/public/Vis/__tests__/_AggConfigs.js b/src/ui/public/Vis/__tests__/_AggConfigs.js
new file mode 100644
index 0000000000000..cd165a86c0682
--- /dev/null
+++ b/src/ui/public/Vis/__tests__/_AggConfigs.js
@@ -0,0 +1,353 @@
+describe('AggConfigs', function () {
+  var _ = require('lodash');
+  var sinon = require('auto-release-sinon');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var Vis;
+  var IndexedArray;
+  var AggConfig;
+  var AggConfigs;
+  var SpiedAggConfig;
+  var indexPattern;
+  var Schemas;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    // replace the AggConfig module with a spy
+    var RealAggConfigPM = require('ui/Vis/AggConfig');
+    AggConfig = Private(RealAggConfigPM);
+    var spy = sinon.spy(AggConfig);
+    Object.defineProperty(spy, 'aggTypes', {
+      get: function () { return AggConfig.aggTypes; },
+      set: function (val) { AggConfig.aggTypes = val; }
+    });
+
+    Private.stub(RealAggConfigPM, spy);
+
+    // load main deps
+    Vis = Private(require('ui/Vis'));
+    SpiedAggConfig = Private(require('ui/Vis/AggConfig'));
+    AggConfigs = Private(require('ui/Vis/AggConfigs'));
+    IndexedArray = require('ui/IndexedArray');
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    Schemas = Private(require('ui/Vis/Schemas'));
+  }));
+
+  it('extends IndexedArray', function () {
+    var ac = new AggConfigs();
+    expect(ac).to.be.a(IndexedArray);
+  });
+
+  describe('constructor', function () {
+    it('handles passing just a vis', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: []
+      });
+
+      var ac = new AggConfigs(vis);
+      expect(ac).to.have.length(1);
+    });
+
+    it('converts configStates into AggConfig objects if they are not already', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: []
+      });
+
+      var ac = new AggConfigs(vis, [
+        {
+          type: 'date_histogram',
+          schema: 'segment'
+        },
+        new AggConfig(vis, {
+          type: 'terms',
+          schema: 'split'
+        })
+      ]);
+
+      expect(ac).to.have.length(3);
+      expect(SpiedAggConfig).to.have.property('callCount', 3);
+    });
+
+    it('attemps to ensure that all states have an id', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: []
+      });
+
+      var states = [
+        {
+          type: 'date_histogram',
+          schema: 'segment'
+        },
+        {
+          type: 'terms',
+          schema: 'split'
+        }
+      ];
+
+      var spy = sinon.spy(SpiedAggConfig, 'ensureIds');
+      var ac = new AggConfigs(vis, states);
+      expect(spy.callCount).to.be(1);
+      expect(spy.firstCall.args[0]).to.be(states);
+    });
+
+    describe('defaults', function () {
+      var vis;
+      beforeEach(function () {
+        vis = {
+          indexPattern: indexPattern,
+          type: {
+            schemas: new Schemas([
+              {
+                group: 'metrics',
+                name: 'metric',
+                title: 'Simple',
+                min: 1,
+                max: 2,
+                defaults: [
+                  { schema: 'metric', type: 'count' },
+                  { schema: 'metric', type: 'avg' },
+                  { schema: 'metric', type: 'sum' }
+                ]
+              },
+              {
+                group: 'buckets',
+                name: 'segment',
+                title: 'Example',
+                min: 0,
+                max: 1,
+                defaults: [
+                  { schema: 'segment', type: 'terms' },
+                  { schema: 'segment', type: 'filters' }
+                ]
+              }
+            ])
+          }
+        };
+      });
+
+      it('should only set the number of defaults defined by the max', function () {
+        var ac = new AggConfigs(vis);
+        expect(ac.bySchemaName.metric).to.have.length(2);
+      });
+
+      it('should set the defaults defined in the schema when none exist', function () {
+        var ac = new AggConfigs(vis);
+        expect(ac).to.have.length(3);
+      });
+
+      it('should NOT set the defaults defined in the schema when some exist', function () {
+        var ac = new AggConfigs(vis, [{ schema: 'segment', type: 'date_histogram' }]);
+        expect(ac).to.have.length(3);
+        expect(ac.bySchemaName.segment[0].type.name).to.equal('date_histogram');
+      });
+    });
+  });
+
+  describe('#getRequestAggs', function () {
+    it('performs a stable sort, but moves metrics to the bottom', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          { type: 'avg', schema: 'metric' },
+          { type: 'terms', schema: 'split' },
+          { type: 'histogram', schema: 'split' },
+          { type: 'sum', schema: 'metric' },
+          { type: 'date_histogram', schema: 'segment' },
+          { type: 'filters', schema: 'split' },
+          { type: 'percentiles', schema: 'metric' }
+        ]
+      });
+
+      var sorted = vis.aggs.getRequestAggs();
+      var aggs = _.indexBy(vis.aggs, function (agg) {
+        return agg.type.name;
+      });
+
+      expect(sorted.shift()).to.be(aggs.terms);
+      expect(sorted.shift()).to.be(aggs.histogram);
+      expect(sorted.shift()).to.be(aggs.date_histogram);
+      expect(sorted.shift()).to.be(aggs.filters);
+      expect(sorted.shift()).to.be(aggs.avg);
+      expect(sorted.shift()).to.be(aggs.sum);
+      expect(sorted.shift()).to.be(aggs.percentiles);
+      expect(sorted).to.have.length(0);
+    });
+  });
+
+  describe('#getResponseAggs', function () {
+    it('returns all request aggs for basic aggs', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          { type: 'terms', schema: 'split' },
+          { type: 'date_histogram', schema: 'segment' },
+          { type: 'count', schema: 'metric' }
+        ]
+      });
+
+      var sorted = vis.aggs.getResponseAggs();
+      var aggs = _.indexBy(vis.aggs, function (agg) {
+        return agg.type.name;
+      });
+
+      expect(sorted.shift()).to.be(aggs.terms);
+      expect(sorted.shift()).to.be(aggs.date_histogram);
+      expect(sorted.shift()).to.be(aggs.count);
+      expect(sorted).to.have.length(0);
+    });
+
+    it('expands aggs that have multiple responses', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          { type: 'terms', schema: 'split' },
+          { type: 'date_histogram', schema: 'segment' },
+          { type: 'percentiles', schema: 'metric', params: { percents: [1, 2, 3]} }
+        ]
+      });
+
+      var sorted = vis.aggs.getResponseAggs();
+      var aggs = _.indexBy(vis.aggs, function (agg) {
+        return agg.type.name;
+      });
+
+      expect(sorted.shift()).to.be(aggs.terms);
+      expect(sorted.shift()).to.be(aggs.date_histogram);
+      expect(sorted.shift().id).to.be(aggs.percentiles.id + '.' + 1);
+      expect(sorted.shift().id).to.be(aggs.percentiles.id + '.' + 2);
+      expect(sorted.shift().id).to.be(aggs.percentiles.id + '.' + 3);
+      expect(sorted).to.have.length(0);
+    });
+  });
+
+  describe('#toDsl', function () {
+    it('uses the sorted aggs', function () {
+      var vis = new Vis(indexPattern, { type: 'histogram' });
+      sinon.spy(vis.aggs, 'getRequestAggs');
+      vis.aggs.toDsl();
+      expect(vis.aggs.getRequestAggs).to.have.property('callCount', 1);
+    });
+
+    it('calls aggConfig#toDsl() on each aggConfig and compiles the nested output', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          { type: 'date_histogram', schema: 'segment' },
+          { type: 'filters', schema: 'split' }
+        ]
+      });
+
+      var aggInfos = vis.aggs.map(function (aggConfig) {
+        var football = {};
+
+        sinon.stub(aggConfig, 'toDsl', function () {
+          return football;
+        });
+
+        return {
+          id: aggConfig.id,
+          football: football
+        };
+      });
+
+      (function recurse(lvl) {
+        var info = aggInfos.shift();
+
+        expect(lvl).to.have.property(info.id);
+        expect(lvl[info.id]).to.be(info.football);
+
+        if (lvl[info.id].aggs) {
+          return recurse(lvl[info.id].aggs);
+        }
+      }(vis.aggs.toDsl()));
+
+      expect(aggInfos).to.have.length(1);
+    });
+
+    it('skips aggs that don\'t have a dsl representation', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          { type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
+          { type: 'count', schema: 'metric' }
+        ]
+      });
+
+      var dsl = vis.aggs.toDsl();
+      var histo = vis.aggs.byTypeName.date_histogram[0];
+      var count = vis.aggs.byTypeName.count[0];
+
+      expect(dsl).to.have.property(histo.id);
+      expect(dsl[histo.id]).to.be.an('object');
+      expect(dsl[histo.id]).to.not.have.property('aggs');
+      expect(dsl).to.not.have.property(count.id);
+    });
+
+    it('writes multiple metric aggregations at the same level', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          { type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
+          { type: 'avg', schema: 'metric', params: { field: 'bytes' }  },
+          { type: 'sum', schema: 'metric', params: { field: 'bytes' }  },
+          { type: 'min', schema: 'metric', params: { field: 'bytes' }  },
+          { type: 'max', schema: 'metric', params: { field: 'bytes' }  }
+        ]
+      });
+
+      var dsl = vis.aggs.toDsl();
+
+      var histo = vis.aggs.byTypeName.date_histogram[0];
+      var metrics = vis.aggs.bySchemaGroup.metrics;
+
+      expect(dsl).to.have.property(histo.id);
+      expect(dsl[histo.id]).to.be.an('object');
+      expect(dsl[histo.id]).to.have.property('aggs');
+
+      metrics.forEach(function (metric) {
+        expect(dsl[histo.id].aggs).to.have.property(metric.id);
+        expect(dsl[histo.id].aggs[metric.id]).to.not.have.property('aggs');
+      });
+    });
+
+    it('writes multiple metric aggregations at every level if the vis is hierarchical', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          { type: 'terms', schema: 'segment', params: { field: 'ip', orderBy: 1 } },
+          { type: 'terms', schema: 'segment', params: { field: 'extension', orderBy: 1 } },
+          { id: 1, type: 'avg', schema: 'metric', params: { field: 'bytes' }  },
+          { type: 'sum', schema: 'metric', params: { field: 'bytes' }  },
+          { type: 'min', schema: 'metric', params: { field: 'bytes' }  },
+          { type: 'max', schema: 'metric', params: { field: 'bytes' }  }
+        ]
+      });
+      vis.isHierarchical = _.constant(true);
+
+      var topLevelDsl = vis.aggs.toDsl();
+      var buckets = vis.aggs.bySchemaGroup.buckets;
+      var metrics = vis.aggs.bySchemaGroup.metrics;
+
+      (function checkLevel(dsl) {
+        var bucket = buckets.shift();
+        expect(dsl).to.have.property(bucket.id);
+
+        expect(dsl[bucket.id]).to.be.an('object');
+        expect(dsl[bucket.id]).to.have.property('aggs');
+
+        metrics.forEach(function (metric) {
+          expect(dsl[bucket.id].aggs).to.have.property(metric.id);
+          expect(dsl[bucket.id].aggs[metric.id]).to.not.have.property('aggs');
+        });
+
+        if (buckets.length) {
+          checkLevel(dsl[bucket.id].aggs);
+        }
+      }(topLevelDsl));
+    });
+  });
+});
diff --git a/src/ui/public/Vis/__tests__/_Renderbot.js b/src/ui/public/Vis/__tests__/_Renderbot.js
new file mode 100644
index 0000000000000..a1bfd462fa0a1
--- /dev/null
+++ b/src/ui/public/Vis/__tests__/_Renderbot.js
@@ -0,0 +1,37 @@
+describe('renderbot', function () {
+  var Renderbot;
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  function init() {
+    ngMock.module('kibana');
+
+    ngMock.inject(function (Private) {
+      Renderbot = Private(require('ui/Vis/Renderbot'));
+    });
+  }
+
+  describe('API', function () {
+    var vis;
+    var $el;
+    var renderbot;
+
+    beforeEach(init);
+    beforeEach(function () {
+      vis = { hello: 'world' };
+      $el = 'element';
+      renderbot = new Renderbot(vis, $el);
+    });
+
+    it('should have expected methods', function () {
+      expect(renderbot).to.have.property('render');
+      expect(renderbot).to.have.property('destroy');
+      expect(renderbot).to.have.property('updateParams');
+    });
+
+    it('should throw if not implemented', function () {
+      expect(renderbot.render).to.throwError();
+      expect(renderbot.destroy).to.throwError();
+    });
+  });
+});
diff --git a/src/ui/public/Vis/__tests__/_Vis.js b/src/ui/public/Vis/__tests__/_Vis.js
new file mode 100644
index 0000000000000..f72e69e29af9d
--- /dev/null
+++ b/src/ui/public/Vis/__tests__/_Vis.js
@@ -0,0 +1,107 @@
+describe('Vis Class', function () {
+
+  var _ = require('lodash');
+  var ngMock = require('ngMock');
+  var expect = require('expect.js');
+
+  var indexPattern;
+  var Vis;
+  var visTypes;
+
+  var vis;
+  var stateFixture = {
+    type: 'pie',
+    aggs: [
+      { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
+      { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
+      { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
+    ],
+    params: { isDonut: true },
+    listeners: { click: _.noop }
+  };
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    Vis = Private(require('ui/Vis'));
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    visTypes = Private(require('ui/registry/vis_types'));
+  }));
+
+  beforeEach(function () {
+    vis = new Vis(indexPattern, stateFixture);
+  });
+
+  var verifyVis = function (vis) {
+    expect(vis).to.have.property('aggs');
+    expect(vis.aggs).to.have.length(3);
+
+    expect(vis).to.have.property('type');
+    expect(vis.type).to.eql(visTypes.byName.pie);
+
+    expect(vis).to.have.property('listeners');
+    expect(vis.listeners).to.have.property('click');
+    expect(vis.listeners.click).to.eql(_.noop);
+
+    expect(vis).to.have.property('params');
+    expect(vis.params).to.have.property('isDonut', true);
+    expect(vis).to.have.property('indexPattern', indexPattern);
+  };
+
+  describe('initialization', function () {
+    it('should set the state', function () {
+      verifyVis(vis);
+    });
+  });
+
+  describe('getState()', function () {
+    it('should get a state that represents the... er... state', function () {
+      var state = vis.getState();
+      expect(state).to.have.property('type', 'pie');
+
+      expect(state).to.have.property('params');
+      expect(state.params).to.have.property('isDonut', true);
+
+      expect(state).to.have.property('listeners');
+      expect(state.listeners).to.have.property('click');
+      expect(state.listeners.click).to.eql(_.noop);
+
+      expect(state).to.have.property('aggs');
+      expect(state.aggs).to.have.length(3);
+    });
+  });
+
+  describe('clone()', function () {
+    it('should make clone of itself', function () {
+      var clone = vis.clone();
+      verifyVis(clone);
+    });
+  });
+
+  describe('setState()', function () {
+    it('should set the state to defualts', function () {
+      var vis = new Vis(indexPattern);
+      expect(vis).to.have.property('type');
+      expect(vis.type).to.eql(visTypes.byName.histogram);
+      expect(vis).to.have.property('aggs');
+      expect(vis.aggs).to.have.length(1);
+      expect(vis).to.have.property('listeners');
+      expect(vis.listeners).to.eql({});
+      expect(vis).to.have.property('params');
+      expect(vis.params).to.have.property('addLegend', true);
+      expect(vis.params).to.have.property('addTooltip', true);
+      expect(vis.params).to.have.property('mode', 'stacked');
+      expect(vis.params).to.have.property('shareYAxis', true);
+    });
+  });
+
+  describe('isHierarchical()', function () {
+    it('should return true for hierarchical vis (like pie)', function () {
+      expect(vis.isHierarchical()).to.be(true);
+    });
+    it('should return false for non-hierarchical vis (like histogram)', function () {
+      var vis = new Vis(indexPattern);
+      expect(vis.isHierarchical()).to.be(false);
+    });
+  });
+
+});
diff --git a/src/ui/public/Vis/__tests__/index.js b/src/ui/public/Vis/__tests__/index.js
new file mode 100644
index 0000000000000..29e39f1ce3651
--- /dev/null
+++ b/src/ui/public/Vis/__tests__/index.js
@@ -0,0 +1,6 @@
+describe('Vis Component', function () {
+  require('./_AggConfig');
+  require('./_AggConfigResult');
+  require('./_AggConfigs');
+  require('./_Vis');
+});
diff --git a/src/ui/public/agg_response/geo_json/__tests__/geo_json.js b/src/ui/public/agg_response/geo_json/__tests__/geo_json.js
new file mode 100644
index 0000000000000..f4ad5d637e614
--- /dev/null
+++ b/src/ui/public/agg_response/geo_json/__tests__/geo_json.js
@@ -0,0 +1,179 @@
+
+var _ = require('lodash');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+describe('GeoJson Agg Response Converter', function () {
+  var vis;
+  var tabify;
+  var convert;
+  var esResponse;
+  var aggs;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    var Vis = Private(require('ui/Vis'));
+    var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+
+    esResponse = Private(require('fixtures/agg_resp/geohash_grid'));
+    tabify = Private(require('ui/agg_response/tabify/tabify'));
+    convert = Private(require('ui/agg_response/geo_json/geo_json'));
+
+    vis = new Vis(indexPattern, {
+      type: 'tile_map',
+      aggs: [
+        { schema: 'metric', type: 'avg', params: { field: 'bytes' } },
+        { schema: 'split', type: 'terms', params: { field: '@tags' } },
+        { schema: 'segment', type: 'geohash_grid', params: { field: 'geo.coordinates', precision: 3 } }
+      ],
+      params: {
+        isDesaturated: true,
+        mapType: 'Scaled%20Circle%20Markers'
+      }
+    });
+
+    aggs = {
+      metric: vis.aggs[0],
+      split: vis.aggs[1],
+      geo: vis.aggs[2]
+    };
+  }));
+
+  [ { asAggConfigResults: true }, { asAggConfigResults: false } ].forEach(function (tableOpts) {
+
+    function makeTable() {
+      return _.sample(_.sample(tabify(vis, esResponse, tableOpts).tables).tables);
+    }
+
+    function makeSingleChart(table) {
+      return convert(vis, table || makeTable(), tableOpts);
+    }
+
+    function makeGeoJson() {
+      return makeSingleChart().geoJson;
+    }
+
+    describe('with table ' + JSON.stringify(tableOpts), function () {
+      it('outputs a chart', function () {
+        var table = makeTable();
+        var chart = makeSingleChart(table);
+        expect(chart).to.only.have.keys(
+          'title',
+          'tooltipFormatter',
+          'valueFormatter',
+          'geohashGridAgg',
+          'geoJson'
+        );
+
+        expect(chart.title).to.be(table.title());
+        expect(chart.tooltipFormatter).to.be.a('function');
+        expect(chart.valueFormatter).to.be(aggs.metric.fieldFormatter());
+        expect(chart.geohashGridAgg).to.be(aggs.geo);
+        expect(chart.geoJson).to.be.an('object');
+      });
+
+      it('outputs geohash points as features in a feature collection', function () {
+        var table = makeTable();
+        var chart = makeSingleChart(table);
+        var geoJson = chart.geoJson;
+
+        expect(geoJson.type).to.be('FeatureCollection');
+        expect(geoJson.features).to.be.an('array');
+        expect(geoJson.features).to.have.length(table.rows.length);
+      });
+
+      it('exports a bunch of properties about the geo hash grid', function () {
+        var geoJson = makeGeoJson();
+        var props = geoJson.properties;
+
+        // props
+        expect(props).to.be.an('object');
+        expect(props).to.have.keys('min', 'max');
+
+        // props.min
+        expect(props.min).to.be.a('number');
+        expect(props.min).to.be.greaterThan(0);
+
+        // props.max
+        expect(props.max).to.be.a('number');
+        expect(props.max).to.be.greaterThan(0);
+      });
+
+      describe('properties', function () {
+        describe('includes one feature per row in the table', function () {
+          this.timeout(60000);
+
+          var table;
+          var chart;
+          var geoColI;
+          var metricColI;
+
+          before(function () {
+            table = makeTable();
+            chart = makeSingleChart(table);
+            geoColI = _.findIndex(table.columns, { aggConfig: aggs.geo });
+            metricColI = _.findIndex(table.columns, { aggConfig: aggs.metric });
+          });
+
+          it('should be geoJson format', function () {
+            table.rows.forEach(function (row, i) {
+              var feature = chart.geoJson.features[i];
+              expect(feature).to.have.property('geometry');
+              expect(feature.geometry).to.be.an('object');
+              expect(feature).to.have.property('properties');
+              expect(feature.properties).to.be.an('object');
+            });
+          });
+
+          it('should have valid geometry data', function () {
+            table.rows.forEach(function (row, i) {
+              var geometry = chart.geoJson.features[i].geometry;
+              expect(geometry.type).to.be('Point');
+              expect(geometry).to.have.property('coordinates');
+              expect(geometry.coordinates).to.be.an('array');
+              expect(geometry.coordinates).to.have.length(2);
+              expect(geometry.coordinates[0]).to.be.a('number');
+              expect(geometry.coordinates[1]).to.be.a('number');
+            });
+          });
+
+          it('should have value properties data', function () {
+            table.rows.forEach(function (row, i) {
+              var props = chart.geoJson.features[i].properties;
+              var keys = ['value', 'geohash', 'aggConfigResult', 'rectangle', 'center'];
+              expect(props).to.be.an('object');
+              expect(props).to.only.have.keys(keys);
+              expect(props.geohash).to.be.a('string');
+              if (props.value != null) expect(props.value).to.be.a('number');
+            });
+          });
+
+          it('should use latLng in properties and lngLat in geometry', function () {
+            table.rows.forEach(function (row, i) {
+              var geometry = chart.geoJson.features[i].geometry;
+              var props = chart.geoJson.features[i].properties;
+              expect(props.center).to.eql(geometry.coordinates.slice(0).reverse());
+            });
+          });
+
+          it('should handle both AggConfig and non-AggConfig results', function () {
+            table.rows.forEach(function (row, i) {
+              var props = chart.geoJson.features[i].properties;
+              if (tableOpts.asAggConfigResults) {
+                expect(props.aggConfigResult).to.be(row[metricColI]);
+                expect(props.value).to.be(row[metricColI].value);
+                expect(props.geohash).to.be(row[geoColI].value);
+              } else {
+                expect(props.aggConfigResult).to.be(null);
+                expect(props.value).to.be(row[metricColI]);
+                expect(props.geohash).to.be(row[geoColI]);
+              }
+            });
+          });
+        });
+      });
+    });
+  });
+
+  describe('geoJson tooltip formatter', function () {});
+});
diff --git a/src/kibana/components/agg_response/geo_json/_tooltip.html b/src/ui/public/agg_response/geo_json/_tooltip.html
similarity index 100%
rename from src/kibana/components/agg_response/geo_json/_tooltip.html
rename to src/ui/public/agg_response/geo_json/_tooltip.html
diff --git a/src/ui/public/agg_response/geo_json/_tooltip_formatter.js b/src/ui/public/agg_response/geo_json/_tooltip_formatter.js
new file mode 100644
index 0000000000000..071fc482298be
--- /dev/null
+++ b/src/ui/public/agg_response/geo_json/_tooltip_formatter.js
@@ -0,0 +1,41 @@
+define(function (require) {
+  return function TileMapTooltipFormatter($compile, $rootScope, Private) {
+    var $ = require('jquery');
+    var _ = require('lodash');
+
+    var fieldFormats = Private(require('ui/registry/field_formats'));
+    var $tooltipScope = $rootScope.$new();
+    var $el = $('<div>').html(require('ui/agg_response/geo_json/_tooltip.html'));
+    $compile($el)($tooltipScope);
+
+    return function tooltipFormatter(feature) {
+      if (!feature) return '';
+
+      var value = feature.properties.value;
+      var acr = feature.properties.aggConfigResult;
+      var vis = acr.aggConfig.vis;
+
+      var metricAgg = acr.aggConfig;
+      var geoFormat = _.get(vis.aggs, 'byTypeName.geohash_grid[0].format');
+      if (!geoFormat) geoFormat = fieldFormats.getDefaultInstance('geo_point');
+
+      $tooltipScope.details = [
+        {
+          label: metricAgg.makeLabel(),
+          value: metricAgg.fieldFormatter()(value)
+        },
+        {
+          label: 'Center',
+          value: geoFormat.convert({
+            lat: feature.geometry.coordinates[1],
+            lon: feature.geometry.coordinates[0]
+          })
+        }
+      ];
+
+      $tooltipScope.$apply();
+
+      return $el.html();
+    };
+  };
+});
diff --git a/src/ui/public/agg_response/geo_json/geo_json.js b/src/ui/public/agg_response/geo_json/geo_json.js
new file mode 100644
index 0000000000000..4b883f13820a5
--- /dev/null
+++ b/src/ui/public/agg_response/geo_json/geo_json.js
@@ -0,0 +1,44 @@
+define(function (require) {
+  return function TileMapConverterFn(Private, timefilter, $compile, $rootScope) {
+    var _ = require('lodash');
+
+    var rowsToFeatures = require('ui/agg_response/geo_json/rowsToFeatures');
+    var tooltipFormatter = Private(require('ui/agg_response/geo_json/_tooltip_formatter'));
+
+    return function (vis, table) {
+
+      function columnIndex(schema) {
+        return _.findIndex(table.columns, function (col) {
+          return col.aggConfig.schema.name === schema;
+        });
+      }
+
+      var geoI = columnIndex('segment');
+      var metricI = columnIndex('metric');
+      var geoAgg = _.get(table.columns, [geoI, 'aggConfig']);
+      var metricAgg = _.get(table.columns, [metricI, 'aggConfig']);
+
+      var features = rowsToFeatures(table, geoI, metricI);
+      var values = features.map(function (feature) {
+        return feature.properties.value;
+      });
+
+      return {
+        title: table.title(),
+        valueFormatter: metricAgg && metricAgg.fieldFormatter(),
+        tooltipFormatter: tooltipFormatter,
+        geohashGridAgg: geoAgg,
+        geoJson: {
+          type: 'FeatureCollection',
+          features: features,
+          properties: {
+            min: _.min(values),
+            max: _.max(values),
+            zoom: _.get(geoAgg, 'params.mapZoom'),
+            center: _.get(geoAgg, 'params.mapCenter')
+          }
+        }
+      };
+    };
+  };
+});
diff --git a/src/kibana/components/agg_response/geo_json/rowsToFeatures.js b/src/ui/public/agg_response/geo_json/rowsToFeatures.js
similarity index 92%
rename from src/kibana/components/agg_response/geo_json/rowsToFeatures.js
rename to src/ui/public/agg_response/geo_json/rowsToFeatures.js
index e0189aaa99cff..5ce58a6ddbece 100644
--- a/src/kibana/components/agg_response/geo_json/rowsToFeatures.js
+++ b/src/ui/public/agg_response/geo_json/rowsToFeatures.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var decodeGeoHash = require('utils/decode_geo_hash');
-  var AggConfigResult = require('components/vis/AggConfigResult');
+  var decodeGeoHash = require('ui/utils/decode_geo_hash');
+  var AggConfigResult = require('ui/Vis/AggConfigResult');
   var _ = require('lodash');
 
   function getAcr(val) {
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/array_to_linked_list.js b/src/ui/public/agg_response/hierarchical/__tests__/array_to_linked_list.js
new file mode 100644
index 0000000000000..079d2f7bd4595
--- /dev/null
+++ b/src/ui/public/agg_response/hierarchical/__tests__/array_to_linked_list.js
@@ -0,0 +1,27 @@
+
+var arrayToLinkedList = require('ui/agg_response/hierarchical/_array_to_linked_list');
+var expect = require('expect.js');
+describe('buildHierarchicalData()', function () {
+  describe('arrayToLinkedList', function () {
+
+    var results;
+    beforeEach(function () {
+      results = arrayToLinkedList([
+        { id: 1 },
+        { id: 2 },
+        { id: 3 }
+      ]);
+    });
+
+    it('should set the next element', function () {
+      expect(results[0]).to.have.property('_next', results[1]);
+      expect(results[1]).to.have.property('_next', results[2]);
+    });
+
+    it('should set the previous element', function () {
+      expect(results[1]).to.have.property('_previous', results[0]);
+      expect(results[2]).to.have.property('_previous', results[1]);
+    });
+
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js b/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js
new file mode 100644
index 0000000000000..07acbe5bbf2a0
--- /dev/null
+++ b/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js
@@ -0,0 +1,278 @@
+
+var _ = require('lodash');
+var fixtures = require('fixtures/fake_hierarchical_data');
+var sinon = require('auto-release-sinon');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+var Vis;
+var Notifier;
+var AggConfigs;
+var indexPattern;
+var buildHierarchicalData;
+
+describe('buildHierarchicalData()', function () {
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private, $injector) {
+    // stub the error method before requiring vis causes Notifier#error to be bound
+    Notifier = $injector.get('Notifier');
+    sinon.stub(Notifier.prototype, 'error');
+
+    Vis = Private(require('ui/Vis'));
+    AggConfigs = Private(require('ui/Vis/AggConfigs'));
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    buildHierarchicalData = Private(require('ui/agg_response/hierarchical/build_hierarchical_data'));
+  }));
+
+
+  describe('metric only', function () {
+    var vis, results;
+
+    beforeEach(function () {
+      var id = 1;
+      vis = new Vis(indexPattern, {
+        type: 'pie',
+        aggs: [
+          { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
+        ]
+      });
+      vis.aggs[0].id = 'agg_1';
+      results = buildHierarchicalData(vis, fixtures.metricOnly);
+
+    });
+
+    it('should set the slices with one children with the name _all', function () {
+      expect(results).to.have.property('slices');
+      expect(results.slices).to.have.property('children');
+      expect(results.slices.children).to.have.length(1);
+      expect(results.slices.children[0]).to.have.property('name', '_all');
+      expect(results.slices.children[0]).to.have.property('size', 412032);
+      expect(results).to.have.property('names');
+      expect(results.names).to.eql(['_all']);
+      expect(results).to.have.property('raw');
+      expect(results.raw).to.have.property('rows');
+      expect(results.raw.rows).to.have.length(1);
+      expect(results.raw.rows).to.eql([[412032]]);
+    });
+
+  });
+
+  describe('rows and columns', function () {
+
+    it('should set the rows', function () {
+      var id = 1;
+      var vis = new Vis(indexPattern, {
+        type: 'pie',
+        aggs: [
+          { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
+          { type: 'terms', schema: 'split', params: { field: 'extension', row: true }},
+          { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
+          { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
+        ]
+      });
+      // We need to set the aggs to a known value.
+      _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
+      var results = buildHierarchicalData(vis, fixtures.threeTermBuckets);
+      expect(results).to.have.property('rows');
+    });
+
+    it('should set the columns', function () {
+      var id = 1;
+      var vis = new Vis(indexPattern, {
+        type: 'pie',
+        aggs: [
+          { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
+          { type: 'terms', schema: 'split', params: { field: 'extension', row: false }},
+          { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
+          { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
+        ]
+      });
+      // We need to set the aggs to a known value.
+      _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
+      var results = buildHierarchicalData(vis, fixtures.threeTermBuckets);
+      expect(results).to.have.property('columns');
+    });
+
+  });
+
+  describe('threeTermBuckets', function () {
+    var vis, results;
+
+    beforeEach(function () {
+      var id = 1;
+      vis = new Vis(indexPattern, {
+        type: 'pie',
+        aggs: [
+          { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
+          { type: 'terms', schema: 'split', params: { field: 'extension' }},
+          { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
+          { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
+        ]
+      });
+      // We need to set the aggs to a known value.
+      _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
+      results = buildHierarchicalData(vis, fixtures.threeTermBuckets);
+    });
+
+    it('should set the hits attribute for the results', function () {
+      expect(results).to.have.property('rows');
+      _.each(results.rows, function (item) {
+        expect(item).to.have.property('names');
+        expect(item).to.have.property('slices');
+        expect(item.slices).to.have.property('children');
+      });
+      expect(results).to.have.property('raw');
+    });
+
+    it('should set the parent of the first item in the split', function () {
+      expect(results).to.have.property('rows');
+      expect(results.rows).to.have.length(3);
+      expect(results.rows[0]).to.have.property('slices');
+      expect(results.rows[0].slices).to.have.property('children');
+      expect(results.rows[0].slices.children).to.have.length(2);
+      expect(results.rows[0].slices.children[0]).to.have.property('aggConfigResult');
+      expect(results.rows[0].slices.children[0].aggConfigResult.$parent).to.have.property('key', 'png');
+    });
+
+  });
+
+  describe('oneHistogramBucket', function () {
+    var vis, results;
+
+    beforeEach(function () {
+      var id = 1;
+      vis = new Vis(indexPattern, {
+        type: 'pie',
+        aggs: [
+          {
+            type: 'count',
+            schema: 'metric'
+          },
+          { type: 'histogram', schema: 'segment', params: { field: 'bytes', interval: 8192 }}
+        ]
+      });
+      // We need to set the aggs to a known value.
+      _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
+      results = buildHierarchicalData(vis, fixtures.oneHistogramBucket);
+    });
+
+    it('should set the hits attribute for the results', function () {
+      expect(results).to.have.property('slices');
+      expect(results.slices).to.property('children');
+      expect(results).to.have.property('names');
+      expect(results.names).to.have.length(6);
+      expect(results).to.have.property('raw');
+    });
+
+
+  });
+
+  describe('oneRangeBucket', function () {
+    var vis, results;
+
+    beforeEach(function () {
+      var id = 1;
+      vis = new Vis(indexPattern, {
+        type: 'pie',
+        aggs: [
+          {
+            type: 'count',
+            schema: 'metric'
+          },
+          {
+            type: 'range',
+            schema: 'segment',
+            params: {
+              field: 'bytes',
+              ranges: [
+                { from: 0, to: 1000 },
+                { from: 1000, to: 2000 }
+              ]
+            }
+          }
+        ]
+      });
+      // We need to set the aggs to a known value.
+      _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
+      results = buildHierarchicalData(vis, fixtures.oneRangeBucket);
+    });
+
+    it('should set the hits attribute for the results', function () {
+      expect(results).to.have.property('slices');
+      expect(results.slices).to.property('children');
+      expect(results).to.have.property('names');
+      expect(results.names).to.have.length(2);
+      expect(results).to.have.property('raw');
+    });
+
+  });
+
+  describe('oneFilterBucket', function () {
+    var vis, results;
+
+    beforeEach(function () {
+      var id = 1;
+      vis = new Vis(indexPattern, {
+        type: 'pie',
+        aggs: [
+          { type: 'count', schema: 'metric' },
+          { type: 'filters', schema: 'segment', params: {
+              filters: [
+                { input: { query: { query_string: { query: '_type:apache' } } } },
+                { input: { query: { query_string: { query: '_type:nginx' } } } }
+              ]
+            }
+          }
+        ]
+      });
+      // We need to set the aggs to a known value.
+      _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
+      results = buildHierarchicalData(vis, fixtures.oneFilterBucket);
+    });
+
+    it('should set the hits attribute for the results', function () {
+      expect(results).to.have.property('slices');
+      expect(results).to.have.property('names');
+      expect(results.names).to.have.length(2);
+      expect(results).to.have.property('raw');
+    });
+
+  });
+
+  describe('oneFilterBucket that is a split', function () {
+    var vis, results;
+
+    beforeEach(function () {
+      var id = 1;
+      vis = new Vis(indexPattern, {
+        type: 'pie',
+        aggs: [
+          { type: 'count', schema: 'metric' },
+          { type: 'filters', schema: 'split', params: {
+              filters: [
+                { input: { query: { query_string: { query: '_type:apache' } } } },
+                { input: { query: { query_string: { query: '_type:nginx' } } } }
+              ]
+            }
+          }
+        ]
+      });
+      // We need to set the aggs to a known value.
+      _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
+      results = buildHierarchicalData(vis, fixtures.oneFilterBucket);
+    });
+
+    it('should set the hits attribute for the results', function () {
+      var errCall = Notifier.prototype.error.getCall(0);
+      expect(errCall).to.be.ok();
+      expect(errCall.args[0]).to.contain('not supported');
+
+      expect(results).to.have.property('slices');
+      expect(results).to.have.property('names');
+      expect(results.names).to.have.length(2);
+      expect(results).to.have.property('raw');
+    });
+  });
+
+});
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/collect_branch.js b/src/ui/public/agg_response/hierarchical/__tests__/collect_branch.js
new file mode 100644
index 0000000000000..d0280b034ffb7
--- /dev/null
+++ b/src/ui/public/agg_response/hierarchical/__tests__/collect_branch.js
@@ -0,0 +1,57 @@
+
+var _ = require('lodash');
+var collectBranch = require('ui/agg_response/hierarchical/_collect_branch');
+var expect = require('expect.js');
+describe('collectBranch()', function () {
+  var results;
+  var convert = function (name) {
+    return 'converted:' + name;
+  };
+
+  beforeEach(function () {
+    results = collectBranch({
+      name: 'bucket3',
+      depth: 3,
+      size: 6,
+      field: { format: { convert: convert } },
+      aggConfig: { params: { field: { displayName: 'field3' } }, fieldFormatter: _.constant(String) },
+      parent: {
+        name: 'bucket2',
+        depth: 2,
+        size: 12,
+        aggConfig: { label: 'field2', fieldFormatter: _.constant(String) },
+        parent: {
+          name: 'bucket1',
+          depth: 1,
+          size: 24,
+          parent: {}
+        }
+      }
+    });
+  });
+
+  it('should return an array with bucket objects', function () {
+    expect(results).to.be.an(Array);
+    expect(results).to.have.length(3);
+
+    expect(results[0]).to.have.property('metric', 24);
+    expect(results[0]).to.have.property('depth', 0);
+    expect(results[0]).to.have.property('bucket', 'bucket1');
+    expect(results[0]).to.have.property('field', 'level 1');
+    expect(results[0]).to.have.property('aggConfig');
+
+    expect(results[1]).to.have.property('metric', 12);
+    expect(results[1]).to.have.property('depth', 1);
+    expect(results[1]).to.have.property('bucket', 'bucket2');
+    expect(results[1]).to.have.property('field', 'field2');
+    expect(results[1]).to.have.property('aggConfig');
+
+    expect(results[2]).to.have.property('metric', 6);
+    expect(results[2]).to.have.property('depth', 2);
+    expect(results[2]).to.have.property('bucket', 'bucket3');
+    expect(results[2]).to.have.property('field', 'field3');
+    expect(results[2]).to.have.property('aggConfig');
+
+  });
+
+});
\ No newline at end of file
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js b/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js
new file mode 100644
index 0000000000000..49f542f90ddf7
--- /dev/null
+++ b/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js
@@ -0,0 +1,81 @@
+
+var _ = require('lodash');
+var fixtures = require('fixtures/fake_hierarchical_data');
+var createRawData = require('ui/agg_response/hierarchical/_create_raw_data');
+var arrayToLinkedList = require('ui/agg_response/hierarchical/_array_to_linked_list');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+var AggConfigs;
+var Vis;
+var indexPattern;
+
+describe('buildHierarchicalData()', function () {
+  describe('createRawData()', function () {
+    var vis, results;
+
+    beforeEach(ngMock.module('kibana'));
+
+    beforeEach(ngMock.inject(function (Private) {
+      Vis = Private(require('ui/Vis'));
+      AggConfigs = Private(require('ui/Vis/AggConfigs'));
+      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    }));
+
+    beforeEach(function () {
+      var id = 1;
+      vis = new Vis(indexPattern, {
+        type: 'pie',
+        aggs: [
+          { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
+          { type: 'terms', schema: 'split', params: { field: 'extension' }},
+          { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
+          { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
+        ]
+      });
+      var buckets = arrayToLinkedList(vis.aggs.bySchemaGroup.buckets);
+      // We need to set the aggs to a known value.
+      _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
+      results = createRawData(vis, fixtures.threeTermBuckets);
+    });
+
+    it('should have columns set', function () {
+      expect(results).to.have.property('columns');
+      expect(results.columns).to.have.length(6);
+      _.each(results.columns, function (column) {
+        expect(column).to.have.property('aggConfig');
+        var agg = column.aggConfig;
+        expect(column).to.have.property('categoryName', agg.schema.name);
+        expect(column).to.have.property('id', agg.id);
+        expect(column).to.have.property('aggType', agg.type);
+        expect(column).to.have.property('field', agg.params.field);
+        expect(column).to.have.property('label', agg.type.makeLabel(agg));
+      });
+      expect(results.columns[0].aggConfig.id).to.be('agg_2');
+      expect(results.columns[1].aggConfig.id).to.be('agg_1');
+      expect(results.columns[2].aggConfig.id).to.be('agg_3');
+      expect(results.columns[3].aggConfig.id).to.be('agg_1');
+      expect(results.columns[4].aggConfig.id).to.be('agg_4');
+      expect(results.columns[5].aggConfig.id).to.be('agg_1');
+    });
+
+    it('should have rows set', function () {
+      expect(results).to.have.property('rows');
+      expect(results.rows).to.eql([
+        ['png', 412032, 'IT', 9299, 'win', 0],
+        ['png', 412032, 'IT', 9299, 'mac', 9299],
+        ['png', 412032, 'US', 8293, 'linux', 3992],
+        ['png', 412032, 'US', 8293, 'mac', 3029],
+        ['css', 412032, 'MX', 9299, 'win', 4992],
+        ['css', 412032, 'MX', 9299, 'mac', 5892],
+        ['css', 412032, 'US', 8293, 'linux', 3992],
+        ['css', 412032, 'US', 8293, 'mac', 3029],
+        ['html', 412032, 'CN', 9299, 'win', 4992],
+        ['html', 412032, 'CN', 9299, 'mac', 5892],
+        ['html', 412032, 'FR', 8293, 'win', 3992],
+        ['html', 412032, 'FR', 8293, 'mac', 3029]
+      ]);
+    });
+
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/extract_buckets.js b/src/ui/public/agg_response/hierarchical/__tests__/extract_buckets.js
new file mode 100644
index 0000000000000..07631c4c0ac58
--- /dev/null
+++ b/src/ui/public/agg_response/hierarchical/__tests__/extract_buckets.js
@@ -0,0 +1,45 @@
+
+var extractBuckets = require('ui/agg_response/hierarchical/_extract_buckets');
+var expect = require('expect.js');
+
+describe('buildHierarchicalData()', function () {
+  describe('extractBuckets()', function () {
+
+    it('should normalize a bucket object into an array', function () {
+
+      var bucket = {
+        buckets: {
+          foo: { doc_count: 1 },
+          bar: { doc_count: 2 }
+        }
+      };
+
+      var buckets = extractBuckets(bucket);
+      expect(buckets).to.be.an(Array);
+      expect(buckets).to.have.length(2);
+      expect(buckets[0]).to.have.property('key', 'foo');
+      expect(buckets[0]).to.have.property('doc_count', 1);
+      expect(buckets[1]).to.have.property('key', 'bar');
+      expect(buckets[1]).to.have.property('doc_count', 2);
+    });
+
+    it('should return an empty array for undefined buckets', function () {
+      var buckets = extractBuckets();
+      expect(buckets).to.be.an(Array);
+      expect(buckets).to.have.length(0);
+    });
+
+    it('should return the bucket array', function () {
+      var bucket =  {
+        buckets: [
+          { key: 'foo', doc_count: 1 },
+          { key: 'bar', doc_count: 2 }
+        ]
+      };
+      var buckets = extractBuckets(bucket);
+      expect(buckets).to.be.an(Array);
+      expect(buckets).to.be(bucket.buckets);
+    });
+
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js b/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js
new file mode 100644
index 0000000000000..b47e01ea51da6
--- /dev/null
+++ b/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js
@@ -0,0 +1,96 @@
+
+describe('buildHierarchicalData()', function () {
+  describe('transformAggregation()', function () {
+    var _ = require('lodash');
+    var expect = require('expect.js');
+    var ngMock = require('ngMock');
+    var transform;
+    var fixture;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      transform = Private(require('ui/agg_response/hierarchical/_transform_aggregation'));
+    }));
+
+    beforeEach(function () {
+
+      function fakeAgg(id, name) {
+        return {
+          id: id,
+          name: name,
+          schema: { group: 'buckets' },
+          getKey: _.noop,
+          fieldFormatter: _.constant(String)
+        };
+      }
+
+      fixture = {};
+      fixture.agg = fakeAgg('agg_2', 'test');
+      fixture.agg._next = fakeAgg('agg_3', 'example');
+
+      fixture.metric = fakeAgg('agg_1', 'metric');
+      fixture.metric.getValue = function (b) { return _.has(b, this.id) ? b[this.id] : b.doc_count; };
+
+      fixture.aggData = {
+        buckets: [
+          { key: 'foo', doc_count: 2, agg_3: { buckets: [ { key: 'win', doc_count: 1 }, { key: 'mac', doc_count: 1 }]}},
+          { key: 'bar', doc_count: 4, agg_3: {  buckets: [ { key: 'win', doc_count: 2 }, { key: 'mac', doc_count: 2 }]}}
+        ]
+      };
+
+    });
+
+    it('relies on metricAgg#getValue() for the size of the children', function () {
+      var aggData = {
+        buckets: [
+          { key: 'foo' },
+          { key: 'bar' }
+        ]
+      };
+
+      var football = {};
+      fixture.metric.getValue = _.constant(football);
+
+      var children = transform(fixture.agg, fixture.metric, aggData);
+      expect(children).to.be.an(Array);
+      expect(children).to.have.length(2);
+      expect(children[0]).to.have.property('size', football);
+      expect(children[1]).to.have.property('size', football);
+    });
+
+    it('should create two levels of metrics', function () {
+      var children = transform(fixture.agg, fixture.metric, fixture.aggData);
+      fixture.metric.getValue = function (b) { return b.doc_count; };
+
+      expect(children).to.be.an(Array);
+      expect(children).to.have.length(2);
+      expect(children[0]).to.have.property('children');
+      expect(children[1]).to.have.property('children');
+      expect(children[0]).to.have.property('aggConfig', fixture.agg);
+      expect(children[1]).to.have.property('aggConfig', fixture.agg);
+      expect(children[0].children).to.have.length(2);
+      expect(children[1].children).to.have.length(2);
+      expect(children[0]).to.have.property('name', 'foo');
+      expect(children[0]).to.have.property('size', 2);
+      expect(children[1]).to.have.property('name', 'bar');
+      expect(children[1]).to.have.property('size', 4);
+      expect(children[0].children[0]).to.have.property('size', 1);
+      expect(children[0].children[0]).to.have.property('aggConfig', fixture.agg.agg_3);
+      expect(children[0].children[0]).to.have.property('name', 'win');
+      expect(children[0].children[1]).to.have.property('size', 1);
+      expect(children[0].children[1]).to.have.property('parent', children[0]);
+      expect(children[0].children[1]).to.have.property('aggConfig', fixture.agg.agg_3);
+      expect(children[0].children[1]).to.have.property('name', 'mac');
+      expect(children[1].children[0]).to.have.property('size', 2);
+      expect(children[0].children[1]).to.have.property('parent', children[0]);
+      expect(children[1].children[0]).to.have.property('aggConfig', fixture.agg.agg_3);
+      expect(children[1].children[0]).to.have.property('name', 'win');
+      expect(children[1].children[1]).to.have.property('size', 2);
+      expect(children[1].children[1]).to.have.property('parent', children[1]);
+      expect(children[1].children[1]).to.have.property('aggConfig', fixture.agg.agg_3);
+      expect(children[1].children[1]).to.have.property('name', 'mac');
+      expect(children[1].children[1]).to.have.property('parent', children[1]);
+    });
+
+  });
+});
\ No newline at end of file
diff --git a/src/kibana/components/agg_response/hierarchical/_array_to_linked_list.js b/src/ui/public/agg_response/hierarchical/_array_to_linked_list.js
similarity index 100%
rename from src/kibana/components/agg_response/hierarchical/_array_to_linked_list.js
rename to src/ui/public/agg_response/hierarchical/_array_to_linked_list.js
diff --git a/src/ui/public/agg_response/hierarchical/_build_split.js b/src/ui/public/agg_response/hierarchical/_build_split.js
new file mode 100644
index 0000000000000..7c6bacc9c5f7f
--- /dev/null
+++ b/src/ui/public/agg_response/hierarchical/_build_split.js
@@ -0,0 +1,17 @@
+define(function (require) {
+  return function biuldSplitProvider(Private) {
+    var transformer = Private(require('ui/agg_response/hierarchical/_transform_aggregation'));
+    var collectKeys = require('ui/agg_response/hierarchical/_collect_keys');
+    return function (agg, metric, aggData) {
+      // Ceate the split structure
+      var split = { label: '', slices: { children: [] } };
+
+      // Transform the aggData into splits
+      split.slices.children = transformer(agg, metric, aggData);
+
+      // Collect all the keys
+      split.names = collectKeys(split.slices.children);
+      return split;
+    };
+  };
+});
diff --git a/src/kibana/components/agg_response/hierarchical/_collect_branch.js b/src/ui/public/agg_response/hierarchical/_collect_branch.js
similarity index 100%
rename from src/kibana/components/agg_response/hierarchical/_collect_branch.js
rename to src/ui/public/agg_response/hierarchical/_collect_branch.js
diff --git a/src/kibana/components/agg_response/hierarchical/_collect_keys.js b/src/ui/public/agg_response/hierarchical/_collect_keys.js
similarity index 100%
rename from src/kibana/components/agg_response/hierarchical/_collect_keys.js
rename to src/ui/public/agg_response/hierarchical/_collect_keys.js
diff --git a/src/kibana/components/agg_response/hierarchical/_create_raw_data.js b/src/ui/public/agg_response/hierarchical/_create_raw_data.js
similarity index 96%
rename from src/kibana/components/agg_response/hierarchical/_create_raw_data.js
rename to src/ui/public/agg_response/hierarchical/_create_raw_data.js
index 3f035b1a2d12b..ba4478c13c460 100644
--- a/src/kibana/components/agg_response/hierarchical/_create_raw_data.js
+++ b/src/ui/public/agg_response/hierarchical/_create_raw_data.js
@@ -1,6 +1,6 @@
 define(function (require) {
   var _ = require('lodash');
-  var extractBuckets = require('components/agg_response/hierarchical/_extract_buckets');
+  var extractBuckets = require('ui/agg_response/hierarchical/_extract_buckets');
   return function (vis, resp) {
 
     // Create the initial results structure
diff --git a/src/kibana/components/agg_response/hierarchical/_extract_buckets.js b/src/ui/public/agg_response/hierarchical/_extract_buckets.js
similarity index 100%
rename from src/kibana/components/agg_response/hierarchical/_extract_buckets.js
rename to src/ui/public/agg_response/hierarchical/_extract_buckets.js
diff --git a/src/kibana/components/agg_response/hierarchical/_hierarchical_tooltip_formatter.js b/src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js
similarity index 87%
rename from src/kibana/components/agg_response/hierarchical/_hierarchical_tooltip_formatter.js
rename to src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js
index b61c3a84f2092..bfae524ebf840 100644
--- a/src/kibana/components/agg_response/hierarchical/_hierarchical_tooltip_formatter.js
+++ b/src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js
@@ -2,8 +2,8 @@ define(function (require) {
   return function HierarchicalTooltipFormaterProvider($rootScope, $compile, $sce) {
     var _ = require('lodash');
     var $ = require('jquery');
-    var $tooltip = $(require('text!components/agg_response/hierarchical/_tooltip.html'));
-    var collectBranch = require('components/agg_response/hierarchical/_collect_branch');
+    var $tooltip = $(require('ui/agg_response/hierarchical/_tooltip.html'));
+    var collectBranch = require('ui/agg_response/hierarchical/_collect_branch');
     var $tooltipScope = $rootScope.$new();
     var numeral = require('numeral');
 
diff --git a/src/kibana/components/agg_response/hierarchical/_tooltip.html b/src/ui/public/agg_response/hierarchical/_tooltip.html
similarity index 100%
rename from src/kibana/components/agg_response/hierarchical/_tooltip.html
rename to src/ui/public/agg_response/hierarchical/_tooltip.html
diff --git a/src/kibana/components/agg_response/hierarchical/_transform_aggregation.js b/src/ui/public/agg_response/hierarchical/_transform_aggregation.js
similarity index 89%
rename from src/kibana/components/agg_response/hierarchical/_transform_aggregation.js
rename to src/ui/public/agg_response/hierarchical/_transform_aggregation.js
index 03d9aa5213bbe..ee166a6f36f52 100644
--- a/src/kibana/components/agg_response/hierarchical/_transform_aggregation.js
+++ b/src/ui/public/agg_response/hierarchical/_transform_aggregation.js
@@ -1,8 +1,8 @@
 define(function (require) {
   var _ = require('lodash');
-  var extractBuckets = require('components/agg_response/hierarchical/_extract_buckets');
+  var extractBuckets = require('ui/agg_response/hierarchical/_extract_buckets');
   return function transformAggregationProvider(Private) {
-    var AggConfigResult = require('components/vis/AggConfigResult');
+    var AggConfigResult = require('ui/Vis/AggConfigResult');
     return function transformAggregation(agg, metric, aggData, parent) {
       return _.map(extractBuckets(aggData), function (bucket) {
         var aggConfigResult = new AggConfigResult(
diff --git a/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js b/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js
new file mode 100644
index 0000000000000..3ba63852008fe
--- /dev/null
+++ b/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js
@@ -0,0 +1,96 @@
+define(function (require) {
+  return function buildHierarchicalDataProvider(Private, Notifier) {
+    var _ = require('lodash');
+    var buildSplit = Private(require('ui/agg_response/hierarchical/_build_split'));
+    var extractBuckets = require('ui/agg_response/hierarchical/_extract_buckets');
+    var createRawData = require('ui/agg_response/hierarchical/_create_raw_data');
+    var arrayToLinkedList = require('ui/agg_response/hierarchical/_array_to_linked_list');
+    var tooltipFormatter = Private(require('ui/agg_response/hierarchical/_hierarchical_tooltip_formatter'));
+
+    var AggConfigResult = require('ui/Vis/AggConfigResult');
+
+    var notify = new Notifier({
+      location: 'Pie chart response converter'
+    });
+
+    return function (vis, resp) {
+      // Create a refrenece to the buckets
+      var buckets = vis.aggs.bySchemaGroup.buckets;
+
+
+      // Find the metric so it's easier to reference.
+      // TODO: Change this to support multiple metrics.
+      var metric = vis.aggs.bySchemaGroup.metrics[0];
+
+      // Link each agg to the next agg. This will be
+      // to identify the next bucket aggregation
+      buckets = arrayToLinkedList(buckets);
+
+      // Create the raw data to be used in the spy panel
+      var raw = createRawData(vis, resp);
+
+      // If buckets is falsy then we should just return the aggs
+      if (!buckets) {
+        var value = resp.aggregations
+          && resp.aggregations[metric.id]
+          && resp.aggregations[metric.id].value
+          || resp.hits.total;
+        return {
+          hits: resp.hits.total,
+          raw: raw,
+          names: ['_all'],
+          tooltipFormatter: tooltipFormatter(raw.columns),
+          slices: {
+            children: [
+              { name: '_all', size: value }
+            ]
+          }
+        };
+      }
+
+      var firstAgg = buckets[0];
+      var aggData = resp.aggregations[firstAgg.id];
+
+      if (!firstAgg._next && firstAgg.schema.name === 'split') {
+        notify.error('Splitting charts without splitting slices is not supported. Pretending that we are just splitting slices.');
+      }
+
+      // start with splitting slices
+      if (!firstAgg._next || firstAgg.schema.name === 'segment') {
+        var split = buildSplit(firstAgg, metric, aggData);
+        split.hits = resp.hits.total;
+        split.raw = raw;
+        split.tooltipFormatter = tooltipFormatter(raw.columns);
+        return split;
+      }
+
+      // map the split aggregations into rows.
+      var rows = _.map(extractBuckets(aggData), function (bucket) {
+        var agg = firstAgg._next;
+        var split = buildSplit(agg, metric, bucket[agg.id]);
+        // Since splits display labels we need to set it.
+        split.label = firstAgg.fieldFormatter()(bucket.key);
+
+        var displayName = firstAgg.fieldDisplayName();
+        if (!_.isEmpty(displayName)) split.label += ': ' + displayName;
+
+        split.tooltipFormatter = tooltipFormatter(raw.columns);
+        var aggConfigResult = new AggConfigResult(firstAgg, null, null, firstAgg.getKey(bucket));
+        split.split = { aggConfig: firstAgg, aggConfigResult: aggConfigResult, key: bucket.key };
+        _.each(split.slices.children, function (child) {
+          child.aggConfigResult.$parent = aggConfigResult;
+        });
+        return split;
+      });
+
+      var result = { hits: resp.hits.total, raw: raw };
+      if (firstAgg.params.row) {
+        result.rows = rows;
+      } else {
+        result.columns = rows;
+      }
+
+      return result;
+    };
+  };
+});
diff --git a/src/ui/public/agg_response/index.js b/src/ui/public/agg_response/index.js
new file mode 100644
index 0000000000000..1f33e5b43385d
--- /dev/null
+++ b/src/ui/public/agg_response/index.js
@@ -0,0 +1,10 @@
+define(function (require) {
+  return function NormalizeChartDataFactory(Private) {
+    return {
+      hierarchical: Private(require('ui/agg_response/hierarchical/build_hierarchical_data')),
+      pointSeries: Private(require('ui/agg_response/point_series/point_series')),
+      tabify: Private(require('ui/agg_response/tabify/tabify')),
+      geoJson: Private(require('ui/agg_response/geo_json/geo_json'))
+    };
+  };
+});
\ No newline at end of file
diff --git a/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js b/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js
new file mode 100644
index 0000000000000..61ee27681150e
--- /dev/null
+++ b/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js
@@ -0,0 +1,55 @@
+describe('addToSiri', function () {
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+  var addToSiri;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    addToSiri = Private(require('ui/agg_response/point_series/_add_to_siri'));
+  }));
+
+  it('creates a new series the first time it sees an id', function () {
+    var series = {};
+    var point = {};
+    var id = 'id';
+    addToSiri(series, point, id);
+
+    expect(series).to.have.own.property(id);
+    expect(series[id]).to.be.an('object');
+    expect(series[id].label).to.be(id);
+    expect(series[id].values).to.have.length(1);
+    expect(series[id].values[0]).to.be(point);
+  });
+
+  it('adds points to existing series if id has been seen', function () {
+    var series = {};
+    var id = 'id';
+
+    var point = {};
+    addToSiri(series, point, id);
+
+    var point2 = {};
+    addToSiri(series, point2, id);
+
+    expect(series).to.have.own.property(id);
+    expect(series[id]).to.be.an('object');
+    expect(series[id].label).to.be(id);
+    expect(series[id].values).to.have.length(2);
+    expect(series[id].values[0]).to.be(point);
+    expect(series[id].values[1]).to.be(point2);
+  });
+
+  it('allows overriding the series label', function () {
+    var series = {};
+    var id = 'id';
+    var label = 'label';
+    var point = {};
+    addToSiri(series, point, id, label);
+
+    expect(series).to.have.own.property(id);
+    expect(series[id]).to.be.an('object');
+    expect(series[id].label).to.be(label);
+    expect(series[id].values).to.have.length(1);
+    expect(series[id].values[0]).to.be(point);
+  });
+});
diff --git a/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js b/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js
new file mode 100644
index 0000000000000..1f7d8e338cf56
--- /dev/null
+++ b/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js
@@ -0,0 +1,44 @@
+describe('makeFakeXAspect', function () {
+
+  var makeFakeXAspect;
+  var Vis;
+  var AggType;
+  var AggConfig;
+  var indexPattern;
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    Vis = Private(require('ui/Vis'));
+    AggConfig = Private(require('ui/Vis/AggConfig'));
+    AggType = Private(require('ui/agg_types/AggType'));
+    indexPattern = Private(require('ui/Vis'));
+    makeFakeXAspect = Private(require('ui/agg_response/point_series/_fake_x_aspect'));
+  }));
+
+  it('creates an object that looks like an aspect', function () {
+    var vis = new Vis(indexPattern, { type: 'histogram' });
+    var aspect = makeFakeXAspect(vis);
+
+    expect(aspect)
+      .to.have.property('i', -1)
+      .and.have.property('agg')
+      .and.have.property('col');
+
+    expect(aspect.agg)
+      .to.be.an(AggConfig)
+      .and.to.have.property('type');
+
+    expect(aspect.agg.type)
+      .to.be.an(AggType)
+      .and.to.have.property('name', 'all')
+      .and.to.have.property('title', 'All docs')
+      .and.to.have.property('hasNoDsl', true);
+
+    expect(aspect.col)
+      .to.be.an('object')
+      .and.to.have.property('aggConfig', aspect.agg)
+      .and.to.have.property('label', aspect.agg.makeLabel());
+  });
+});
diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js b/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js
new file mode 100644
index 0000000000000..9ac566e0e48bd
--- /dev/null
+++ b/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js
@@ -0,0 +1,151 @@
+describe('getAspects', function () {
+  var _ = require('lodash');
+  var moment = require('moment');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var Vis;
+  var Table;
+  var AggConfig;
+  var indexPattern;
+  var getAspects;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    Vis = Private(require('ui/Vis'));
+    Table = Private(require('ui/agg_response/point_series/_add_to_siri'));
+    AggConfig = Private(require('ui/Vis/AggConfig'));
+    getAspects = Private(require('ui/agg_response/point_series/_get_aspects'));
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+  }));
+
+  var vis;
+  var table;
+
+  var date = _.memoize(function (n) {
+    return moment().startOf('day').add(n, 'hour').valueOf();
+  });
+
+  function filterByIndex(map) {
+    return function (arr) {
+      return arr.filter(function (val, i) {
+        return map[i];
+      });
+    };
+  }
+
+  function validate(aspect, i) {
+    expect(i).to.be.a('number');
+    expect(aspect)
+      .to.be.an('object')
+      .and.have.property('i', i)
+      .and.have.property('agg', vis.aggs[i])
+      .and.have.property('col', table.columns[i]);
+  }
+
+  function init(group, x, y) {
+    // map args to indicies that should be removed
+    var filter = filterByIndex([
+      x > 0,
+      x > 1,
+      group > 0,
+      group > 1,
+      y > 0,
+      y > 1
+    ]);
+
+    vis = new Vis(indexPattern, {
+      type: 'histogram',
+      aggs: [
+        { type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
+        { type: 'date_histogram', schema: 'segment', params: { field: 'utc_time' } },
+        { type: 'terms', schema: 'group', params: { field: 'extension' } },
+        { type: 'terms', schema: 'group', params: { field: 'geo.src' } },
+        { type: 'count', schema: 'metric' },
+        { type: 'avg', schema: 'metric', params: { field: 'bytes' } }
+      ]
+    });
+
+    table = {
+      columns: filter([
+        { aggConfig: vis.aggs[0] }, // date
+        { aggConfig: vis.aggs[1] }, // date
+        { aggConfig: vis.aggs[2] }, // extension
+        { aggConfig: vis.aggs[3] }, // extension
+        { aggConfig: vis.aggs[4] }, // count
+        { aggConfig: vis.aggs[5] }  // avg
+      ]),
+      rows: [
+        [ date(0), date(6), 'html', 'CN', 50, 50 ],
+        [ date(0), date(7), 'css', 'CN', 100, 25 ],
+        [ date(1), date(8), 'html', 'CN', 60, 50 ],
+        [ date(1), date(9), 'css', 'CN', 120, 25 ],
+        [ date(2), date(10), 'html', 'CN', 70, 50 ],
+        [ date(2), date(11), 'css', 'CN', 140, 25 ],
+        [ date(3), date(12), 'html', 'CN', 80, 50 ],
+        [ date(3), date(13), 'css', 'CN', 160, 25 ]
+      ].map(filter)
+    };
+
+    var aggs = vis.aggs.splice(0, vis.aggs.length);
+    filter(aggs).forEach(function (filter) {
+      vis.aggs.push(filter);
+    });
+  }
+
+  it('produces an aspect object for each of the aspect types found in the columns', function () {
+    init(1, 1, 1);
+
+    var aspects = getAspects(vis, table);
+    validate(aspects.x, 0);
+    validate(aspects.series, 1);
+    validate(aspects.y, 2);
+  });
+
+  it('uses arrays only when there are more than one aspect of a specific type', function () {
+    init(0, 1, 2);
+
+    var aspects = getAspects(vis, table);
+
+    validate(aspects.x, 0);
+    expect(aspects.series == null).to.be(true);
+
+    expect(aspects.y).to.be.an('array').and.have.length(2);
+    expect(aspects.y[0], 1);
+    expect(aspects.y[1], 2);
+  });
+
+  it('throws an error if there are multiple x aspects', function () {
+    init(0, 2, 1);
+
+    expect(function () {
+      getAspects(vis, table);
+    }).to.throwError(TypeError);
+  });
+
+  it('throws an error if there are multiple series aspects', function () {
+    init(2, 1, 1);
+
+    expect(function () {
+      getAspects(vis, table);
+    }).to.throwError(TypeError);
+  });
+
+  it('creates a fake x aspect if the column does not exist', function () {
+    init(0, 0, 1);
+
+    var aspects = getAspects(vis, table);
+
+    expect(aspects.x)
+      .to.be.an('object')
+      .and.have.property('i', -1)
+      .and.have.property('agg')
+      .and.have.property('col');
+
+    expect(aspects.x.agg).to.be.an(AggConfig);
+    expect(aspects.x.col)
+      .to.be.an('object')
+      .and.to.have.property('aggConfig', aspects.x.agg);
+
+  });
+});
diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_point.js b/src/ui/public/agg_response/point_series/__tests__/_get_point.js
new file mode 100644
index 0000000000000..27a81a9555745
--- /dev/null
+++ b/src/ui/public/agg_response/point_series/__tests__/_get_point.js
@@ -0,0 +1,74 @@
+
+describe('getPoint', function () {
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var getPoint;
+
+  var truthFormatted = { fieldFormatter: _.constant(_.constant(true)) };
+  var identFormatted = { fieldFormatter: _.constant(_.identity) };
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    getPoint = Private(require('ui/agg_response/point_series/_get_point'));
+  }));
+
+  it('properly unwraps and scales values without a series', function () {
+    var row = [ { value: 1 }, { value: 2 }, { value: 3 } ];
+    var xAspect = { i: 0 };
+    var seriesAspect = null;
+    var yScale = 5;
+    var yAspect = { i: 1 };
+    var zAspect = { i: 2 };
+    var point = getPoint(xAspect, seriesAspect, yScale, row, yAspect, zAspect);
+
+    expect(point)
+      .to.have.property('x', 1)
+      .and.have.property('y', 10)
+      .and.have.property('z', 3)
+      .and.have.property('aggConfigResult', row[1])
+      .and.not.have.property('series');
+  });
+
+  it('properly unwraps and scales values with a series', function () {
+    var row = [ { value: 1 }, { value: 2 }, { value: 3 }];
+    var xAspect = { i: 0 };
+    var seriesAspect = { i: 1, agg: identFormatted };
+    var yScale = null;
+    var yAspect = { i: 2 };
+    var point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
+
+    expect(point)
+      .to.have.property('x', 1)
+      .and.have.property('series', 2)
+      .and.have.property('y', 3)
+      .and.have.property('aggConfigResult', row[2]);
+  });
+
+  it('properly formats series values', function () {
+    var row = [ { value: 1 }, { value: 2 }, { value: 3 } ];
+    var xAspect = { i: 0 };
+    var seriesAspect = { i: 1, agg: truthFormatted };
+    var yScale = null;
+    var yAspect = { i: 2 };
+    var point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
+
+    expect(point)
+      .to.have.property('x', 1)
+      .and.have.property('series', true)
+      .and.have.property('y', 3)
+      .and.have.property('aggConfigResult', row[2]);
+  });
+
+  it('ignores points with a y value of NaN', function () {
+    var row = [ { value: 1 }, { value: 'NaN' }];
+    var xAspect = { i: 0 };
+    var seriesAspect = null;
+    var yScale = 5;
+    var yAspect = { i: 1 };
+    var point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
+    expect(point).to.be(void 0);
+  });
+
+});
diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_series.js b/src/ui/public/agg_response/point_series/__tests__/_get_series.js
new file mode 100644
index 0000000000000..c7c0bf6a2c05e
--- /dev/null
+++ b/src/ui/public/agg_response/point_series/__tests__/_get_series.js
@@ -0,0 +1,238 @@
+describe('getSeries', function () {
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+  var getSeries;
+
+  var agg = { fieldFormatter: _.constant(_.identity) };
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    getSeries = Private(require('ui/agg_response/point_series/_get_series'));
+  }));
+
+  function wrapRows(row) {
+    return row.map(function (v) {
+      return { value: v };
+    });
+  }
+
+  it('produces a single series with points for each row', function () {
+    var rows = [
+      [1, 2, 3],
+      [1, 2, 3],
+      [1, 2, 3],
+      [1, 2, 3],
+      [1, 2, 3]
+    ].map(wrapRows);
+
+    var chart = {
+      aspects: {
+        x: { i: 0 },
+        y: { i: 1 },
+        z: { i: 2 }
+      }
+    };
+
+    var series = getSeries(rows, chart);
+
+    expect(series)
+      .to.be.an('array')
+      .and.to.have.length(1);
+
+    var siri = series[0];
+    expect(siri)
+      .to.be.an('object')
+      .and.have.property('label', '')
+      .and.have.property('values');
+
+    expect(siri.values)
+      .to.be.an('array')
+      .and.have.length(5);
+
+    siri.values.forEach(function (point) {
+      expect(point)
+        .to.have.property('x', 1)
+        .and.property('y', 2)
+        .and.property('z', 3);
+    });
+  });
+
+  it('produces multiple series if there are multiple y aspects', function () {
+    var rows = [
+      [1, 2, 3],
+      [1, 2, 3],
+      [1, 2, 3],
+      [1, 2, 3],
+      [1, 2, 3]
+    ].map(wrapRows);
+
+    var chart = {
+      aspects: {
+        x: { i: 0 },
+        y: [
+          { i: 1, col: { title: '0' }, agg: { id: 1 } },
+          { i: 2, col: { title: '1' }, agg: { id: 2 } },
+        ]
+      }
+    };
+
+    var series = getSeries(rows, chart);
+
+    expect(series)
+      .to.be.an('array')
+      .and.to.have.length(2);
+
+    series.forEach(function (siri, i) {
+      expect(siri)
+        .to.be.an('object')
+        .and.have.property('label', '' + i)
+        .and.have.property('values');
+
+      expect(siri.values)
+        .to.be.an('array')
+        .and.have.length(5);
+
+      siri.values.forEach(function (point) {
+        expect(point)
+          .to.have.property('x', 1)
+          .and.property('y', i + 2);
+      });
+    });
+  });
+
+  it('produces multiple series if there is a series aspect', function () {
+    var rows = [
+      ['0', 3],
+      ['1', 3],
+      ['1', 'NaN'],
+      ['0', 3],
+      ['0', 'NaN'],
+      ['1', 3],
+      ['0', 3],
+      ['1', 3]
+    ].map(wrapRows);
+
+    var chart = {
+      aspects: {
+        x: { i: -1 },
+        series: { i: 0, agg: agg },
+        y: { i: 1, col: { title: '0' } }
+      }
+    };
+
+    var series = getSeries(rows, chart);
+
+    expect(series)
+      .to.be.an('array')
+      .and.to.have.length(2);
+
+    series.forEach(function (siri, i) {
+      expect(siri)
+        .to.be.an('object')
+        .and.have.property('label', '' + i)
+        .and.have.property('values');
+
+      expect(siri.values)
+        .to.be.an('array')
+        .and.have.length(3);
+
+      siri.values.forEach(function (point) {
+        expect(point)
+          .to.have.property('x', '_all')
+          .and.property('y', 3);
+      });
+    });
+  });
+
+  it('produces multiple series if there is a series aspect and multipl y aspects', function () {
+    var rows = [
+      ['0', 3, 4],
+      ['1', 3, 4],
+      ['0', 3, 4],
+      ['1', 3, 4],
+      ['0', 3, 4],
+      ['1', 3, 4]
+    ].map(wrapRows);
+
+    var chart = {
+      aspects: {
+        x: { i: -1 },
+        series: { i: 0, agg: agg },
+        y: [
+          { i: 1, col: { title: '0' }, agg: { id: 1 } },
+          { i: 2, col: { title: '1' }, agg: { id: 2 } }
+        ]
+      }
+    };
+
+    var series = getSeries(rows, chart);
+
+    expect(series)
+      .to.be.an('array')
+      .and.to.have.length(4); // two series * two metrics
+
+    checkSiri(series[0], '0: 0', 3);
+    checkSiri(series[1], '0: 1', 4);
+    checkSiri(series[2], '1: 0', 3);
+    checkSiri(series[3], '1: 1', 4);
+
+    function checkSiri(siri, label, y) {
+      expect(siri)
+        .to.be.an('object')
+        .and.have.property('label', label)
+        .and.have.property('values');
+
+      expect(siri.values)
+        .to.be.an('array')
+        .and.have.length(3);
+
+      siri.values.forEach(function (point) {
+        expect(point)
+          .to.have.property('x', '_all')
+          .and.property('y', y);
+      });
+    }
+  });
+
+  it('produces a series list in the same order as its corresponding metric column', function () {
+    var rows = [
+      ['0', 3, 4],
+      ['1', 3, 4],
+      ['0', 3, 4],
+      ['1', 3, 4],
+      ['0', 3, 4],
+      ['1', 3, 4]
+    ].map(wrapRows);
+
+    var chart = {
+      aspects: {
+        x: { i: -1 },
+        series: { i: 0, agg: agg },
+        y: [
+          { i: 1, col: { title: '0' }, agg: { id: 1 } },
+          { i: 2, col: { title: '1' }, agg: { id: 2 } }
+        ]
+      }
+    };
+
+    var series = getSeries(rows, chart);
+    expect(series[0]).to.have.property('label', '0: 0');
+    expect(series[1]).to.have.property('label', '0: 1');
+    expect(series[2]).to.have.property('label', '1: 0');
+    expect(series[3]).to.have.property('label', '1: 1');
+
+
+    // switch the order of the y columns
+    chart.aspects.y = chart.aspects.y.reverse();
+    chart.aspects.y.forEach(function (y, i) {
+      y.i = i;
+    });
+
+    var series2 = getSeries(rows, chart);
+    expect(series2[0]).to.have.property('label', '0: 1');
+    expect(series2[1]).to.have.property('label', '0: 0');
+    expect(series2[2]).to.have.property('label', '1: 1');
+    expect(series2[3]).to.have.property('label', '1: 0');
+  });
+});
diff --git a/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js b/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js
new file mode 100644
index 0000000000000..904ee1c1b20d1
--- /dev/null
+++ b/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js
@@ -0,0 +1,66 @@
+describe('initXAxis', function () {
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var initXAxis;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    initXAxis = Private(require('ui/agg_response/point_series/_init_x_axis'));
+  }));
+
+  var baseChart = {
+    aspects: {
+      x: {
+        agg: {
+          fieldFormatter: _.constant({}),
+          write: _.constant({ params: {} }),
+          type: {}
+        },
+        col: {
+          title: 'label'
+        }
+      }
+    }
+  };
+
+  it('sets the xAxisFormatter if the agg is not ordered', function () {
+    var chart = _.cloneDeep(baseChart);
+    initXAxis(chart);
+    expect(chart)
+      .to.have.property('xAxisLabel', 'label')
+      .and.have.property('xAxisFormatter', chart.aspects.x.agg.fieldFormatter());
+  });
+
+  it('makes the chart ordered if the agg is ordered', function () {
+    var chart = _.cloneDeep(baseChart);
+    chart.aspects.x.agg.type.ordered = true;
+
+    initXAxis(chart);
+    expect(chart)
+      .to.have.property('xAxisLabel', 'label')
+      .and.have.property('xAxisFormatter', chart.aspects.x.agg.fieldFormatter())
+      .and.have.property('ordered');
+
+    expect(chart.ordered)
+      .to.be.an('object')
+      .and.not.have.property('interval');
+  });
+
+  it('reads the interval param from the x agg', function () {
+    var chart = _.cloneDeep(baseChart);
+    chart.aspects.x.agg.type.ordered = true;
+    chart.aspects.x.agg.write = _.constant({ params: { interval: 10 } });
+
+    initXAxis(chart);
+    expect(chart)
+      .to.have.property('xAxisLabel', 'label')
+      .and.have.property('xAxisFormatter', chart.aspects.x.agg.fieldFormatter())
+      .and.have.property('ordered');
+
+    expect(chart.ordered)
+      .to.be.an('object')
+      .and.have.property('interval', 10);
+  });
+});
diff --git a/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js b/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js
new file mode 100644
index 0000000000000..0421369f95ff7
--- /dev/null
+++ b/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js
@@ -0,0 +1,68 @@
+describe('initYAxis', function () {
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var initYAxis;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    initYAxis = Private(require('ui/agg_response/point_series/_init_y_axis'));
+  }));
+
+  function agg() {
+    return {
+      fieldFormatter: _.constant({}),
+      write: _.constant({ params: {} }),
+      type: {}
+    };
+  }
+
+  var baseChart = {
+    aspects: {
+      y: [
+        { agg: agg(), col: { title: 'y1' } },
+        { agg: agg(), col: { title: 'y2' } },
+      ],
+      x: {
+        agg: agg(),
+        col: { title: 'x' }
+      }
+    }
+  };
+
+  describe('with a single y aspect', function () {
+    var singleYBaseChart = _.cloneDeep(baseChart);
+    singleYBaseChart.aspects.y = singleYBaseChart.aspects.y[0];
+
+    it('sets the yAxisFormatter the the field formats convert fn', function () {
+      var chart = _.cloneDeep(singleYBaseChart);
+      initYAxis(chart);
+      expect(chart).to.have.property('yAxisFormatter', chart.aspects.y.agg.fieldFormatter());
+    });
+
+    it('sets the yAxisLabel', function () {
+      var chart = _.cloneDeep(singleYBaseChart);
+      initYAxis(chart);
+      expect(chart).to.have.property('yAxisLabel', 'y1');
+    });
+  });
+
+  describe('with mutliple y aspects', function () {
+    it('sets the yAxisFormatter the the field formats convert fn for the first y aspect', function () {
+      var chart = _.cloneDeep(baseChart);
+      initYAxis(chart);
+
+      expect(chart).to.have.property('yAxisFormatter');
+      expect(chart.yAxisFormatter)
+        .to.be(chart.aspects.y[0].agg.fieldFormatter())
+        .and.not.be(chart.aspects.y[1].agg.fieldFormatter());
+    });
+
+    it('does not set the yAxisLabel, it does not make sense to put multiple labels on the same axis', function () {
+      var chart = _.cloneDeep(baseChart);
+      initYAxis(chart);
+      expect(chart).to.have.property('yAxisLabel', '');
+    });
+  });
+});
diff --git a/src/ui/public/agg_response/point_series/__tests__/_main.js b/src/ui/public/agg_response/point_series/__tests__/_main.js
new file mode 100644
index 0000000000000..c2f1939ac4182
--- /dev/null
+++ b/src/ui/public/agg_response/point_series/__tests__/_main.js
@@ -0,0 +1,251 @@
+describe('pointSeriesChartDataFromTable', function () {
+  this.slow(1000);
+
+  var _ = require('lodash');
+  var moment = require('moment');
+  var AggConfigResult = require('ui/Vis/AggConfigResult');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var pointSeriesChartDataFromTable;
+  var indexPattern;
+  var Table;
+  var Vis;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    Vis = Private(require('ui/Vis'));
+    Table = Private(require('ui/agg_response/tabify/_table'));
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    pointSeriesChartDataFromTable = Private(require('ui/agg_response/point_series/point_series'));
+  }));
+
+  it('handles a table with just a count', function () {
+    var vis = new Vis(indexPattern, { type: 'histogram' });
+    var agg = vis.aggs[0];
+    var result = new AggConfigResult(vis.aggs[0], void 0, 100, 100);
+
+    var table = new Table();
+    table.columns = [ { aggConfig: agg } ];
+    table.rows.push([ result ]);
+
+    var chartData = pointSeriesChartDataFromTable(vis, table);
+
+    expect(chartData).to.be.an('object');
+    expect(chartData.series).to.be.an('array');
+    expect(chartData.series).to.have.length(1);
+    var series = chartData.series[0];
+    expect(series.values).to.have.length(1);
+    expect(series.values[0])
+      .to.have.property('x', '_all')
+      .and.have.property('y', 100)
+      .and.have.property('aggConfigResult', result);
+  });
+
+  it('handles a table with x and y column', function () {
+    var vis = new Vis(indexPattern, {
+      type: 'histogram',
+      aggs: [
+        { type: 'count', schema: 'metric' },
+        { type: 'date_histogram', params: { field: '@timestamp', interval: 'hour' }, schema: 'segment' }
+      ]
+    });
+
+    var y = {
+      agg: vis.aggs[0],
+      col: { aggConfig: vis.aggs[0] },
+      at: function (i) { return 100 * i; }
+    };
+
+    var x = {
+      agg: vis.aggs[1],
+      col: { aggConfig: vis.aggs[1] },
+      at: function (i) { return moment().startOf('day').add(i, 'day').valueOf(); }
+    };
+
+    var rowCount = 3;
+    var table = new Table();
+    table.columns = [ x.col, y.col ];
+    _.times(rowCount, function (i) {
+      var date = new AggConfigResult(x.agg, void 0, x.at(i));
+      table.rows.push([date, new AggConfigResult(y.agg, date, y.at(i))]);
+    });
+
+    var chartData = pointSeriesChartDataFromTable(vis, table);
+
+    expect(chartData).to.be.an('object');
+    expect(chartData.series).to.be.an('array');
+    expect(chartData.series).to.have.length(1);
+    var series = chartData.series[0];
+    expect(series.values).to.have.length(rowCount);
+    series.values.forEach(function (point, i) {
+      expect(point)
+        .to.have.property('x', x.at(i))
+        .and.property('y', y.at(i))
+        .and.property('aggConfigResult');
+
+      expect(point.aggConfigResult)
+        .to.be.an(AggConfigResult)
+        .and.property('value', y.at(i))
+        .and.property('$parent');
+
+      expect(point.aggConfigResult.$parent)
+        .to.have.property('value', x.at(i))
+        .and.property('$parent', undefined);
+    });
+  });
+
+  it('handles a table with an x and two y aspects', function () {
+    var vis = new Vis(indexPattern, {
+      type: 'histogram',
+      aggs: [
+        { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
+        { type: 'date_histogram', params: { field: '@timestamp', interval: 'hour' }, schema: 'segment' },
+        { type: 'max', schema: 'metric', params: { field: 'bytes' } }
+      ]
+    });
+
+    var avg = {
+      agg: vis.aggs[0],
+      col: { title: 'average', aggConfig: vis.aggs[0] },
+      at: function (i) { return 75.444 * (i + 1); }
+    };
+
+    var date = {
+      agg: vis.aggs[1],
+      col: { title: 'date', aggConfig: vis.aggs[1] },
+      at: function (i) { return moment().startOf('day').add(i, 'day').valueOf(); }
+    };
+
+    var max = {
+      agg: vis.aggs[2],
+      col: { title: 'maximum', aggConfig: vis.aggs[2] },
+      at: function (i) { return 100 * (i + 1); }
+    };
+
+    var rowCount = 3;
+    var table = new Table();
+    table.columns = [ date.col, avg.col, max.col ];
+    _.times(rowCount, function (i) {
+      var dateResult = new AggConfigResult(date.agg, void 0, date.at(i));
+      var avgResult = new AggConfigResult(avg.agg, dateResult, avg.at(i));
+      var maxResult = new AggConfigResult(max.agg, dateResult, max.at(i));
+      table.rows.push([dateResult, avgResult, maxResult]);
+    });
+
+    var chartData = pointSeriesChartDataFromTable(vis, table);
+    expect(chartData).to.be.an('object');
+    expect(chartData.series).to.be.an('array');
+    expect(chartData.series).to.have.length(2);
+    chartData.series.forEach(function (siri, i) {
+      var metric = i === 0 ? avg : max;
+
+      expect(siri).to.have.property('label', metric.col.label);
+      expect(siri.values).to.have.length(rowCount);
+      siri.values.forEach(function (point, i) {
+        expect(point).to.have.property('x');
+        expect(point.x).to.be.a('number');
+
+        expect(point).to.have.property('y');
+        expect(point.y).to.be.a('number');
+
+        expect(point).to.not.have.property('series');
+
+        expect(point).to.have.property('aggConfigResult');
+        expect(point.aggConfigResult)
+          .to.be.a(AggConfigResult)
+          .and.have.property('aggConfig', metric.agg)
+          .and.have.property('value', point.y)
+          .and.to.have.property('$parent');
+
+        expect(point.aggConfigResult.$parent)
+          .to.be.an(AggConfigResult)
+          .and.have.property('aggConfig', date.agg);
+      });
+    });
+  });
+
+  it('handles a table with an x, a series, and two y aspects', function () {
+    var vis = new Vis(indexPattern, {
+      type: 'histogram',
+      aggs: [
+        { type: 'terms', schema: 'group', params: { field: 'extension' } },
+        { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
+        { type: 'date_histogram', params: { field: '@timestamp', interval: 'hour' }, schema: 'segment' },
+        { type: 'max', schema: 'metric', params: { field: 'bytes' } }
+      ]
+    });
+
+    var extensions = ['php', 'jpg', 'gif', 'css'];
+    var term = {
+      agg: vis.aggs[0],
+      col: { title: 'extensions', aggConfig: vis.aggs[0] },
+      at: function (i) { return extensions[i % extensions.length]; }
+    };
+
+    var avg = {
+      agg: vis.aggs[1],
+      col: { title: 'average', aggConfig: vis.aggs[1] },
+      at: function (i) { return 75.444 * (i + 1); }
+    };
+
+    var date = {
+      agg: vis.aggs[2],
+      col: { title: 'date', aggConfig: vis.aggs[2] },
+      at: function (i) { return moment().startOf('day').add(i, 'day').valueOf(); }
+    };
+
+    var max = {
+      agg: vis.aggs[3],
+      col: { title: 'maximum', aggConfig: vis.aggs[3] },
+      at: function (i) { return 100 * (i + 1); }
+    };
+
+    var metricCount = 2;
+    var rowsPerSegment = 2;
+    var rowCount = extensions.length * rowsPerSegment;
+    var table = new Table();
+    table.columns = [ date.col, term.col, avg.col, max.col ];
+    _.times(rowCount, function (i) {
+      var dateResult = new AggConfigResult(date.agg, void 0, date.at(i));
+      var termResult = new AggConfigResult(term.agg, dateResult, term.at(i));
+      var avgResult = new AggConfigResult(avg.agg, termResult, avg.at(i));
+      var maxResult = new AggConfigResult(max.agg, termResult, max.at(i));
+      table.rows.push([dateResult, termResult, avgResult, maxResult]);
+    });
+
+    var chartData = pointSeriesChartDataFromTable(vis, table);
+    expect(chartData).to.be.an('object');
+    expect(chartData.series).to.be.an('array');
+    // one series for each extension, and then one for each metric inside
+    expect(chartData.series).to.have.length(extensions.length * metricCount);
+    chartData.series.forEach(function (siri, i) {
+      // figure out the metric used to create this series
+      var metricAgg = siri.values[0].aggConfigResult.aggConfig;
+      var metric = avg.agg === metricAgg ? avg : max;
+
+      expect(siri.values).to.have.length(rowsPerSegment);
+      siri.values.forEach(function (point) {
+        expect(point).to.have.property('x');
+        expect(point.x).to.be.a('number');
+
+        expect(point).to.have.property('y');
+        expect(point.y).to.be.a('number');
+
+        expect(point).to.have.property('series');
+        expect(_.contains(extensions, point.series)).to.be.ok();
+
+        expect(point).to.have.property('aggConfigResult');
+        expect(point.aggConfigResult)
+          .to.be.a(AggConfigResult)
+          .and.have.property('aggConfig', metric.agg)
+          .and.have.property('value', point.y)
+          .and.to.have.property('$parent');
+
+        expect(point.aggConfigResult.$parent)
+          .to.be.an(AggConfigResult)
+          .and.have.property('aggConfig', term.agg);
+      });
+    });
+  });
+});
diff --git a/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js b/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js
new file mode 100644
index 0000000000000..f25fcd8321ef0
--- /dev/null
+++ b/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js
@@ -0,0 +1,90 @@
+describe('orderedDateAxis', function () {
+  var moment = require('moment');
+  var _ = require('lodash');
+  var sinon = require('auto-release-sinon');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var baseArgs = {
+    vis: {
+      indexPattern: {
+        timeFieldName: '@timestamp'
+      }
+    },
+    chart: {
+      aspects: {
+        x: {
+          agg: {
+            fieldIsTimeField: _.constant(true),
+            buckets: {
+              getScaledDateFormat: _.constant('hh:mm:ss'),
+              getInterval: _.constant(moment.duration(15, 'm')),
+              getBounds: _.constant({ min: moment().subtract(15, 'm'), max: moment() })
+            }
+          }
+        }
+      }
+    }
+  };
+
+  var orderedDateAxis;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    orderedDateAxis = Private(require('ui/agg_response/point_series/_ordered_date_axis'));
+  }));
+
+  describe('xAxisFormatter', function () {
+    it('sets the xAxisFormatter', function () {
+      var args = _.cloneDeep(baseArgs);
+      orderedDateAxis(args.vis, args.chart);
+
+      expect(args.chart).to.have.property('xAxisFormatter');
+      expect(args.chart.xAxisFormatter).to.be.a('function');
+    });
+
+    it('formats values using moment, and returns strings', function () {
+      var args = _.cloneDeep(baseArgs);
+      orderedDateAxis(args.vis, args.chart);
+
+      var val = '2014-08-06T12:34:01';
+      expect(args.chart.xAxisFormatter(val))
+        .to.be(moment(val).format('hh:mm:ss'));
+    });
+  });
+
+  describe('ordered object', function () {
+    it('sets date: true', function () {
+      var args = _.cloneDeep(baseArgs);
+      orderedDateAxis(args.vis, args.chart);
+
+      expect(args.chart)
+        .to.have.property('ordered');
+
+      expect(args.chart.ordered)
+        .to.have.property('date', true);
+    });
+
+    it('relies on agg.buckets for the interval', function () {
+      var args = _.cloneDeep(baseArgs);
+      var spy = sinon.spy(args.chart.aspects.x.agg.buckets, 'getInterval');
+      orderedDateAxis(args.vis, args.chart);
+      expect(spy).to.have.property('callCount', 1);
+    });
+
+    it('sets the min/max when the buckets are bounded', function () {
+      var args = _.cloneDeep(baseArgs);
+      orderedDateAxis(args.vis, args.chart);
+      expect(moment.isMoment(args.chart.ordered.min)).to.be(true);
+      expect(moment.isMoment(args.chart.ordered.max)).to.be(true);
+    });
+
+    it('does not set the min/max when the buckets are unbounded', function () {
+      var args = _.cloneDeep(baseArgs);
+      args.chart.aspects.x.agg.buckets.getBounds = _.constant();
+      orderedDateAxis(args.vis, args.chart);
+      expect(args.chart.ordered).to.not.have.property('min');
+      expect(args.chart.ordered).to.not.have.property('max');
+    });
+  });
+});
diff --git a/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js b/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js
new file mode 100644
index 0000000000000..75566f842fc09
--- /dev/null
+++ b/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js
@@ -0,0 +1,61 @@
+describe('tooltipFormatter', function () {
+  var _ = require('lodash');
+  var $ = require('jquery');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var tooltipFormatter;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    tooltipFormatter = Private(require('ui/agg_response/point_series/_tooltip_formatter'));
+  }));
+
+  function agg(name) {
+    return {
+      fieldFormatter: _.constant(function (v) { return '(' + v + ')'; }),
+      makeLabel: _.constant(name)
+    };
+  }
+
+  function cell($row, i) {
+    return $row.eq(i).text().trim();
+  }
+
+  var baseEvent = {
+    datum: {
+      aggConfigResult: {
+        aggConfig: agg('inner'),
+        value: 3,
+        $parent: {
+          aggConfig: agg('middle'),
+          value: 2,
+          $parent: {
+            aggConfig: agg('top'),
+            value: 1
+          }
+        }
+      },
+      extraMetrics: []
+    }
+  };
+
+  it('returns html based on the mouse event', function () {
+    var event = _.cloneDeep(baseEvent);
+    var $el = $(tooltipFormatter(event));
+    var $rows = $el.find('tr');
+    expect($rows.size()).to.be(3);
+
+    var $row1 = $rows.eq(0).find('td');
+    expect(cell($row1, 0)).to.be('inner');
+    expect(cell($row1, 1)).to.be('(3)');
+
+    var $row2 = $rows.eq(1).find('td');
+    expect(cell($row2, 0)).to.be('middle');
+    expect(cell($row2, 1)).to.be('(2)');
+
+    var $row3 = $rows.eq(2).find('td');
+    expect(cell($row3, 0)).to.be('top');
+    expect(cell($row3, 1)).to.be('(1)');
+  });
+});
diff --git a/src/ui/public/agg_response/point_series/__tests__/point_series.js b/src/ui/public/agg_response/point_series/__tests__/point_series.js
new file mode 100644
index 0000000000000..5e39800fa4462
--- /dev/null
+++ b/src/ui/public/agg_response/point_series/__tests__/point_series.js
@@ -0,0 +1,12 @@
+describe('Point Series Agg Response', function () {
+  require('./_main');
+  require('./_add_to_siri');
+  require('./_fake_x_aspect');
+  require('./_get_aspects');
+  require('./_get_point');
+  require('./_get_series');
+  require('./_init_x_axis');
+  require('./_init_y_axis');
+  require('./_ordered_date_axis');
+  require('./_tooltip_formatter');
+});
diff --git a/src/kibana/components/agg_response/point_series/_add_to_siri.js b/src/ui/public/agg_response/point_series/_add_to_siri.js
similarity index 100%
rename from src/kibana/components/agg_response/point_series/_add_to_siri.js
rename to src/ui/public/agg_response/point_series/_add_to_siri.js
diff --git a/src/ui/public/agg_response/point_series/_fake_x_aspect.js b/src/ui/public/agg_response/point_series/_fake_x_aspect.js
new file mode 100644
index 0000000000000..5de2c4928aff9
--- /dev/null
+++ b/src/ui/public/agg_response/point_series/_fake_x_aspect.js
@@ -0,0 +1,29 @@
+define(function (require) {
+  return function PointSeriesFakeXAxis(Private) {
+    var AggConfig = Private(require('ui/Vis/AggConfig'));
+    var AggType = Private(require('ui/agg_types/AggType'));
+
+    var allAgg = new AggType({
+      name: 'all',
+      title: 'All docs',
+      ordered: false,
+      hasNoDsl: true
+    });
+
+    return function makeFakeXAxis(vis) {
+      var fake = new AggConfig(vis, {
+        type: allAgg,
+        schema: vis.type.schemas.all.byName.segment
+      });
+
+      return {
+        i: -1,
+        agg: fake,
+        col: {
+          aggConfig: fake,
+          label: fake.makeLabel()
+        }
+      };
+    };
+  };
+});
diff --git a/src/ui/public/agg_response/point_series/_get_aspects.js b/src/ui/public/agg_response/point_series/_get_aspects.js
new file mode 100644
index 0000000000000..58ce78b3549ef
--- /dev/null
+++ b/src/ui/public/agg_response/point_series/_get_aspects.js
@@ -0,0 +1,59 @@
+define(function (require) {
+  return function PointSeriesGetAspects(Private) {
+    var _ = require('lodash');
+    var fakeXAspect = Private(require('ui/agg_response/point_series/_fake_x_aspect'));
+
+    var map = {
+      segment: 'x',
+      metric: 'y',
+      radius: 'z',
+      width: 'width',
+      group: 'series'
+    };
+
+    function columnToAspect(aspects, col, i) {
+      var schema = col.aggConfig.schema.name;
+
+      var name = map[schema];
+      if (!name) throw new TypeError('unknown schema name "' + schema + '"');
+
+      var aspect = {
+        i: i,
+        col: col,
+        agg: col.aggConfig
+      };
+
+      if (!aspects[name]) aspects[name] = [];
+      aspects[name].push(aspect);
+    }
+
+    /**
+     * Identify and group the columns based on the aspect of the pointSeries
+     * they represent.
+     *
+     * @param  {array} columns - the list of columns
+     * @return {object} - an object with a key for each aspect (see map). The values
+     *                    may be undefined, a single aspect, or an array of aspects.
+     */
+    return function getAspects(vis, table) {
+      var aspects = _(table.columns)
+      // write each column into the aspects under it's group
+      .transform(columnToAspect, {})
+      // unwrap groups that only have one value, and validate groups that have more
+      .transform(function (aspects, group, name) {
+        if (name !== 'y' && group.length > 1) {
+          throw new TypeError('Only multiple metrics are supported in point series');
+        }
+
+        aspects[name] = group.length > 1 ? group : group[0];
+      })
+      .value();
+
+      if (!aspects.x) {
+        aspects.x = fakeXAspect(vis);
+      }
+
+      return aspects;
+    };
+  };
+});
diff --git a/src/kibana/components/agg_response/point_series/_get_point.js b/src/ui/public/agg_response/point_series/_get_point.js
similarity index 100%
rename from src/kibana/components/agg_response/point_series/_get_point.js
rename to src/ui/public/agg_response/point_series/_get_point.js
diff --git a/src/ui/public/agg_response/point_series/_get_series.js b/src/ui/public/agg_response/point_series/_get_series.js
new file mode 100644
index 0000000000000..48f2701c0e7de
--- /dev/null
+++ b/src/ui/public/agg_response/point_series/_get_series.js
@@ -0,0 +1,56 @@
+define(function (require) {
+  return function PointSeriesGetSeries(Private) {
+    var _ = require('lodash');
+    var getPoint = Private(require('ui/agg_response/point_series/_get_point'));
+    var addToSiri = Private(require('ui/agg_response/point_series/_add_to_siri'));
+
+    return function getSeries(rows, chart) {
+      var aspects = chart.aspects;
+      var multiY = _.isArray(aspects.y);
+      var yScale = chart.yScale;
+      var partGetPoint = _.partial(getPoint, aspects.x, aspects.series, yScale);
+
+      var series = _(rows)
+      .transform(function (series, row) {
+
+        if (!multiY) {
+          var point = partGetPoint(row, aspects.y, aspects.z);
+          if (point) addToSiri(series, point, point.series);
+          return;
+        }
+
+        aspects.y.forEach(function (y) {
+          var point = partGetPoint(row, y, aspects.z);
+          if (!point) return;
+
+          var prefix = point.series ? point.series + ': ' : '';
+          var seriesId = prefix + y.agg.id;
+          var seriesLabel = prefix + y.col.title;
+
+          addToSiri(series, point, seriesId, seriesLabel);
+        });
+
+      }, {})
+      .values()
+      .value();
+
+      if (multiY) {
+        series = _.sortBy(series, function (siri) {
+          var firstVal = siri.values[0];
+          var y;
+
+          if (firstVal) {
+            var agg = firstVal.aggConfigResult.aggConfig;
+            y = _.find(aspects.y, function (y) {
+              return y.agg === agg;
+            });
+          }
+
+          return y ? y.i : series.length;
+        });
+      }
+
+      return series;
+    };
+  };
+});
diff --git a/src/kibana/components/agg_response/point_series/_init_x_axis.js b/src/ui/public/agg_response/point_series/_init_x_axis.js
similarity index 100%
rename from src/kibana/components/agg_response/point_series/_init_x_axis.js
rename to src/ui/public/agg_response/point_series/_init_x_axis.js
diff --git a/src/kibana/components/agg_response/point_series/_init_y_axis.js b/src/ui/public/agg_response/point_series/_init_y_axis.js
similarity index 100%
rename from src/kibana/components/agg_response/point_series/_init_y_axis.js
rename to src/ui/public/agg_response/point_series/_init_y_axis.js
diff --git a/src/kibana/components/agg_response/point_series/_ordered_date_axis.js b/src/ui/public/agg_response/point_series/_ordered_date_axis.js
similarity index 100%
rename from src/kibana/components/agg_response/point_series/_ordered_date_axis.js
rename to src/ui/public/agg_response/point_series/_ordered_date_axis.js
diff --git a/src/kibana/components/agg_response/point_series/_tooltip.html b/src/ui/public/agg_response/point_series/_tooltip.html
similarity index 100%
rename from src/kibana/components/agg_response/point_series/_tooltip.html
rename to src/ui/public/agg_response/point_series/_tooltip.html
diff --git a/src/ui/public/agg_response/point_series/_tooltip_formatter.js b/src/ui/public/agg_response/point_series/_tooltip_formatter.js
new file mode 100644
index 0000000000000..97345117543a3
--- /dev/null
+++ b/src/ui/public/agg_response/point_series/_tooltip_formatter.js
@@ -0,0 +1,45 @@
+define(function (require) {
+  return function PointSeriesTooltipFormatter($compile, $rootScope) {
+    var $ = require('jquery');
+
+    var $tooltipScope = $rootScope.$new();
+    var $tooltip = $(require('ui/agg_response/point_series/_tooltip.html'));
+    $compile($tooltip)($tooltipScope);
+
+    return function tooltipFormatter(event) {
+      var datum = event.datum;
+      if (!datum || !datum.aggConfigResult) return '';
+
+      var details = $tooltipScope.details = [];
+      var result = { $parent: datum.aggConfigResult };
+
+      function addDetail(result) {
+        var agg = result.aggConfig;
+        var value = result.value;
+
+        var detail = {
+          value: agg.fieldFormatter()(value),
+          label: agg.makeLabel()
+        };
+
+        if (agg === datum.aggConfigResult.aggConfig) {
+          detail.percent = event.percent;
+          if (datum.yScale != null) {
+            detail.value = agg.fieldFormatter()(value * datum.yScale);
+          }
+        }
+
+        details.push(detail);
+      }
+
+      datum.extraMetrics.forEach(addDetail);
+      while ((result = result.$parent) && result.aggConfig) {
+        addDetail(result);
+      }
+
+
+      $tooltipScope.$apply();
+      return $tooltip[0].outerHTML;
+    };
+  };
+});
diff --git a/src/ui/public/agg_response/point_series/point_series.js b/src/ui/public/agg_response/point_series/point_series.js
new file mode 100644
index 0000000000000..ddaf2c9beef21
--- /dev/null
+++ b/src/ui/public/agg_response/point_series/point_series.js
@@ -0,0 +1,32 @@
+define(function (require) {
+  return function PointSeriesProvider(Private) {
+    var _ = require('lodash');
+
+    var getSeries = Private(require('ui/agg_response/point_series/_get_series'));
+    var getAspects = Private(require('ui/agg_response/point_series/_get_aspects'));
+    var initYAxis = Private(require('ui/agg_response/point_series/_init_y_axis'));
+    var initXAxis = Private(require('ui/agg_response/point_series/_init_x_axis'));
+    var setupOrderedDateXAxis = Private(require('ui/agg_response/point_series/_ordered_date_axis'));
+    var tooltipFormatter = Private(require('ui/agg_response/point_series/_tooltip_formatter'));
+
+    return function pointSeriesChartDataFromTable(vis, table) {
+      var chart = {};
+      var aspects = chart.aspects = getAspects(vis, table);
+
+      chart.tooltipFormatter = tooltipFormatter;
+
+      initXAxis(chart);
+      initYAxis(chart);
+
+      var datedX = aspects.x.agg.type.ordered && aspects.x.agg.type.ordered.date;
+      if (datedX) {
+        setupOrderedDateXAxis(vis, chart);
+      }
+
+      chart.series = getSeries(table.rows, chart);
+
+      delete chart.aspects;
+      return chart;
+    };
+  };
+});
diff --git a/src/ui/public/agg_response/tabify/__tests__/_buckets.js b/src/ui/public/agg_response/tabify/__tests__/_buckets.js
new file mode 100644
index 0000000000000..f019564d93853
--- /dev/null
+++ b/src/ui/public/agg_response/tabify/__tests__/_buckets.js
@@ -0,0 +1,59 @@
+describe('Buckets wrapper', function () {
+  var Buckets;
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private, $injector) {
+    Buckets = Private(require('ui/agg_response/tabify/_buckets'));
+  }));
+
+
+  function test(aggResp, count, keys) {
+    it('reads the length', function () {
+      var buckets = new Buckets(aggResp);
+      expect(buckets).to.have.length(count);
+    });
+
+    it('itterates properly, passing in the key', function () {
+      var buckets = new Buckets(aggResp);
+      var keysSent = [];
+      buckets.forEach(function (bucket, key) {
+        keysSent.push(key);
+      });
+
+      expect(keysSent).to.have.length(count);
+      expect(keysSent).to.eql(keys);
+    });
+  }
+
+  describe('with object style buckets', function () {
+    var aggResp = {
+      buckets: {
+        '0-100': {},
+        '100-200': {},
+        '200-300': {}
+      }
+    };
+
+    var count = 3;
+    var keys = ['0-100', '100-200', '200-300'];
+
+    test(aggResp, count, keys);
+  });
+
+  describe('with array style buckets', function () {
+    var aggResp = {
+      buckets: [
+        { key: '0-100', value: {} },
+        { key: '100-200', value: {} },
+        { key: '200-300', value: {} }
+      ]
+    };
+
+    var count = 3;
+    var keys = ['0-100', '100-200', '200-300'];
+
+    test(aggResp, count, keys);
+  });
+});
diff --git a/src/ui/public/agg_response/tabify/__tests__/_get_columns.js b/src/ui/public/agg_response/tabify/__tests__/_get_columns.js
new file mode 100644
index 0000000000000..369db9aeff12b
--- /dev/null
+++ b/src/ui/public/agg_response/tabify/__tests__/_get_columns.js
@@ -0,0 +1,124 @@
+describe('get columns', function () {
+  var getColumns;
+  var Vis;
+  var indexPattern;
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private, $injector) {
+    getColumns = Private(require('ui/agg_response/tabify/_get_columns'));
+    Vis = Private(require('ui/Vis'));
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+  }));
+
+  it('should inject a count metric if no aggs exist', function () {
+    var vis = new Vis(indexPattern, {
+      type: 'pie'
+    });
+    while (vis.aggs.length) vis.aggs.pop();
+    var columns = getColumns(vis);
+
+    expect(columns).to.have.length(1);
+    expect(columns[0]).to.have.property('aggConfig');
+    expect(columns[0].aggConfig.type).to.have.property('name', 'count');
+  });
+
+  it('should inject a count metric if only buckets exist', function () {
+    var vis = new Vis(indexPattern, {
+      type: 'pie',
+      aggs: [
+        { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } }
+      ]
+    });
+
+    var columns = getColumns(vis);
+
+    expect(columns).to.have.length(2);
+    expect(columns[1]).to.have.property('aggConfig');
+    expect(columns[1].aggConfig.type).to.have.property('name', 'count');
+  });
+
+  it('should inject the metric after each bucket if the vis is hierarchical', function () {
+    var vis = new Vis(indexPattern, {
+      type: 'pie',
+      aggs: [
+        { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
+        { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
+        { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
+        { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } }
+      ]
+    });
+
+    var columns = getColumns(vis);
+
+    expect(columns).to.have.length(8);
+    columns.forEach(function (column, i) {
+      expect(column).to.have.property('aggConfig');
+      expect(column.aggConfig.type).to.have.property('name', i % 2 ? 'count' : 'date_histogram');
+    });
+  });
+
+  it('should inject the multiple metrics after each bucket if the vis is hierarchical', function () {
+    var vis = new Vis(indexPattern, {
+      type: 'pie',
+      aggs: [
+        { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
+        { type: 'avg',            schema: 'metric',   params: { field: 'bytes' } },
+        { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
+        { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
+        { type: 'sum',            schema: 'metric',   params: { field: 'bytes' } },
+        { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } }
+      ]
+    });
+
+    var columns = getColumns(vis);
+
+    function checkColumns(column, i) {
+      expect(column).to.have.property('aggConfig');
+      switch (i) {
+      case 0:
+        expect(column.aggConfig.type).to.have.property('name', 'date_histogram');
+        break;
+      case 1:
+        expect(column.aggConfig.type).to.have.property('name', 'avg');
+        break;
+      case 2:
+        expect(column.aggConfig.type).to.have.property('name', 'sum');
+        break;
+      }
+    }
+
+    expect(columns).to.have.length(12);
+    for (var i = 0; i < columns.length; i += 3) {
+      var counts = { buckets: 0, metrics: 0 };
+      columns.slice(i, i + 3).forEach(checkColumns);
+    }
+  });
+
+  it('should put all metrics at the end of the columns if the vis is not hierarchical', function () {
+    var vis = new Vis(indexPattern, {
+      type: 'histogram',
+      aggs: [
+        { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
+        { type: 'avg',            schema: 'metric',   params: { field: 'bytes' } },
+        { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
+        { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
+        { type: 'sum',            schema: 'metric',   params: { field: 'bytes' } },
+        { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } }
+      ]
+    });
+
+    var columns = getColumns(vis);
+    expect(columns).to.have.length(6);
+
+    // sum should be last
+    expect(columns.pop().aggConfig.type).to.have.property('name', 'sum');
+    // avg should be before that
+    expect(columns.pop().aggConfig.type).to.have.property('name', 'avg');
+    // the rest are date_histograms
+    while (columns.length) {
+      expect(columns.pop().aggConfig.type).to.have.property('name', 'date_histogram');
+    }
+  });
+});
diff --git a/src/ui/public/agg_response/tabify/__tests__/_integration.js b/src/ui/public/agg_response/tabify/__tests__/_integration.js
new file mode 100644
index 0000000000000..fec883f229585
--- /dev/null
+++ b/src/ui/public/agg_response/tabify/__tests__/_integration.js
@@ -0,0 +1,264 @@
+describe('tabifyAggResponse Integration', function () {
+  var _ = require('lodash');
+  var fixtures = require('fixtures/fake_hierarchical_data');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var Vis;
+  var Buckets;
+  var indexPattern;
+  var tabifyAggResponse;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private, $injector) {
+    tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify'));
+    Vis = Private(require('ui/Vis'));
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+  }));
+
+  function normalizeIds(vis) {
+    vis.aggs.forEach(function (agg, i) {
+      agg.id = 'agg_' + (i + 1);
+    });
+  }
+
+  it('transforms a simple response properly', function () {
+    var vis = new Vis(indexPattern, {
+      type: 'histogram',
+      aggs: []
+    });
+    normalizeIds(vis);
+
+    var resp = tabifyAggResponse(vis, fixtures.metricOnly, { canSplit: false });
+
+    expect(resp).to.not.have.property('tables');
+    expect(resp).to.have.property('rows').and.property('columns');
+    expect(resp.rows).to.have.length(1);
+    expect(resp.columns).to.have.length(1);
+
+    expect(resp.rows[0]).to.eql([1000]);
+    expect(resp.columns[0]).to.have.property('aggConfig', vis.aggs[0]);
+  });
+
+  describe('transforms a complex response', function () {
+    this.slow(1000);
+
+    var vis;
+    var avg;
+    var ext;
+    var src;
+    var os;
+    var esResp;
+
+    beforeEach(function () {
+      vis = new Vis(indexPattern, {
+        type: 'pie',
+        aggs: [
+          { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
+          { type: 'terms', schema: 'split', params: { field: 'extension' } },
+          { type: 'terms', schema: 'segment', params: { field: 'geo.src' } },
+          { type: 'terms', schema: 'segment', params: { field: 'machine.os' } }
+        ]
+      });
+      normalizeIds(vis);
+
+      avg = vis.aggs[0];
+      ext = vis.aggs[1];
+      src = vis.aggs[2];
+      os = vis.aggs[3];
+
+      esResp = _.cloneDeep(fixtures.threeTermBuckets);
+      // remove the buckets for css              in MX
+      esResp.aggregations.agg_2.buckets[1].agg_3.buckets[0].agg_4.buckets = [];
+    });
+
+    // check that the root table group is formed properly, then pass
+    // each table to expectExtensionSplit, along with the expectInnerTables()
+    // function.
+    function expectRootGroup(rootTableGroup, expectInnerTables) {
+      expect(rootTableGroup).to.have.property('tables');
+
+      var tables = rootTableGroup.tables;
+      expect(tables).to.be.an('array').and.have.length(3);
+      expectExtensionSplit(tables[0], 'png', expectInnerTables);
+      expectExtensionSplit(tables[1], 'css', expectInnerTables);
+      expectExtensionSplit(tables[2], 'html', expectInnerTables);
+    }
+
+    // check that the tableGroup for the extension agg was formed properly
+    // then call expectTable() on each table inside. it should validate that
+    // each table is formed properly
+    function expectExtensionSplit(tableGroup, key, expectTable) {
+      expect(tableGroup).to.have.property('tables');
+      expect(tableGroup).to.have.property('aggConfig', ext);
+      expect(tableGroup).to.have.property('key', key);
+      expect(tableGroup.tables).to.be.an('array').and.have.length(1);
+
+      tableGroup.tables.forEach(function (table) {
+        expectTable(table, key);
+      });
+    }
+
+    // check that the columns of a table are formed properly
+    function expectColumns(table, aggs) {
+      expect(table.columns).to.be.an('array').and.have.length(aggs.length);
+      aggs.forEach(function (agg, i) {
+        expect(table.columns[i]).to.have.property('aggConfig', agg);
+      });
+    }
+
+    // check that a row has expected values
+    function expectRow(row, asserts) {
+      expect(row).to.be.an('array');
+      expect(row).to.have.length(asserts.length);
+      asserts.forEach(function (assert, i) {
+        assert(row[i]);
+      });
+    }
+
+    // check for two character country code
+    function expectCountry(val) {
+      expect(val).to.be.a('string');
+      expect(val).to.have.length(2);
+    }
+
+    // check for an empty cell
+    function expectEmpty(val) {
+      expect(val)
+      .to.be('');
+    }
+
+    // check for an OS term
+    function expectOS(val) {
+      expect(val)
+      .to.match(/^(win|mac|linux)$/);
+    }
+
+    // check for something like an average bytes result
+    function expectAvgBytes(val) {
+      expect(val).to.be.a('number');
+      expect(val === 0 || val > 1000).to.be.ok();
+    }
+
+    // create an assert that checks for an expected value
+    function expectVal(expected) {
+      return function (val) {
+        expect(val).to.be(expected);
+      };
+    }
+
+    it('for non-hierarchical vis', function () {
+      // the default for a non-hierarchical vis is to display
+      // only complete rows, and only put the metrics at the end.
+
+      vis.isHierarchical = _.constant(false);
+      var tabbed = tabifyAggResponse(vis, esResp);
+
+      expectRootGroup(tabbed, function expectTable(table, splitKey) {
+        expectColumns(table, [src, os, avg]);
+
+        table.rows.forEach(function (row) {
+          if (splitKey === 'css' && row[0] === 'MX') {
+            throw new Error('expected the MX row in the css table to be removed');
+          } else {
+            expectRow(row, [
+              expectCountry,
+              expectOS,
+              expectAvgBytes
+            ]);
+          }
+        });
+      });
+    });
+
+    it('for hierarchical vis, with partial rows', function () {
+      // since we have partialRows we expect that one row will have some empty
+      // values, and since the vis is hierarchical and we are NOT using
+      // minimalColumns we should expect the partial row to be completely after
+      // the existing bucket and it's metric
+
+      vis.isHierarchical = _.constant(true);
+      var tabbed = tabifyAggResponse(vis, esResp, {
+        partialRows: true
+      });
+
+      expectRootGroup(tabbed, function expectTable(table, splitKey) {
+        expectColumns(table, [src, avg, os, avg]);
+
+        table.rows.forEach(function (row) {
+          if (splitKey === 'css' && row[0] === 'MX') {
+            expectRow(row, [
+              expectCountry,
+              expectAvgBytes,
+              expectEmpty,
+              expectEmpty
+            ]);
+          } else {
+            expectRow(row, [
+              expectCountry,
+              expectAvgBytes,
+              expectOS,
+              expectAvgBytes
+            ]);
+          }
+        });
+      });
+    });
+
+    it('for hierarchical vis, with partial rows, and minimal columns', function () {
+      // since we have partialRows we expect that one row has some empty
+      // values, and since the vis is hierarchical and we are displaying using
+      // minimalColumns, we should expect the partial row to have a metric at
+      // the end
+
+      vis.isHierarchical = _.constant(true);
+      var tabbed = tabifyAggResponse(vis, esResp, {
+        partialRows: true,
+        minimalColumns: true
+      });
+
+      expectRootGroup(tabbed, function expectTable(table, splitKey) {
+        expectColumns(table, [src, os, avg]);
+
+        table.rows.forEach(function (row) {
+          if (splitKey === 'css' && row[0] === 'MX') {
+            expectRow(row, [
+              expectCountry,
+              expectEmpty,
+              expectVal(9299)
+            ]);
+          } else {
+            expectRow(row, [
+              expectCountry,
+              expectOS,
+              expectAvgBytes
+            ]);
+          }
+        });
+      });
+    });
+
+    it('for non-hierarchical vis, minimal columns set to false', function () {
+      // the reason for this test is mainly to check that setting
+      // minimalColumns = false on a non-hierarchical vis doesn't
+      // create metric columns after each bucket
+
+      vis.isHierarchical = _.constant(false);
+      var tabbed = tabifyAggResponse(vis, esResp, {
+        minimalColumns: false
+      });
+
+      expectRootGroup(tabbed, function expectTable(table, splitKey) {
+        expectColumns(table, [src, os, avg]);
+
+        table.rows.forEach(function (row) {
+          expectRow(row, [
+            expectCountry,
+            expectOS,
+            expectAvgBytes
+          ]);
+        });
+      });
+    });
+  });
+});
diff --git a/src/ui/public/agg_response/tabify/__tests__/_response_writer.js b/src/ui/public/agg_response/tabify/__tests__/_response_writer.js
new file mode 100644
index 0000000000000..0b5ab94190f4f
--- /dev/null
+++ b/src/ui/public/agg_response/tabify/__tests__/_response_writer.js
@@ -0,0 +1,381 @@
+describe('ResponseWriter class', function () {
+  var _ = require('lodash');
+  var sinon = require('auto-release-sinon');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var Vis;
+  var Table;
+  var Buckets;
+  var Private;
+  var TableGroup;
+  var getColumns;
+  var indexPattern;
+  var ResponseWriter;
+
+  function defineSetup(stubGetColumns) {
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function ($injector) {
+      Private = $injector.get('Private');
+
+      if (stubGetColumns) {
+        getColumns = sinon.stub();
+        Private.stub(require('ui/agg_response/tabify/_get_columns'), getColumns);
+      }
+
+      ResponseWriter = Private(require('ui/agg_response/tabify/_response_writer'));
+      TableGroup = Private(require('ui/agg_response/tabify/_table_group'));
+      Buckets = Private(require('ui/agg_response/tabify/_buckets'));
+      Table = Private(require('ui/agg_response/tabify/_table'));
+      Vis = Private(require('ui/Vis'));
+      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    }));
+  }
+
+  describe('Constructor', function () {
+    defineSetup(true);
+
+    it('gets the columns for the vis', function () {
+      var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+      var writer = new ResponseWriter(vis);
+
+      expect(getColumns).to.have.property('callCount', 1);
+      expect(getColumns.firstCall.args[0]).to.be(vis);
+    });
+
+    it('collects the aggConfigs from each column in aggStack', function () {
+      var aggs = [
+        { type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
+        { type: 'terms', schema: 'segment', params: { field: 'extension' } },
+        { type: 'avg', schema: 'metric', params: { field: '@timestamp' } }
+      ];
+
+      getColumns.returns(aggs.map(function (agg) {
+        return { aggConfig: agg };
+      }));
+
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: aggs
+      });
+
+      var writer = new ResponseWriter(vis);
+      expect(writer.aggStack).to.be.an('array');
+      expect(writer.aggStack).to.have.length(aggs.length);
+      writer.aggStack.forEach(function (agg, i) {
+        expect(agg).to.be(aggs[i]);
+      });
+    });
+
+    it('sets canSplit=true by default', function () {
+      var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+      var writer = new ResponseWriter(vis);
+      expect(writer).to.have.property('canSplit', true);
+    });
+
+    it('sets canSplit=false when config says to', function () {
+      var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+      var writer = new ResponseWriter(vis, { canSplit: false });
+      expect(writer).to.have.property('canSplit', false);
+    });
+
+    describe('sets partialRows', function () {
+      it('to the value of the config if set', function () {
+        var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+        var partial = Boolean(Math.round(Math.random()));
+
+        var writer = new ResponseWriter(vis, { partialRows: partial });
+        expect(writer).to.have.property('partialRows', partial);
+      });
+
+      it('to the value of vis.isHierarchical if no config', function () {
+        var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+        var hierarchical = Boolean(Math.round(Math.random()));
+        sinon.stub(vis, 'isHierarchical').returns(hierarchical);
+
+        var writer = new ResponseWriter(vis, {});
+        expect(writer).to.have.property('partialRows', hierarchical);
+      });
+    });
+
+    it('starts off with a root TableGroup', function () {
+      var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+
+      var writer = new ResponseWriter(vis);
+      expect(writer.root).to.be.a(TableGroup);
+      expect(writer.splitStack).to.be.an('array');
+      expect(writer.splitStack).to.have.length(1);
+      expect(writer.splitStack[0]).to.be(writer.root);
+    });
+  });
+
+  describe('', function () {
+    defineSetup();
+
+    describe('#response()', function () {
+      it('returns the root TableGroup if splitting', function () {
+        var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+        var writer = new ResponseWriter(vis);
+        expect(writer.response()).to.be(writer.root);
+      });
+
+      it('returns the first table if not splitting', function () {
+        var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+        var writer = new ResponseWriter(vis, { canSplit: false });
+        var table = writer._table();
+        expect(writer.response()).to.be(table);
+      });
+
+      it('adds columns to all of the tables', function () {
+        var vis = new Vis(indexPattern, {
+          type: 'histogram',
+          aggs: [
+            { type: 'terms', params: { field: '_type' }, schema: 'split' },
+            { type: 'count', schema: 'metric' }
+          ]
+        });
+        var buckets = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
+        var writer = new ResponseWriter(vis);
+        var tables = [];
+
+        writer.split(vis.aggs[0], buckets, function () {
+          writer.cell(vis.aggs[1], 100, function () {
+            tables.push(writer.row());
+          });
+        });
+
+        tables.forEach(function (table) {
+          expect(table.columns == null).to.be(true);
+        });
+
+        var resp = writer.response();
+        expect(resp).to.be.a(TableGroup);
+        expect(resp.tables).to.have.length(2);
+
+        var nginx = resp.tables.shift();
+        expect(nginx).to.have.property('aggConfig', vis.aggs[0]);
+        expect(nginx).to.have.property('key', 'nginx');
+        expect(nginx.tables).to.have.length(1);
+        nginx.tables.forEach(function (table) {
+          expect(_.contains(tables, table)).to.be(true);
+        });
+
+        var apache = resp.tables.shift();
+        expect(apache).to.have.property('aggConfig', vis.aggs[0]);
+        expect(apache).to.have.property('key', 'apache');
+        expect(apache.tables).to.have.length(1);
+        apache.tables.forEach(function (table) {
+          expect(_.contains(tables, table)).to.be(true);
+        });
+
+        tables.forEach(function (table) {
+          expect(table.columns).to.be.an('array');
+          expect(table.columns).to.have.length(1);
+          expect(table.columns[0].aggConfig.type.name).to.be('count');
+        });
+      });
+    });
+
+    describe('#split()', function () {
+      it('with break if the user has specified that splitting is to be disabled', function () {
+        var vis = new Vis(indexPattern, {
+          type: 'histogram',
+          aggs: [
+            { type: 'terms', schema: 'split', params: { field: '_type' } },
+            { type: 'count', schema: 'metric' }
+          ]
+        });
+        var agg = vis.aggs.bySchemaName.split[0];
+        var buckets = new Buckets({ buckets: [ { key: 'apache' } ]});
+        var writer = new ResponseWriter(vis, { canSplit: false });
+
+        expect(function () {
+          writer.split(agg, buckets, _.noop);
+        }).to.throwException(/splitting is disabled/);
+      });
+
+      it('forks the acrStack and rewrites the parents', function () {
+        var vis = new Vis(indexPattern, {
+          type: 'histogram',
+          aggs: [
+            { type: 'terms', params: { field: 'extension' }, schema: 'segment' },
+            { type: 'terms', params: { field: '_type' }, schema: 'split' },
+            { type: 'terms', params: { field: 'machine.os' }, schema: 'segment' },
+            { type: 'count', schema: 'metric' }
+          ]
+        });
+
+        var writer = new ResponseWriter(vis, { asAggConfigResults: true });
+        var extensions = new Buckets({ buckets: [ { key: 'jpg' }, { key: 'png' } ] });
+        var types = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
+        var os = new Buckets({ buckets: [ { key: 'window' }, { key: 'osx' } ] });
+
+        extensions.forEach(function (b, extension) {
+          writer.cell(vis.aggs[0], extension, function () {
+            writer.split(vis.aggs[1], types, function () {
+              os.forEach(function (b, os) {
+                writer.cell(vis.aggs[2], os, function () {
+                  writer.cell(vis.aggs[3], 200, function () {
+                    writer.row();
+                  });
+                });
+              });
+            });
+          });
+        });
+
+        var tables = _.flattenDeep(_.pluck(writer.response().tables, 'tables'));
+        expect(tables.length).to.be(types.length);
+
+        // collect the far left acr from each table
+        var leftAcrs = _.pluck(tables, 'rows[0][0]');
+
+        leftAcrs.forEach(function (acr, i, acrs) {
+          expect(acr.aggConfig).to.be(vis.aggs[0]);
+          expect(acr.$parent.aggConfig).to.be(vis.aggs[1]);
+          expect(acr.$parent.$parent).to.be(void 0);
+
+          // for all but the last acr, compare to the next
+          if (i + 1 >= acrs.length) return;
+          var acr2 = leftAcrs[i + 1];
+
+          expect(acr.key).to.be(acr2.key);
+          expect(acr.value).to.be(acr2.value);
+          expect(acr.aggConfig).to.be(acr2.aggConfig);
+          expect(acr.$parent).to.not.be(acr2.$parent);
+        });
+      });
+
+
+    });
+
+    describe('#cell()', function () {
+      it('logs a cell in the ResponseWriters row buffer, calls the block arg, then removes the value from the buffer',
+      function () {
+        var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+        var writer = new ResponseWriter(vis);
+
+        expect(writer.rowBuffer).to.have.length(0);
+        writer.cell({}, 500, function () {
+          expect(writer.rowBuffer).to.have.length(1);
+          expect(writer.rowBuffer[0]).to.be(500);
+        });
+        expect(writer.rowBuffer).to.have.length(0);
+      });
+    });
+
+    describe('#row()', function () {
+      it('writes the ResponseWriters internal rowBuffer into a table', function () {
+        var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+        var writer = new ResponseWriter(vis);
+
+        var table = writer._table();
+        writer.cell({}, 1, function () {
+          writer.cell({}, 2, function () {
+            writer.cell({}, 3, function () {
+              writer.row();
+            });
+          });
+        });
+
+        expect(table.rows).to.have.length(1);
+        expect(table.rows[0]).to.eql([1, 2, 3]);
+      });
+
+      it('always writes to the table group at the top of the split stack', function () {
+        var vis = new Vis(indexPattern, {
+          type: 'histogram',
+          aggs: [
+            { type: 'terms', schema: 'split', params: { field: '_type' } },
+            { type: 'terms', schema: 'split', params: { field: 'extension' } },
+            { type: 'terms', schema: 'split', params: { field: 'machine.os' } },
+            { type: 'count', schema: 'metric' }
+          ]
+        });
+        var splits = vis.aggs.bySchemaName.split;
+
+        var type = splits[0];
+        var typeBuckets = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
+
+        var ext = splits[1];
+        var extBuckets = new Buckets({ buckets: [ { key: 'jpg' }, { key: 'png' } ] });
+
+        var os = splits[2];
+        var osBuckets = new Buckets({ buckets: [ { key: 'windows' }, { key: 'mac' } ] });
+
+        var count = vis.aggs[3];
+
+        var writer = new ResponseWriter(vis);
+        writer.split(type, typeBuckets, function () {
+          writer.split(ext, extBuckets, function () {
+            writer.split(os, osBuckets, function (bucket, key) {
+              writer.cell(count, key === 'windows' ? 1 : 2, function () {
+                writer.row();
+              });
+            });
+          });
+        });
+
+        var resp = writer.response();
+        var sum = 0;
+        var tables = 0;
+        (function recurse(t) {
+          if (t.tables) {
+            // table group
+            t.tables.forEach(function (tt) {
+              recurse(tt);
+            });
+          } else {
+            tables += 1;
+            // table
+            t.rows.forEach(function (row) {
+              row.forEach(function (cell) {
+                sum += cell;
+              });
+            });
+          }
+        }(resp));
+
+        expect(tables).to.be(8);
+        expect(sum).to.be(12);
+      });
+
+      it('writes partial rows for hierarchical vis', function () {
+        var vis = new Vis(indexPattern, {
+          type: 'pie',
+          aggs: [
+            { type: 'terms', schema: 'segment', params: { field: '_type' }},
+            { type: 'count', schema: 'metric' }
+          ]
+        });
+
+        var writer = new ResponseWriter(vis);
+        var table = writer._table();
+        writer.cell(vis.aggs[0], 'apache', function () {
+          writer.row();
+        });
+
+        expect(table.rows).to.have.length(1);
+        expect(table.rows[0]).to.eql(['apache', '']);
+      });
+
+      it('skips partial rows for non-hierarchical vis', function () {
+        var vis = new Vis(indexPattern, {
+          type: 'histogram',
+          aggs: [
+            { type: 'terms', schema: 'segment', params: { field: '_type' }},
+            { type: 'count', schema: 'metric' }
+          ]
+        });
+
+        var writer = new ResponseWriter(vis);
+        var table = writer._table();
+        writer.cell(vis.aggs[0], 'apache', function () {
+          writer.row();
+        });
+
+        expect(table.rows).to.have.length(0);
+      });
+    });
+  });
+});
diff --git a/src/ui/public/agg_response/tabify/__tests__/_table.js b/src/ui/public/agg_response/tabify/__tests__/_table.js
new file mode 100644
index 0000000000000..d65a93b1e906e
--- /dev/null
+++ b/src/ui/public/agg_response/tabify/__tests__/_table.js
@@ -0,0 +1,82 @@
+describe('Table class', function () {
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var Table;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private, $injector) {
+    Table = Private(require('ui/agg_response/tabify/_table'));
+  }));
+
+  it('exposes rows array, but not the columns', function () {
+    var table = new Table();
+    expect(table.rows).to.be.an('array');
+    expect(table.columns == null).to.be.ok();
+  });
+
+  describe('#aggConfig', function () {
+    it('accepts a column from the table and returns its agg config', function () {
+      var table = new Table();
+      var football = {};
+      var column = {
+        aggConfig: football
+      };
+
+      expect(table.aggConfig(column)).to.be(football);
+    });
+
+    it('throws a TypeError if the column is malformed', function () {
+      expect(function () {
+        var notAColumn = {};
+        (new Table()).aggConfig(notAColumn);
+      }).to.throwException(TypeError);
+    });
+  });
+
+  describe('#title', function () {
+    it('returns nothing if the table is not part of a table group', function () {
+      var table = new Table();
+      expect(table.title()).to.be('');
+    });
+
+    it('returns the title of the TableGroup if the table is part of one', function () {
+      var table = new Table();
+      table.$parent = {
+        title: 'TableGroup Title',
+        tables: [table]
+      };
+
+      expect(table.title()).to.be('TableGroup Title');
+    });
+  });
+
+  describe('#field', function () {
+    it('calls the columns aggConfig#field() method', function () {
+      var table = new Table();
+      var football = {};
+      var column = {
+        aggConfig: {
+          field: _.constant(football)
+        }
+      };
+
+      expect(table.field(column)).to.be(football);
+    });
+  });
+
+  describe('#fieldFormatter', function () {
+    it('calls the columns aggConfig#fieldFormatter() method', function () {
+      var table = new Table();
+      var football = {};
+      var column = {
+        aggConfig: {
+          fieldFormatter: _.constant(football)
+        }
+      };
+
+      expect(table.fieldFormatter(column)).to.be(football);
+    });
+  });
+});
diff --git a/src/ui/public/agg_response/tabify/__tests__/_table_group.js b/src/ui/public/agg_response/tabify/__tests__/_table_group.js
new file mode 100644
index 0000000000000..ead9e4e41e5ea
--- /dev/null
+++ b/src/ui/public/agg_response/tabify/__tests__/_table_group.js
@@ -0,0 +1,18 @@
+describe('Table Group class', function () {
+  var TableGroup;
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private, $injector) {
+    TableGroup = Private(require('ui/agg_response/tabify/_table_group'));
+  }));
+
+  it('exposes tables array and empty aggConfig, key and title', function () {
+    var tableGroup = new TableGroup();
+    expect(tableGroup.tables).to.be.an('array');
+    expect(tableGroup.aggConfig).to.be(null);
+    expect(tableGroup.key).to.be(null);
+    expect(tableGroup.title).to.be(null);
+  });
+});
diff --git a/src/ui/public/agg_response/tabify/__tests__/tabify.js b/src/ui/public/agg_response/tabify/__tests__/tabify.js
new file mode 100644
index 0000000000000..9981cfb5c6cda
--- /dev/null
+++ b/src/ui/public/agg_response/tabify/__tests__/tabify.js
@@ -0,0 +1,8 @@
+describe('Tabify Agg Response', function () {
+  require('./_get_columns');
+  require('./_buckets');
+  require('./_table');
+  require('./_table_group');
+  require('./_response_writer');
+  require('./_integration');
+});
diff --git a/src/kibana/components/agg_response/tabify/_buckets.js b/src/ui/public/agg_response/tabify/_buckets.js
similarity index 100%
rename from src/kibana/components/agg_response/tabify/_buckets.js
rename to src/ui/public/agg_response/tabify/_buckets.js
diff --git a/src/ui/public/agg_response/tabify/_get_columns.js b/src/ui/public/agg_response/tabify/_get_columns.js
new file mode 100644
index 0000000000000..aec05e59659f7
--- /dev/null
+++ b/src/ui/public/agg_response/tabify/_get_columns.js
@@ -0,0 +1,51 @@
+define(function (require) {
+  return function GetColumnsProvider(Private) {
+    var _ = require('lodash');
+    var AggConfig = Private(require('ui/Vis/AggConfig'));
+
+    return function getColumns(vis, minimal) {
+      var aggs = vis.aggs.getResponseAggs();
+
+      if (minimal == null) minimal = !vis.isHierarchical();
+
+      if (!vis.aggs.bySchemaGroup.metrics) {
+        aggs.push(new AggConfig(vis, {
+          type: 'count',
+          schema: vis.type.schemas.metrics[0].name
+        }));
+      }
+
+      // pick the columns
+      if (minimal) {
+        return aggs.map(function (agg) {
+          return { aggConfig: agg };
+        });
+      }
+
+      // supposed to be bucket,...metrics,bucket,...metrics
+      var columns = [];
+
+      // seperate the metrics
+      var grouped = _.groupBy(aggs, function (agg) {
+        return agg.schema.group;
+      });
+
+      if (!grouped.buckets) {
+        // return just the metrics, in column format
+        return grouped.metrics.map(function (agg) {
+          return { aggConfig: agg };
+        });
+      }
+
+      // return the buckets, and after each place all of the metrics
+      grouped.buckets.forEach(function (agg, i) {
+        columns.push({ aggConfig: agg });
+        grouped.metrics.forEach(function (metric) {
+          columns.push({ aggConfig: metric });
+        });
+      });
+
+      return columns;
+    };
+  };
+});
\ No newline at end of file
diff --git a/src/ui/public/agg_response/tabify/_response_writer.js b/src/ui/public/agg_response/tabify/_response_writer.js
new file mode 100644
index 0000000000000..e5d23d4f964c3
--- /dev/null
+++ b/src/ui/public/agg_response/tabify/_response_writer.js
@@ -0,0 +1,282 @@
+define(function (require) {
+  return function TabbedAggResponseWriterProvider(Private) {
+    var _ = require('lodash');
+    var Table = Private(require('ui/agg_response/tabify/_table'));
+    var TableGroup = Private(require('ui/agg_response/tabify/_table_group'));
+    var getColumns = Private(require('ui/agg_response/tabify/_get_columns'));
+
+    var AggConfigResult = require('ui/Vis/AggConfigResult');
+
+    _.class(SplitAcr).inherits(AggConfigResult);
+    function SplitAcr(agg, parent, key) {
+      SplitAcr.Super.call(this, agg, parent, key, key);
+    }
+
+    /**
+     * Writer class that collects information about an aggregation response and
+     * produces a table, or a series of tables.
+     *
+     * @param {Vis} vis - the vis object to which the aggregation response correlates
+     */
+    function TabbedAggResponseWriter(vis, opts) {
+      this.vis = vis;
+      this.opts = opts || {};
+      this.rowBuffer = [];
+
+      var visIsHier = vis.isHierarchical();
+
+      // do the options allow for splitting? we will only split if true and
+      // tabify calls the split method.
+      this.canSplit = this.opts.canSplit !== false;
+
+      // should we allow partial rows to be included in the tables? if a
+      // partial row is found, it is filled with empty strings ''
+      this.partialRows = this.opts.partialRows == null ? visIsHier : this.opts.partialRows;
+
+      // if true, we will not place metric columns after every bucket
+      // even if the vis is hierarchical. if false, and the vis is
+      // hierarchical, then we will display metric columns after
+      // every bucket col
+      this.minimalColumns = visIsHier ? !!this.opts.minimalColumns : true;
+
+      // true if we can expect metrics to have been calculated
+      // for every bucket
+      this.metricsForAllBuckets = visIsHier;
+
+      // if true, values will be wrapped in aggConfigResult objects which link them
+      // to their aggConfig and enable the filterbar and tooltip formatters
+      this.asAggConfigResults = !!this.opts.asAggConfigResults;
+
+      this.columns = getColumns(vis, this.minimalColumns);
+      this.aggStack = _.pluck(this.columns, 'aggConfig');
+
+      this.root = new TableGroup();
+      this.acrStack = [];
+      this.splitStack = [this.root];
+    }
+
+    /**
+     * Create a Table of TableGroup object, link it to it's parent (if any), and determine if
+     * it's the root
+     *
+     * @param  {boolean} group - is this a TableGroup or just a normal Table
+     * @param  {AggConfig} agg - the aggregation that create this table, only applies to groups
+     * @param  {any} key - the bucketKey that this table relates to
+     * @return {Table/TableGroup} table - the created table
+     */
+    TabbedAggResponseWriter.prototype._table = function (group, agg, key) {
+      var Class = (group) ? TableGroup : Table;
+      var table = new Class();
+      var parent = this.splitStack[0];
+
+      if (group) {
+        table.aggConfig = agg;
+        table.key = key;
+        table.title =  (table.fieldFormatter()(key)) + ': ' + agg.makeLabel() ;
+      }
+
+      // link the parent and child
+      table.$parent = parent;
+      parent.tables.push(table);
+
+      return table;
+    };
+
+    /**
+     * Enter into a split table, called for each bucket of a splitting agg. The new table
+     * is either created or located using the agg and key arguments, and then the block is
+     * executed with the table as it's this context. Within this function, you should
+     * walk into the remaining branches and end up writing some rows to the table.
+     *
+     * @param  {aggConfig} agg - the aggConfig that created this split
+     * @param  {Buckets} buckets - the buckets produces by the agg
+     * @param  {function} block - a function to execute for each sub bucket
+     */
+    TabbedAggResponseWriter.prototype.split = function (agg, buckets, block) {
+      var self = this;
+
+      if (!self.canSplit) {
+        throw new Error('attempted to split when splitting is disabled');
+      }
+
+      self._removeAggFromColumns(agg);
+
+      buckets.forEach(function (bucket, key) {
+        // find the existing split that we should extend
+        var tableGroup = _.find(self.splitStack[0].tables, { aggConfig: agg, key: key });
+        // create the split if it doesn't exist yet
+        if (!tableGroup) tableGroup = self._table(true, agg, key);
+
+        var splitAcr = false;
+        if (self.asAggConfigResults) {
+          splitAcr = self._injectParentSplit(agg, key);
+        }
+
+        // push the split onto the stack so that it will receive written tables
+        self.splitStack.unshift(tableGroup);
+
+        // call the block
+        if (_.isFunction(block)) block.call(self, bucket, key);
+
+        // remove the split from the stack
+        self.splitStack.shift();
+        splitAcr && _.pull(self.acrStack, splitAcr);
+      });
+    };
+
+    TabbedAggResponseWriter.prototype._removeAggFromColumns = function (agg) {
+      var i = _.findIndex(this.columns, function (col) {
+        return col.aggConfig === agg;
+      });
+
+      // we must have already removed this column
+      if (i === -1) return;
+
+      this.columns.splice(i, 1);
+
+      if (this.minimalColumns) return;
+
+      // hierarchical vis creats additional columns for each bucket
+      // we will remove those too
+      var mCol = this.columns.splice(i, 1).pop();
+      var mI = _.findIndex(this.aggStack, function (agg) {
+        return agg === mCol.aggConfig;
+      });
+
+      if (mI > -1) this.aggStack.splice(mI, 1);
+    };
+
+    /**
+     * When a split is found while building the aggConfigResult tree, we
+     * want to push the split into the tree at another point. Since each
+     * branch in the tree is a double-linked list we need do some special
+     * shit to pull this off.
+     *
+     * @private
+     * @param {AggConfig} - The agg which produced the split bucket
+     * @param {any} - The value which identifies the bucket
+     * @return {SplitAcr} - the AggConfigResult created for the split bucket
+     */
+    TabbedAggResponseWriter.prototype._injectParentSplit = function (agg, key) {
+      var oldList = this.acrStack;
+      var newList = this.acrStack = [];
+
+      // walk from right to left through the old stack
+      // and move things to the new stack
+      var injected = false;
+
+      if (!oldList.length) {
+        injected = new SplitAcr(agg, null, key);
+        newList.unshift(injected);
+        return injected;
+      }
+
+      // walk from right to left, emptying the previous list
+      while (oldList.length) {
+        var acr = oldList.pop();
+
+        // ignore other splits
+        if (acr instanceof SplitAcr) {
+          newList.unshift(acr);
+          continue;
+        }
+
+        // inject the split
+        if (!injected) {
+          injected = new SplitAcr(agg, newList[0], key);
+          newList.unshift(injected);
+        }
+
+        var newAcr = new AggConfigResult(acr.aggConfig, newList[0], acr.value, acr.aggConfig.getKey(acr));
+        newList.unshift(newAcr);
+
+        // and replace the acr in the row buffer if its there
+        var rowI = this.rowBuffer.indexOf(acr);
+        if (rowI > -1) {
+          this.rowBuffer[rowI] = newAcr;
+        }
+      }
+
+      return injected;
+    };
+
+    /**
+     * Push a value into the row, then run a block. Once the block is
+     * complete the value is pulled from the stack.
+     *
+     * @param  {any} value - the value that should be added to the row
+     * @param  {function} block - the function to run while this value is in the row
+     * @return {any} - the value that was added
+     */
+    TabbedAggResponseWriter.prototype.cell = function (agg, value, block) {
+      if (this.asAggConfigResults) {
+        value = new AggConfigResult(agg, this.acrStack[0], value, value);
+      }
+
+      var staskResult = this.asAggConfigResults && value.type === 'bucket';
+
+      this.rowBuffer.push(value);
+      if (staskResult) this.acrStack.unshift(value);
+
+      if (_.isFunction(block)) block.call(this);
+
+      this.rowBuffer.pop(value);
+      if (staskResult) this.acrStack.shift();
+
+      return value;
+    };
+
+    /**
+     * Create a new row by reading the row buffer. This will do nothing if
+     * the row is incomplete and the vis this data came from is NOT flagged as
+     * hierarchical.
+     *
+     * @param  {array} [buffer] - optional buffer to use in place of the stored rowBuffer
+     * @return {undefined}
+     */
+    TabbedAggResponseWriter.prototype.row = function (buffer) {
+      var cells = buffer || this.rowBuffer.slice(0);
+
+      if (!this.partialRows && cells.length < this.columns.length) {
+        return;
+      }
+
+      var split = this.splitStack[0];
+      var table = split.tables[0] || this._table(false);
+
+      while (cells.length < this.columns.length) cells.push('');
+      table.rows.push(cells);
+      return table;
+    };
+
+    /**
+     * Get the actual response
+     *
+     * @return {object} - the final table-tree
+     */
+    TabbedAggResponseWriter.prototype.response = function () {
+      var columns = this.columns;
+
+      // give the columns some metadata
+      columns.map(function (col) {
+        col.title = col.aggConfig.makeLabel();
+      });
+
+      // walk the tree and write the columns to each table
+      (function step(table, group) {
+        if (table.tables) table.tables.forEach(step);
+        else table.columns = columns.slice(0);
+      }(this.root));
+
+      if (this.canSplit) return this.root;
+
+      var table = this.root.tables[0];
+      if (!table) return;
+
+      delete table.$parent;
+      return table;
+    };
+
+    return TabbedAggResponseWriter;
+  };
+});
diff --git a/src/kibana/components/agg_response/tabify/_table.js b/src/ui/public/agg_response/tabify/_table.js
similarity index 100%
rename from src/kibana/components/agg_response/tabify/_table.js
rename to src/ui/public/agg_response/tabify/_table.js
diff --git a/src/kibana/components/agg_response/tabify/_table_group.js b/src/ui/public/agg_response/tabify/_table_group.js
similarity index 100%
rename from src/kibana/components/agg_response/tabify/_table_group.js
rename to src/ui/public/agg_response/tabify/_table_group.js
diff --git a/src/ui/public/agg_response/tabify/tabify.js b/src/ui/public/agg_response/tabify/tabify.js
new file mode 100644
index 0000000000000..c0bff14aacdff
--- /dev/null
+++ b/src/ui/public/agg_response/tabify/tabify.js
@@ -0,0 +1,103 @@
+define(function (require) {
+  return function tabifyAggResponseProvider(Private, Notifier) {
+    var _ = require('lodash');
+
+    var AggConfig = Private(require('ui/Vis/AggConfig'));
+    var TabbedAggResponseWriter = Private(require('ui/agg_response/tabify/_response_writer'));
+    var Buckets = Private(require('ui/agg_response/tabify/_buckets'));
+    var notify = new Notifier({ location: 'agg_response/tabify'});
+
+    function tabifyAggResponse(vis, esResponse, respOpts) {
+      var write = new TabbedAggResponseWriter(vis, respOpts);
+
+      var topLevelBucket = _.assign({}, esResponse.aggregations, {
+        doc_count: esResponse.hits.total
+      });
+
+      collectBucket(write, topLevelBucket);
+
+      return write.response();
+    }
+
+    /**
+     * read an aggregation from a bucket, which is *might* be found at key (if
+     * the response came in object form), and will recurse down the aggregation
+     * tree and will pass the read values to the ResponseWriter.
+     *
+     * @param {object} bucket - a bucket from the aggResponse
+     * @param {undefined|string} key - the key where the bucket was found
+     * @returns {undefined}
+     */
+    function collectBucket(write, bucket, key) {
+      var agg = write.aggStack.shift();
+
+      switch (agg.schema.group) {
+      case 'buckets':
+        var buckets = new Buckets(bucket[agg.id]);
+        if (buckets.length) {
+          var splitting = write.canSplit && agg.schema.name === 'split';
+          if (splitting) {
+            write.split(agg, buckets, function forEachBucket(subBucket, key) {
+              collectBucket(write, subBucket, agg.getKey(subBucket), key);
+            });
+          } else {
+            buckets.forEach(function (subBucket, key) {
+              write.cell(agg, agg.getKey(subBucket, key), function () {
+                collectBucket(write, subBucket, agg.getKey(subBucket, key));
+              });
+            });
+          }
+        } else if (write.partialRows && write.metricsForAllBuckets && write.minimalColumns) {
+          // we don't have any buckets, but we do have metrics at this
+          // level, then pass all the empty buckets and jump back in for
+          // the metrics.
+          write.aggStack.unshift(agg);
+          passEmptyBuckets(write, bucket, key);
+          write.aggStack.shift();
+        } else {
+          // we don't have any buckets, and we don't have isHierarchical
+          // data, so no metrics, just try to write the row
+          write.row();
+        }
+        break;
+      case 'metrics':
+        var value = agg.getValue(bucket);
+        write.cell(agg, value, function () {
+          if (!write.aggStack.length) {
+            // row complete
+            write.row();
+          } else {
+            // process the next agg at this same level
+            collectBucket(write, bucket, key);
+          }
+        });
+        break;
+      }
+
+      write.aggStack.unshift(agg);
+    }
+
+    // write empty values for each bucket agg, then write
+    // the metrics from the initial bucket using collectBucket()
+    function passEmptyBuckets(write, bucket, key) {
+      var agg = write.aggStack.shift();
+
+      switch (agg.schema.group) {
+      case 'metrics':
+        // pass control back to collectBucket()
+        write.aggStack.unshift(agg);
+        collectBucket(write, bucket, key);
+        return;
+
+      case 'buckets':
+        write.cell(agg, '', function () {
+          passEmptyBuckets(write, bucket, key);
+        });
+      }
+
+      write.aggStack.unshift(agg);
+    }
+
+    return notify.timed('tabify agg response', tabifyAggResponse);
+  };
+});
diff --git a/src/ui/public/agg_table/__tests__/_group.js b/src/ui/public/agg_table/__tests__/_group.js
new file mode 100644
index 0000000000000..945a2f274dd6b
--- /dev/null
+++ b/src/ui/public/agg_table/__tests__/_group.js
@@ -0,0 +1,88 @@
+describe('AggTableGroup Directive', function () {
+  var _ = require('lodash');
+  var $ = require('jquery');
+  var ngMock = require('ngMock');
+  var expect = require('expect.js');
+  var fixtures = require('fixtures/fake_hierarchical_data');
+
+  var $rootScope;
+  var $compile;
+  var tabifyAggResponse;
+  var Vis;
+  var indexPattern;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function ($injector, Private) {
+    tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify'));
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    Vis = Private(require('ui/Vis'));
+
+    $rootScope = $injector.get('$rootScope');
+    $compile = $injector.get('$compile');
+  }));
+
+  var $scope;
+  beforeEach(function () {
+    $scope = $rootScope.$new();
+  });
+  afterEach(function () {
+    $scope.$destroy();
+  });
+
+
+  it('renders a simple split response properly', function () {
+    var vis = new Vis(indexPattern, 'table');
+    $scope.group = tabifyAggResponse(vis, fixtures.metricOnly);
+    var $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
+
+    $compile($el)($scope);
+    $scope.$digest();
+
+    // should create one sub-tbale
+    expect($el.find('kbn-agg-table').size()).to.be(1);
+  });
+
+  it('renders nothing if the table list is empty', function () {
+    var $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
+
+    $scope.group = {
+      tables: []
+    };
+
+    $compile($el)($scope);
+    $scope.$digest();
+
+    var $subTables = $el.find('kbn-agg-table');
+    expect($subTables.size()).to.be(0);
+  });
+
+  it('renders a complex response properly', function () {
+    var vis = new Vis(indexPattern, {
+      type: 'pie',
+      aggs: [
+        { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
+        { type: 'terms', schema: 'split', params: { field: 'extension' } },
+        { type: 'terms', schema: 'segment', params: { field: 'geo.src' } },
+        { type: 'terms', schema: 'segment', params: { field: 'machine.os' } }
+      ]
+    });
+    vis.aggs.forEach(function (agg, i) {
+      agg.id = 'agg_' + (i + 1);
+    });
+
+    var group = $scope.group = tabifyAggResponse(vis, fixtures.threeTermBuckets);
+    var $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
+    $compile($el)($scope);
+    $scope.$digest();
+
+    var $subTables = $el.find('kbn-agg-table');
+    expect($subTables.size()).to.be(3);
+
+    var $subTableHeaders = $el.find('.agg-table-group-header');
+    expect($subTableHeaders.size()).to.be(3);
+
+    $subTableHeaders.each(function (i) {
+      expect($(this).text()).to.be(group.tables[i].title);
+    });
+  });
+});
diff --git a/src/ui/public/agg_table/__tests__/_table.js b/src/ui/public/agg_table/__tests__/_table.js
new file mode 100644
index 0000000000000..0347f05986496
--- /dev/null
+++ b/src/ui/public/agg_table/__tests__/_table.js
@@ -0,0 +1,184 @@
+describe('AggTable Directive', function () {
+  var _ = require('lodash');
+  var $ = require('jquery');
+  var ngMock = require('ngMock');
+  var expect = require('expect.js');
+  var fixtures = require('fixtures/fake_hierarchical_data');
+  var sinon = require('auto-release-sinon');
+
+  var $rootScope;
+  var $compile;
+  var tabifyAggResponse;
+  var Vis;
+  var indexPattern;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function ($injector, Private) {
+    tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify'));
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    Vis = Private(require('ui/Vis'));
+
+    $rootScope = $injector.get('$rootScope');
+    $compile = $injector.get('$compile');
+  }));
+
+  var $scope;
+  beforeEach(function () {
+    $scope = $rootScope.$new();
+  });
+  afterEach(function () {
+    $scope.$destroy();
+  });
+
+
+  it('renders a simple response properly', function () {
+    var vis = new Vis(indexPattern, 'table');
+    $scope.table = tabifyAggResponse(vis, fixtures.metricOnly, { canSplit: false });
+
+    var $el = $compile('<kbn-agg-table table="table"></kbn-agg-table>')($scope);
+    $scope.$digest();
+
+    expect($el.find('tbody').size()).to.be(1);
+    expect($el.find('td').size()).to.be(1);
+    expect($el.find('td').text()).to.eql(1000);
+  });
+
+  it('renders nothing if the table is empty', function () {
+    $scope.table = null;
+    var $el = $compile('<kbn-agg-table table="table"></kbn-agg-table>')($scope);
+    $scope.$digest();
+
+    expect($el.find('tbody').size()).to.be(0);
+  });
+
+  it('renders a complex response properly', function () {
+    var vis = new Vis(indexPattern, {
+      type: 'pie',
+      aggs: [
+        { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
+        { type: 'terms', schema: 'split', params: { field: 'extension' } },
+        { type: 'terms', schema: 'segment', params: { field: 'geo.src' } },
+        { type: 'terms', schema: 'segment', params: { field: 'machine.os' } }
+      ]
+    });
+    vis.aggs.forEach(function (agg, i) {
+      agg.id = 'agg_' + (i + 1);
+    });
+
+    $scope.table = tabifyAggResponse(vis, fixtures.threeTermBuckets, { canSplit: false });
+    var $el = $('<kbn-agg-table table="table"></kbn-agg-table>');
+    $compile($el)($scope);
+    $scope.$digest();
+
+    expect($el.find('tbody').size()).to.be(1);
+
+    var $rows = $el.find('tbody tr');
+    expect($rows.size()).to.be.greaterThan(0);
+
+    function validBytes(str) {
+      expect(str).to.match(/^\d+$/);
+      var bytesAsNum = _.parseInt(str);
+      expect(bytesAsNum === 0 || bytesAsNum > 1000).to.be.ok();
+    }
+
+    $rows.each(function (i) {
+      // 6 cells in every row
+      var $cells = $(this).find('td');
+      expect($cells.size()).to.be(6);
+
+      var txts = $cells.map(function () {
+        return $(this).text().trim();
+      });
+
+      // two character country code
+      expect(txts[0]).to.match(/^(png|jpg|gif|html|css)$/);
+      validBytes(txts[1]);
+
+      // country
+      expect(txts[2]).to.match(/^\w\w$/);
+      validBytes(txts[3]);
+
+      // os
+      expect(txts[4]).to.match(/^(win|mac|linux)$/);
+      validBytes(txts[5]);
+    });
+  });
+
+  describe('aggTable.toCsv()', function () {
+    it('escapes and formats the rows and columns properly', function () {
+      var $el = $compile('<kbn-agg-table table="table">')($scope);
+      $scope.$digest();
+
+      var $tableScope = $el.isolateScope();
+      var aggTable = $tableScope.aggTable;
+
+      $tableScope.table = {
+        columns: [
+          { title: 'one' },
+          { title: 'two' },
+          { title: 'with double-quotes(")' }
+        ],
+        rows: [
+          [1, 2, '"foobar"']
+        ]
+      };
+
+      expect(aggTable.toCsv()).to.be(
+        'one,two,"with double-quotes("")"' + '\r\n' +
+        '1,2,"""foobar"""' + '\r\n'
+      );
+    });
+  });
+
+  describe('aggTable.exportAsCsv()', function () {
+    var origBlob;
+    function FakeBlob(slices, opts) {
+      this.slices = slices;
+      this.opts = opts;
+    }
+
+    beforeEach(function () {
+      origBlob = window.Blob;
+      window.Blob = FakeBlob;
+    });
+
+    afterEach(function () {
+      window.Blob = origBlob;
+    });
+
+    it('calls _saveAs properly', function () {
+      var $el = $compile('<kbn-agg-table table="table">')($scope);
+      $scope.$digest();
+
+      var $tableScope = $el.isolateScope();
+      var aggTable = $tableScope.aggTable;
+
+      var saveAs = sinon.stub(aggTable, '_saveAs');
+      $tableScope.table = {
+        columns: [
+          { title: 'one' },
+          { title: 'two' },
+          { title: 'with double-quotes(")' }
+        ],
+        rows: [
+          [1, 2, '"foobar"']
+        ]
+      };
+
+      aggTable.csv.filename = 'somefilename.csv';
+      aggTable.exportAsCsv();
+
+      expect(saveAs.callCount).to.be(1);
+      var call = saveAs.getCall(0);
+      expect(call.args[0]).to.be.a(FakeBlob);
+      expect(call.args[0].slices).to.eql([
+        'one,two,"with double-quotes("")"' + '\r\n' +
+        '1,2,"""foobar"""' + '\r\n'
+      ]);
+      expect(call.args[0].opts).to.eql({
+        type: 'text/plain'
+      });
+      expect(call.args[1]).to.be('somefilename.csv');
+    });
+  });
+});
diff --git a/src/ui/public/agg_table/__tests__/index.js b/src/ui/public/agg_table/__tests__/index.js
new file mode 100644
index 0000000000000..280fc13fb888b
--- /dev/null
+++ b/src/ui/public/agg_table/__tests__/index.js
@@ -0,0 +1,4 @@
+describe('AggTable Component', function () {
+  require('./_group');
+  require('./_table');
+});
diff --git a/src/kibana/components/agg_table/agg_table.html b/src/ui/public/agg_table/agg_table.html
similarity index 100%
rename from src/kibana/components/agg_table/agg_table.html
rename to src/ui/public/agg_table/agg_table.html
diff --git a/src/kibana/components/agg_table/agg_table.js b/src/ui/public/agg_table/agg_table.js
similarity index 90%
rename from src/kibana/components/agg_table/agg_table.js
rename to src/ui/public/agg_table/agg_table.js
index 3e1e98256fb85..75344384b4dfd 100644
--- a/src/kibana/components/agg_table/agg_table.js
+++ b/src/ui/public/agg_table/agg_table.js
@@ -1,16 +1,16 @@
 define(function (require) {
-  require('components/paginated_table/paginated_table');
-  require('services/compile_recursive_directive');
-  require('css!components/agg_table/agg_table.css');
+  require('ui/paginated_table');
+  require('ui/compile_recursive_directive');
+  require('ui/agg_table/agg_table.less');
 
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .directive('kbnAggTable', function ($filter, config, Private, compileRecursiveDirective) {
     var _ = require('lodash');
 
     return {
       restrict: 'E',
-      template: require('text!components/agg_table/agg_table.html'),
+      template: require('ui/agg_table/agg_table.html'),
       scope: {
         table: '=',
         perPage: '=?'
@@ -25,7 +25,7 @@ define(function (require) {
         var self = this;
 
         self.sort = null;
-        self._saveAs = require('file_saver');
+        self._saveAs = require('@spalger/filesaver').saveAs;
         self.csv = {
           separator: config.get('csv:separator'),
           quoteValues: config.get('csv:quoteValues')
diff --git a/src/ui/public/agg_table/agg_table.less b/src/ui/public/agg_table/agg_table.less
new file mode 100644
index 0000000000000..532cd0adcbe74
--- /dev/null
+++ b/src/ui/public/agg_table/agg_table.less
@@ -0,0 +1,42 @@
+@import (reference) "~ui/styles/variables";
+
+kbn-agg-table,
+kbn-agg-table-group {
+  display: block;
+}
+
+.agg-table {
+  display: flex;
+  flex: 1 1 auto;
+  flex-direction: column;
+
+  &-paginated {
+    flex: 1 1 auto;
+    overflow: auto;
+
+    tr:hover td {
+      background-color: lighten(@gray-lighter, 4%);
+    }
+
+    .cell-hover:hover {
+      background-color: @gray-lighter;
+    }
+
+    th i.fa-sort {
+      color: @gray-light;
+    }
+  }
+
+  &-controls {
+    flex: 0 0 auto;
+    display: flex;
+    align-items: center;
+    margin: 10px 5px;
+
+    > paginate-controls {
+      flex: 1 0 auto;
+      margin: 0;
+      padding: 0;
+    }
+  }
+}
diff --git a/src/kibana/components/agg_table/agg_table_group.html b/src/ui/public/agg_table/agg_table_group.html
similarity index 100%
rename from src/kibana/components/agg_table/agg_table_group.html
rename to src/ui/public/agg_table/agg_table_group.html
diff --git a/src/kibana/components/agg_table/agg_table_group.js b/src/ui/public/agg_table/agg_table_group.js
similarity index 85%
rename from src/kibana/components/agg_table/agg_table_group.js
rename to src/ui/public/agg_table/agg_table_group.js
index 949f0c0b5a35b..8d331f734f425 100644
--- a/src/kibana/components/agg_table/agg_table_group.js
+++ b/src/ui/public/agg_table/agg_table_group.js
@@ -1,13 +1,13 @@
 define(function (require) {
-  require('services/compile_recursive_directive');
-  require('components/agg_table/agg_table');
+  require('ui/compile_recursive_directive');
+  require('ui/agg_table');
 
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .directive('kbnAggTableGroup', function (compileRecursiveDirective) {
     return {
       restrict: 'E',
-      template: require('text!components/agg_table/agg_table_group.html'),
+      template: require('ui/agg_table/agg_table_group.html'),
       scope: {
         group: '=',
         perPage: '=?'
diff --git a/src/ui/public/agg_types/AggParams.js b/src/ui/public/agg_types/AggParams.js
new file mode 100644
index 0000000000000..503335d9c567e
--- /dev/null
+++ b/src/ui/public/agg_types/AggParams.js
@@ -0,0 +1,73 @@
+define(function (require) {
+  return function AggParamsFactory(Private) {
+    require('ui/filters/label');
+
+    var _ = require('lodash');
+    var IndexedArray = require('ui/IndexedArray');
+
+    var paramTypeMap = {
+      field: Private(require('ui/agg_types/param_types/field')),
+      optioned: Private(require('ui/agg_types/param_types/optioned')),
+      regex: Private(require('ui/agg_types/param_types/regex')),
+      string: Private(require('ui/agg_types/param_types/string')),
+      json: Private(require('ui/agg_types/param_types/raw_json')),
+      _default: Private(require('ui/agg_types/param_types/base'))
+    };
+
+    /**
+     * Wraps a list of {{#crossLink "AggParam"}}{{/crossLink}} objects; owned by an {{#crossLink "AggType"}}{{/crossLink}}
+     *
+     * used to create:
+     *   - `FieldAggParam` – When the config has `name: "field"`
+     *   - `*AggParam` – When the type matches something in the map above
+     *   - `BaseAggParam` – All other params
+     *
+     * @class AggParams
+     * @constructor
+     * @extends IndexedArray
+     * @param {object[]} params - array of params that get new-ed up as AggParam objects as descibed above
+     */
+    _.class(AggParams).inherits(IndexedArray);
+    function AggParams(params) {
+      AggParams.Super.call(this, {
+        index: ['name'],
+        initialSet: params.map(function (config) {
+          var type = config.name === 'field' ? config.name : config.type;
+          var Class = paramTypeMap[type] || paramTypeMap._default;
+          return new Class(config);
+        })
+      });
+    }
+
+    /**
+     * Reads an aggConfigs
+     *
+     * @method write
+     * @param  {AggConfig} aggConfig
+     *         the AggConfig object who's type owns these aggParams and contains the param values for our param defs
+     * @param  {object} [locals]
+     *         an array of locals that will be available to the write function (can be used to enhance
+     *         the quality of things like date_histogram's "auto" interval)
+     * @return {object} output
+     *         output of the write calls, reduced into a single object. A `params: {}` property is exposed on the
+     *         output object which is used to create the agg dsl for the search request. All other properties
+     *         are dependent on the AggParam#write methods which should be studied for each AggType.
+     */
+    AggParams.prototype.write = function (aggConfig, locals) {
+      var output = { params: {} };
+      locals = locals || {};
+
+      this.forEach(function (param) {
+        if (param.write) {
+          param.write(aggConfig, output, locals);
+        } else {
+          output.params[param.name] = aggConfig.params[param.name];
+        }
+      });
+
+      return output;
+    };
+
+    return AggParams;
+  };
+});
diff --git a/src/ui/public/agg_types/AggType.js b/src/ui/public/agg_types/AggType.js
new file mode 100644
index 0000000000000..85231ddb3a85a
--- /dev/null
+++ b/src/ui/public/agg_types/AggType.js
@@ -0,0 +1,141 @@
+define(function (require) {
+  return function AggTypeFactory(Private) {
+    var _ = require('lodash');
+    var AggParams = Private(require('ui/agg_types/AggParams'));
+    var fieldFormats = Private(require('ui/registry/field_formats'));
+
+    /**
+     * Generic AggType Constructor
+     *
+     * Used to create the values exposed by the agg_types module.
+     *
+     * @class AggType
+     * @private
+     * @param {object} config - used to set the properties of the AggType
+     */
+    function AggType(config) {
+
+      /**
+       * the unique, unchanging, name that we have assigned this aggType
+       *
+       * @property name
+       * @type {string}
+       */
+      this.name = config.name;
+
+      /**
+       * the name of the elasticsearch aggregation that this aggType represents. Usually just this.name
+       *
+       * @property name
+       * @type {string}
+       */
+      this.dslName = config.dslName || config.name;
+
+      /**
+       * the user friendly name that will be shown in the ui for this aggType
+       *
+       * @property title
+       * @type {string}
+       */
+      this.title = config.title;
+
+      /**
+       * a function that will be called when this aggType is assigned to
+       * an aggConfig, and that aggConfig is being rendered (in a form, chart, etc.).
+       *
+       * @method makeLabel
+       * @param {AggConfig} aggConfig - an agg config of this type
+       * @returns {string} - label that can be used in the ui to descripe the aggConfig
+       */
+      this.makeLabel = config.makeLabel || _.constant(this.name);
+
+      /**
+       * Describes if this aggType creates data that is ordered, and if that ordered data
+       * is some sort of time series.
+       *
+       * If the aggType does not create ordered data, set this to something "falsey".
+       *
+       * If this does create orderedData, then the value should be an object.
+       *
+       * If the orderdata is some sort of time series, `this.ordered` should be an object
+       * with the property `date: true`
+       *
+       * @property ordered
+       * @type {object|undefined}
+       */
+      this.ordered = config.ordered;
+
+      /**
+       * Flag that prevents this aggregation from being included in the dsl. This is only
+       * used by the count aggregation (currently) since it doesn't really exist and it's output
+       * is available on every bucket.
+       *
+       * @type {Boolean}
+       */
+      this.hasNoDsl = !!config.hasNoDsl;
+
+      /**
+       * The method to create a filter representation of the bucket
+       * @param {object} aggConfig The instance of the aggConfig
+       * @param {mixed} key The key for the bucket
+       * @returns {object} The filter
+       */
+      this.createFilter = config.createFilter;
+
+      /**
+       * An instance of {{#crossLink "AggParams"}}{{/crossLink}}.
+       *
+       * @property params
+       * @type {AggParams}
+       */
+      this.params = config.params || [];
+      if (!(this.params instanceof AggParams)) {
+        // always append the raw JSON param
+        this.params.push({
+          name: 'json',
+          type: 'json',
+          advanced: true
+        });
+
+        this.params = new AggParams(this.params);
+      }
+
+      /**
+       * Designed for multi-value metric aggs, this method can return a
+       * set of AggConfigs that should replace this aggConfig in result sets
+       * that walk the AggConfig set.
+       *
+       * @method getResponseAggs
+       * @returns {array[AggConfig]|undefined} - an array of aggConfig objects
+       *                                         that should replace this one,
+       *                                         or undefined
+       */
+      this.getResponseAggs = config.getResponseAggs || _.noop;
+
+      /**
+       * A function that will be called each time an aggConfig of this type
+       * is created, giving the agg type a chance to modify the agg config
+       */
+      this.decorateAggConfig = config.decorateAggConfig || null;
+
+      if (config.getFormat) {
+        this.getFormat = config.getFormat;
+      }
+    }
+
+    /**
+     * Pick a format for the values produced by this agg type,
+     * overriden by several metrics that always output a simple
+     * number
+     *
+     * @param  {agg} agg - the agg to pick a format for
+     * @return {FieldFromat}
+     */
+    AggType.prototype.getFormat = function (agg) {
+      var field = agg.field();
+      return field ? field.format : fieldFormats.getDefaultInstance('string');
+    };
+
+    return AggType;
+  };
+});
diff --git a/src/ui/public/agg_types/__tests__/AggParamWriter.js b/src/ui/public/agg_types/__tests__/AggParamWriter.js
new file mode 100644
index 0000000000000..b37ff90795d57
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/AggParamWriter.js
@@ -0,0 +1,104 @@
+module.exports = function AggParamWriterHelper(Private) {
+  var _ = require('lodash');
+  var Vis = Private(require('ui/Vis'));
+  var aggTypes = Private(require('ui/agg_types/index'));
+  var visTypes = Private(require('ui/registry/vis_types'));
+  var stubbedLogstashIndexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+
+  /**
+   * Helper object for writing aggParams. Specify an aggType and it will find a vis & schema, and
+   * wire up the supporting objects required to feed in parameters, and get #write() output.
+   *
+   * Use cases:
+   *  - Verify that the interval parameter of the histogram visualization casts its input to a number
+   *    ```js
+   *    it('casts to a number', function () {
+   *      var writer = new AggParamWriter({ aggType: 'histogram' });
+   *      var output = writer.write({ interval : '100/10' });
+   *      expect(output.params.interval).to.be.a('number');
+   *      expect(output.params.interval).to.be(100);
+   *    });
+   *    ```
+   *
+   * @class AggParamWriter
+   * @param {object} opts - describe the properties of this paramWriter
+   * @param {string} opts.aggType - the name of the aggType we want to test. ('histogram', 'filter', etc.)
+   */
+  function AggParamWriter(opts) {
+    var self = this;
+
+    self.aggType = opts.aggType;
+    if (_.isString(self.aggType)) {
+      self.aggType = aggTypes.byName[self.aggType];
+    }
+
+    // not configurable right now, but totally required
+    self.indexPattern = stubbedLogstashIndexPattern;
+
+    // the vis type we will use to write the aggParams
+    self.visType = null;
+
+    // the schema that the aggType satisfies
+    self.visAggSchema = null;
+
+    // find a suitable vis type and schema
+    _.find(visTypes, function (visType) {
+      var schema = _.find(visType.schemas.all, function (schema) {
+        // type, type, type, type, type... :(
+        return schema.group === self.aggType.type;
+      });
+
+      if (schema) {
+        self.visType = visType;
+        self.visAggSchema = schema;
+        return true;
+      }
+    });
+
+    if (!self.aggType || !self.visType || !self.visAggSchema) {
+      throw new Error('unable to find a usable visType and schema for the ' + opts.aggType + ' agg type');
+    }
+
+    self.vis = new Vis(self.indexPattern, {
+      type: self.visType
+    });
+  }
+
+  AggParamWriter.prototype.write = function (paramValues) {
+    var self = this;
+    paramValues = _.clone(paramValues);
+
+    if (self.aggType.params.byName.field && !paramValues.field) {
+      // pick a field rather than force a field to be specified everywhere
+      if (self.aggType.type === 'metrics') {
+        paramValues.field = _.sample(self.indexPattern.fields.byType.number);
+      } else {
+        paramValues.field = _.sample(self.indexPattern.fields.byType.string);
+      }
+    }
+
+    self.vis.setState({
+      type: self.vis.type.name,
+      aggs: [{
+        type: self.aggType,
+        schema: self.visAggSchema,
+        params: paramValues
+      }]
+    });
+
+    var aggConfig = _.find(self.vis.aggs, function (aggConfig) {
+      return aggConfig.type === self.aggType;
+    });
+
+    aggConfig.type.params.forEach(function (param) {
+      if (param.onRequest) {
+        param.onRequest(aggConfig);
+      }
+    });
+
+    return aggConfig.type.params.write(aggConfig);
+  };
+
+  return AggParamWriter;
+
+};
diff --git a/src/ui/public/agg_types/__tests__/AggParams.js b/src/ui/public/agg_types/__tests__/AggParams.js
new file mode 100644
index 0000000000000..0d0c839fb9aef
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/AggParams.js
@@ -0,0 +1,102 @@
+describe('AggParams class', function () {
+  var _ = require('lodash');
+  var ngMock = require('ngMock');
+  var expect = require('expect.js');
+
+  var AggParams;
+  var BaseAggParam;
+  var FieldAggParam;
+  var OptionedAggParam;
+  var RegexAggParam;
+
+  beforeEach(ngMock.module('kibana'));
+  // stub out the param classes before we get the AggParams
+  beforeEach(ngMock.inject(require('./utils/_stub_agg_params')));
+  // fetch out deps
+  beforeEach(ngMock.inject(function (Private) {
+    AggParams = Private(require('ui/agg_types/AggParams'));
+    BaseAggParam = Private(require('ui/agg_types/param_types/base'));
+    FieldAggParam = Private(require('ui/agg_types/param_types/field'));
+    OptionedAggParam = Private(require('ui/agg_types/param_types/optioned'));
+    RegexAggParam = Private(require('ui/agg_types/param_types/regex'));
+  }));
+
+  describe('constructor args', function () {
+    it('accepts an array of param defs', function () {
+      var params = [
+        { name: 'one' },
+        { name: 'two' }
+      ];
+      var aggParams = new AggParams(params);
+
+      expect(aggParams).to.have.length(params.length);
+      expect(aggParams).to.be.an(Array);
+      expect(aggParams.byName).to.have.keys(['one', 'two']);
+    });
+  });
+
+  describe('AggParam creation', function () {
+    it('Uses the FieldAggParam class for params with the name "field"', function () {
+      var params = [
+        { name: 'field' }
+      ];
+      var aggParams = new AggParams(params);
+
+      expect(aggParams).to.have.length(params.length);
+      expect(aggParams[0]).to.be.a(FieldAggParam);
+    });
+
+    it('Uses the OptionedAggParam class for params of type "optioned"', function () {
+      var params = [
+        {
+          name: 'interval',
+          type: 'optioned'
+        }
+      ];
+      var aggParams = new AggParams(params);
+
+      expect(aggParams).to.have.length(params.length);
+      expect(aggParams[0]).to.be.a(OptionedAggParam);
+    });
+
+    it('Uses the RegexAggParam class for params of type "regex"', function () {
+      var params = [
+        {
+          name: 'exclude',
+          type: 'regex'
+        }
+      ];
+      var aggParams = new AggParams(params);
+
+      expect(aggParams).to.have.length(params.length);
+      expect(aggParams[0]).to.be.a(RegexAggParam);
+    });
+
+    it('Always converts the params to a BaseAggParam', function () {
+      var params = [
+        {
+          name: 'height',
+          editor: '<blink>high</blink>'
+        },
+        {
+          name: 'weight',
+          editor: '<blink>big</blink>'
+        },
+        {
+          name: 'waist',
+          editor: '<blink>small</blink>'
+        }
+      ];
+      var aggParams = new AggParams(params);
+
+      expect(BaseAggParam).to.have.property('callCount', params.length);
+      expect(FieldAggParam).to.have.property('callCount', 0);
+      expect(OptionedAggParam).to.have.property('callCount', 0);
+
+      expect(aggParams).to.have.length(params.length);
+      aggParams.forEach(function (aggParam) {
+        expect(aggParam).to.be.a(BaseAggParam);
+      });
+    });
+  });
+});
diff --git a/src/ui/public/agg_types/__tests__/AggType.js b/src/ui/public/agg_types/__tests__/AggType.js
new file mode 100644
index 0000000000000..2f3e37f317977
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/AggType.js
@@ -0,0 +1,174 @@
+describe('AggType Class', function () {
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+  var sinon = require('auto-release-sinon');
+  var AggType;
+  var AggParams;
+  var AggConfig;
+  var indexPattern;
+  var fieldFormat;
+  var Vis;
+
+  require('ui/private');
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    var AggParamsPM = require('ui/agg_types/AggParams');
+    AggParams = sinon.spy(Private(AggParamsPM));
+    Private.stub(AggParamsPM, AggParams);
+
+    Vis = Private(require('ui/Vis'));
+    fieldFormat = Private(require('ui/registry/field_formats'));
+    AggType = Private(require('ui/agg_types/AggType'));
+    AggConfig = Private(require('ui/Vis/AggConfig'));
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+  }));
+
+  describe('constructor', function () {
+
+    it('requires a config object as it\'s first param', function () {
+      expect(function () {
+        new AggType(null);
+      }).to.throwError();
+    });
+
+    describe('application of config properties', function () {
+      var copiedConfigProps = [
+        'name',
+        'title',
+        'makeLabel',
+        'ordered'
+      ];
+
+      describe('"' + copiedConfigProps.join('", "') + '"', function () {
+        it('assigns the config value to itself', function () {
+          var config = _.transform(copiedConfigProps, function (config, prop) {
+            config[prop] = {};
+          }, {});
+
+          var aggType = new AggType(config);
+
+          copiedConfigProps.forEach(function (prop) {
+            expect(aggType[prop]).to.be(config[prop]);
+          });
+        });
+      });
+
+      describe('makeLabel', function () {
+        it('makes a function when the makeLabel config is not specified', function () {
+          var someGetter = function () {};
+
+          var aggType = new AggType({
+            makeLabel: someGetter
+          });
+
+          expect(aggType.makeLabel).to.be(someGetter);
+
+          aggType = new AggType({
+            name: 'pizza'
+          });
+
+          expect(aggType.makeLabel).to.be.a('function');
+          expect(aggType.makeLabel()).to.be('pizza');
+        });
+      });
+
+      describe('getFormat', function () {
+        it('returns the formatter for the aggConfig', function () {
+          var aggType = new AggType({});
+
+          var vis = new Vis(indexPattern, {
+            type: 'histogram',
+            aggs: [
+              {
+                type: 'date_histogram',
+                schema: 'segment'
+              }
+            ]
+          });
+
+          var aggConfig = vis.aggs.byTypeName.date_histogram[0];
+
+          expect(aggType.getFormat(aggConfig)).to.be(fieldFormat.getDefaultInstance('date'));
+
+          vis = new Vis(indexPattern, {
+            type: 'metric',
+            aggs: [
+              {
+                type: 'count',
+                schema: 'metric'
+              }
+            ]
+          });
+          aggConfig = vis.aggs.byTypeName.count[0];
+
+          expect(aggType.getFormat(aggConfig)).to.be(fieldFormat.getDefaultInstance('string'));
+        });
+
+        it('can be overridden via config', function () {
+          var someGetter = function () {};
+
+          var aggType = new AggType({
+            getFormat: someGetter
+          });
+
+          expect(aggType.getFormat).to.be(someGetter);
+        });
+      });
+
+      describe('params', function () {
+        beforeEach(function () {
+          AggParams.reset();
+        });
+
+        it('defaults to AggParams object with JSON param', function () {
+          var aggType = new AggType({
+            name: 'smart agg'
+          });
+
+          expect(aggType.params).to.be.an(AggParams);
+          expect(aggType.params.length).to.be(1);
+          expect(aggType.params[0].name).to.be('json');
+        });
+
+        it('passes the params arg directly to the AggParams constructor', function () {
+          var params = [
+            {name: 'one'},
+            {name: 'two'}
+          ];
+          var paramLength = params.length + 1; // json is always appended
+
+          var aggType = new AggType({
+            name: 'bucketeer',
+            params: params
+          });
+
+          expect(aggType.params).to.be.an(AggParams);
+          expect(aggType.params.length).to.be(paramLength);
+          expect(AggParams.callCount).to.be(1);
+          expect(AggParams.firstCall.args[0]).to.be(params);
+        });
+      });
+
+      describe('getResponseAggs', function () {
+        it('copies the value', function () {
+          var football = {};
+          var aggType = new AggType({
+            getResponseAggs: football
+          });
+
+          expect(aggType.getResponseAggs).to.be(football);
+        });
+
+        it('defaults to _.noop', function () {
+          var aggType = new AggType({});
+
+          expect(aggType.getResponseAggs).to.be(_.noop);
+        });
+      });
+    });
+
+  });
+
+});
diff --git a/src/ui/public/agg_types/__tests__/bucketCountBetween.js b/src/ui/public/agg_types/__tests__/bucketCountBetween.js
new file mode 100644
index 0000000000000..45f716b99e408
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/bucketCountBetween.js
@@ -0,0 +1,205 @@
+describe('bucketCountBetween util', function () {
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+  var indexPattern;
+  var Vis;
+  var visTypes;
+  var aggTypes;
+  var AggConfig;
+  var bucketCountBetween;
+
+  // http://cwestblog.com/2014/02/25/javascript-testing-for-negative-zero/
+  // works for -0 and +0
+  function isNegative(n) {
+    return ((n = +n) || 1 / n) < 0;
+  }
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    Vis = Private(require('ui/Vis'));
+    visTypes = Private(require('ui/registry/vis_types'));
+    aggTypes = Private(require('ui/agg_types/index'));
+    AggConfig = Private(require('ui/Vis/AggConfig'));
+    bucketCountBetween = Private(require('ui/agg_types/buckets/_bucket_count_between'));
+  }));
+
+  it('returns a positive number when a is before b', function () {
+    var vis = new Vis(indexPattern, {
+      type: 'histogram',
+      aggs: [
+        {
+          type: 'date_histogram',
+          schema: 'segment'
+        },
+        {
+          type: 'terms',
+          schema: 'segment'
+        }
+      ]
+    });
+
+    var a = vis.aggs.byTypeName.date_histogram[0];
+    var b = vis.aggs.byTypeName.terms[0];
+    var count = bucketCountBetween(a, b);
+    expect(isNegative(count)).to.be(false);
+  });
+
+  it('returns a negative number when a is after b', function () {
+    var vis = new Vis(indexPattern, {
+      type: 'histogram',
+      aggs: [
+        {
+          type: 'date_histogram',
+          schema: 'segment'
+        },
+        {
+          type: 'terms',
+          schema: 'segment'
+        }
+      ]
+    });
+
+    var a = vis.aggs.byTypeName.terms[0];
+    var b = vis.aggs.byTypeName.date_histogram[0];
+    var count = bucketCountBetween(a, b);
+    expect(isNegative(count)).to.be(true);
+  });
+
+  it('returns 0 when there are no buckets between a and b', function () {
+    var vis = new Vis(indexPattern, {
+      type: 'histogram',
+      aggs: [
+        {
+          type: 'date_histogram',
+          schema: 'segment'
+        },
+        {
+          type: 'terms',
+          schema: 'segment'
+        }
+      ]
+    });
+
+    var a = vis.aggs.byTypeName.date_histogram[0];
+    var b = vis.aggs.byTypeName.terms[0];
+    expect(bucketCountBetween(a, b)).to.be(0);
+  });
+
+  it('returns null when b is not in the aggs', function () {
+    var vis = new Vis(indexPattern, {
+      type: 'histogram',
+      aggs: [
+        {
+          type: 'date_histogram',
+          schema: 'segment'
+        }
+      ]
+    });
+
+    var a = vis.aggs.byTypeName.date_histogram[0];
+    var b = new AggConfig(vis, {
+      type: 'terms',
+      schema: 'segment'
+    });
+
+    expect(bucketCountBetween(a, b)).to.be(null);
+  });
+
+  it('returns null when a is not in the aggs', function () {
+    var vis = new Vis(indexPattern, {
+      type: 'histogram',
+      aggs: [
+        {
+          type: 'date_histogram',
+          schema: 'segment'
+        }
+      ]
+    });
+
+    var a = new AggConfig(vis, {
+      type: 'terms',
+      schema: 'segment'
+    });
+    var b = vis.aggs.byTypeName.date_histogram[0];
+
+    expect(bucketCountBetween(a, b)).to.be(null);
+  });
+
+  it('returns null when a and b are not in the aggs', function () {
+    var vis = new Vis(indexPattern, {
+      type: 'histogram',
+      aggs: []
+    });
+
+    var a = new AggConfig(vis, {
+      type: 'terms',
+      schema: 'segment'
+    });
+
+    var b = new AggConfig(vis, {
+      type: 'date_histogram',
+      schema: 'segment'
+    });
+
+    expect(bucketCountBetween(a, b)).to.be(null);
+  });
+
+  function countTest(pre, post) {
+    return function () {
+      var schemas = visTypes.byName.histogram.schemas.buckets;
+
+      // slow for this test is actually somewhere around 1/2 a sec
+      this.slow(500);
+
+      function randBucketAggForVis(vis) {
+        var schema = _.sample(schemas);
+        var aggType = _.sample(aggTypes.byType.buckets);
+
+        return new AggConfig(vis, {
+          schema: schema,
+          type: aggType
+        });
+      }
+
+      _.times(50, function (n) {
+        var vis = new Vis(indexPattern, {
+          type: 'histogram',
+          aggs: []
+        });
+
+        var randBucketAgg = _.partial(randBucketAggForVis, vis);
+
+        var a = randBucketAgg();
+        var b = randBucketAgg();
+
+        // create n aggs between a and b
+        var aggs = [];
+        aggs.fill = function (n) {
+          for (var i = 0; i < n; i++) {
+            aggs.push(randBucketAgg());
+          }
+        };
+
+        pre && aggs.fill(_.random(0, 10));
+        aggs.push(a);
+        aggs.fill(n);
+        aggs.push(b);
+        post && aggs.fill(_.random(0, 10));
+
+        vis.setState({
+          type: 'histogram',
+          aggs: aggs
+        });
+
+        expect(bucketCountBetween(a, b)).to.be(n);
+      });
+    };
+  }
+
+  it('can count', countTest());
+  it('can count with elements before', countTest(true));
+  it('can count with elements after', countTest(false, true));
+  it('can count with elements before and after', countTest(true, true));
+});
diff --git a/src/ui/public/agg_types/__tests__/buckets/_histogram.js b/src/ui/public/agg_types/__tests__/buckets/_histogram.js
new file mode 100644
index 0000000000000..5da2bf18b56a1
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/buckets/_histogram.js
@@ -0,0 +1,113 @@
+describe('Histogram Agg', function () {
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  describe('ordered', function () {
+    var histogram;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      histogram = Private(require('ui/agg_types/index')).byName.histogram;
+    }));
+
+    it('is ordered', function () {
+      expect(histogram.ordered).to.be.ok();
+    });
+
+    it('is not ordered by date', function () {
+      expect(histogram.ordered).to.not.have.property('date');
+    });
+  });
+
+
+  describe('params', function () {
+    var paramWriter;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      var AggParamWriter = Private(require('../AggParamWriter'));
+      paramWriter = new AggParamWriter({ aggType: 'histogram' });
+    }));
+
+    describe('interval', function () {
+      // reads aggConfig.params.interval, writes to dsl.interval
+
+      it('accepts a number', function () {
+        var output = paramWriter.write({ interval: 100 });
+        expect(output.params).to.have.property('interval', 100);
+      });
+
+      it('accepts a string', function () {
+        var output = paramWriter.write({ interval: '10' });
+        expect(output.params).to.have.property('interval', 10);
+      });
+
+      it('fails on non-numeric values', function () {
+        // template validation prevents this from users, not devs
+        var output = paramWriter.write({ interval: [] });
+        expect(isNaN(output.params.interval)).to.be.ok();
+      });
+    });
+
+    describe('min_doc_count', function () {
+      it('casts true values to 0', function () {
+        var output = paramWriter.write({ min_doc_count: true });
+        expect(output.params).to.have.property('min_doc_count', 0);
+
+        output = paramWriter.write({ min_doc_count: 'yes' });
+        expect(output.params).to.have.property('min_doc_count', 0);
+
+        output = paramWriter.write({ min_doc_count: 1 });
+        expect(output.params).to.have.property('min_doc_count', 0);
+
+        output = paramWriter.write({ min_doc_count: {} });
+        expect(output.params).to.have.property('min_doc_count', 0);
+      });
+
+      it('writes nothing for false values', function () {
+        var output = paramWriter.write({ min_doc_count: '' });
+        expect(output.params).to.not.have.property('min_doc_count');
+
+        output = paramWriter.write({ min_doc_count: null });
+        expect(output.params).to.not.have.property('min_doc_count');
+
+        output = paramWriter.write({ min_doc_count: undefined });
+        expect(output.params).to.not.have.property('min_doc_count');
+      });
+    });
+
+    describe('extended_bounds', function () {
+      it('writes when only eb.min is set', function () {
+        var output = paramWriter.write({
+          extended_bounds: { min: 0 }
+        });
+        expect(output.params.extended_bounds).to.have.property('min', 0);
+        expect(output.params.extended_bounds).to.have.property('max', undefined);
+      });
+
+      it('writes when only eb.max is set', function () {
+        var output = paramWriter.write({
+          extended_bounds: { max: 0 }
+        });
+        expect(output.params.extended_bounds).to.have.property('min', undefined);
+        expect(output.params.extended_bounds).to.have.property('max', 0);
+      });
+
+      it('writes when both eb.min and eb.max are set', function () {
+        var output = paramWriter.write({
+          extended_bounds: { min: 99, max: 100 }
+        });
+        expect(output.params.extended_bounds).to.have.property('min', 99);
+        expect(output.params.extended_bounds).to.have.property('max', 100);
+      });
+
+      it('does not write when nothing is set', function () {
+        var output = paramWriter.write({
+          extended_bounds: {}
+        });
+        expect(output.params).to.not.have.property('extended_bounds');
+      });
+    });
+  });
+});
diff --git a/src/ui/public/agg_types/__tests__/buckets/_terms.js b/src/ui/public/agg_types/__tests__/buckets/_terms.js
new file mode 100644
index 0000000000000..ce117c7d96b08
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/buckets/_terms.js
@@ -0,0 +1,13 @@
+describe('Terms Agg', function () {
+  describe('order agg editor UI', function () {
+    it('defaults to the first metric agg');
+    it('adds "custom metric" option');
+    it('lists all metric agg responses');
+    it('lists individual values of a multi-value metric');
+    it('selects "custom metric" if there are no metric aggs');
+    it('is emptied if the selected metric is removed');
+    it('displays a metric editor if "custom metric" is selected');
+    it('saves the "custom metric" to state and refreshes from it');
+    it('invalidates the form if the metric agg form is not complete');
+  });
+});
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js
new file mode 100644
index 0000000000000..0fda99ee627da
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js
@@ -0,0 +1,102 @@
+
+describe('AggConfig Filters', function () {
+  describe('date_histogram', function () {
+    var _ = require('lodash');
+    var moment = require('moment');
+    var sinon = require('auto-release-sinon');
+    var aggResp = require('fixtures/agg_resp/date_histogram');
+    var ngMock = require('ngMock');
+    var expect = require('expect.js');
+
+    var vis;
+    var agg;
+    var field;
+    var filter;
+    var bucketKey;
+    var bucketStart;
+    var getIntervalStub;
+    var intervalOptions;
+
+    var init;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private, $injector) {
+      var Vis = Private(require('ui/Vis'));
+      var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+      var createFilter = Private(require('ui/agg_types/buckets/create_filter/date_histogram'));
+      var TimeBuckets = Private(require('ui/time_buckets'));
+      intervalOptions = Private(require('ui/agg_types/buckets/_interval_options'));
+
+      init = function (interval, duration) {
+        interval = interval || 'auto';
+        if (interval === 'custom') interval = agg.params.customInterval;
+        duration = duration || moment.duration(15, 'minutes');
+        field = _.sample(indexPattern.fields.byType.date);
+        vis = new Vis(indexPattern, {
+          type: 'histogram',
+          aggs: [
+            {
+              type: 'date_histogram',
+              schema: 'segment',
+              params: { field: field.name, interval: interval, customInterval: '5d' }
+            }
+          ]
+        });
+
+        agg = vis.aggs[0];
+        bucketKey = _.sample(aggResp.aggregations['1'].buckets).key;
+        bucketStart = moment(bucketKey);
+
+        var timePad = moment.duration(duration / 2);
+        agg.buckets.setBounds({
+          min: bucketStart.clone().subtract(timePad),
+          max: bucketStart.clone().add(timePad),
+        });
+        agg.buckets.setInterval(interval);
+
+        filter = createFilter(agg, bucketKey);
+      };
+    }));
+
+    it('creates a valid range filter', function () {
+      init();
+
+      expect(filter).to.have.property('range');
+      expect(filter.range).to.have.property(field.name);
+
+      var fieldParams = filter.range[field.name];
+      expect(fieldParams).to.have.property('gte');
+      expect(fieldParams.gte).to.be.a('number');
+
+      expect(fieldParams).to.have.property('lte');
+      expect(fieldParams.lte).to.be.a('number');
+
+      expect(fieldParams.gte).to.be.lessThan(fieldParams.lte);
+
+      expect(filter).to.have.property('meta');
+      expect(filter.meta).to.have.property('index', vis.indexPattern.id);
+    });
+
+
+    it('extends the filter edge to 1ms before the next bucket for all interval options', function () {
+      intervalOptions.forEach(function (option) {
+        var duration;
+        if (option.val !== 'custom' && moment(1, option.val).isValid()) {
+          duration = moment.duration(10, option.val);
+
+          if (+duration < 10) {
+            throw new Error('unable to create interval for ' + option.val);
+          }
+        }
+
+        init(option.val, duration);
+
+        var interval = agg.buckets.getInterval();
+        var params = filter.range[field.name];
+
+        expect(params.gte).to.be(+bucketStart);
+        expect(params.lte).to.be(+bucketStart.clone().add(interval).subtract(1, 'ms'));
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js
new file mode 100644
index 0000000000000..948710ab48529
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js
@@ -0,0 +1,47 @@
+
+var moment = require('moment');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+describe('AggConfig Filters', function () {
+  describe('Date range', function () {
+    var AggConfig;
+    var indexPattern;
+    var Vis;
+    var createFilter;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      Vis = Private(require('ui/Vis'));
+      AggConfig = Private(require('ui/Vis/AggConfig'));
+      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+      createFilter = Private(require('ui/agg_types/buckets/create_filter/date_range'));
+    }));
+
+    it('should return a range filter for date_range agg', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          {
+            type: 'date_range',
+            params: {
+              field: '@timestamp',
+              ranges: [
+                { from: '2014-01-01', to: '2014-12-31' }
+              ]
+            }
+          }
+        ]
+      });
+
+      var aggConfig = vis.aggs.byTypeName.date_range[0];
+      var filter = createFilter(aggConfig, 'February 1st, 2015 to February 7th, 2015');
+      expect(filter).to.have.property('range');
+      expect(filter).to.have.property('meta');
+      expect(filter.meta).to.have.property('index', indexPattern.id);
+      expect(filter.range).to.have.property('@timestamp');
+      expect(filter.range['@timestamp']).to.have.property('gte', +new Date('1 Feb 2015'));
+      expect(filter.range['@timestamp']).to.have.property('lt', +new Date('7 Feb 2015'));
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js
new file mode 100644
index 0000000000000..26e218393971d
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js
@@ -0,0 +1,46 @@
+
+var _ = require('lodash');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+describe('AggConfig Filters', function () {
+  describe('filters', function () {
+    var AggConfig;
+    var indexPattern;
+    var Vis;
+    var createFilter;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      Vis = Private(require('ui/Vis'));
+      AggConfig = Private(require('ui/Vis/AggConfig'));
+      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+      createFilter = Private(require('ui/agg_types/buckets/create_filter/filters'));
+    }));
+
+    it('should return a filters filter', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          {
+            type: 'filters',
+            schema: 'segment',
+            params: {
+              filters: [
+                { input: { query: { query_string: { query: '_type:apache' } } } },
+                { input: { query: { query_string: { query: '_type:nginx' } } } }
+              ]
+            }
+          }
+        ]
+      });
+
+      var aggConfig = vis.aggs.byTypeName.filters[0];
+      var filter = createFilter(aggConfig, '_type:nginx');
+      expect(_.omit(filter, 'meta')).to.eql(aggConfig.params.filters[1].input);
+      expect(filter.meta).to.have.property('index', indexPattern.id);
+
+    });
+
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js
new file mode 100644
index 0000000000000..e36ccd179c006
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js
@@ -0,0 +1,45 @@
+
+var _ = require('lodash');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+describe('AggConfig Filters', function () {
+  describe('histogram', function () {
+    var AggConfig;
+    var indexPattern;
+    var Vis;
+    var createFilter;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      Vis = Private(require('ui/Vis'));
+      AggConfig = Private(require('ui/Vis/AggConfig'));
+      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+      createFilter = Private(require('ui/agg_types/buckets/create_filter/histogram'));
+    }));
+
+    it('should return an range filter for histogram', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          {
+            type: 'histogram',
+            schema: 'segment',
+            params: { field: 'bytes', interval: 1024 }
+          }
+        ]
+      });
+
+      var aggConfig = vis.aggs.byTypeName.histogram[0];
+      var filter = createFilter(aggConfig, 2048);
+      expect(filter).to.have.property('meta');
+      expect(filter.meta).to.have.property('index', indexPattern.id);
+      expect(filter).to.have.property('range');
+      expect(filter.range).to.have.property('bytes');
+      expect(filter.range.bytes).to.have.property('gte', 2048);
+      expect(filter.range.bytes).to.have.property('lt', 3072);
+
+    });
+
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js
new file mode 100644
index 0000000000000..a74059a564c3e
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js
@@ -0,0 +1,80 @@
+
+describe('AggConfig Filters', function () {
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  describe('IP range', function () {
+    var AggConfig;
+    var indexPattern;
+    var Vis;
+    var createFilter;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      Vis = Private(require('ui/Vis'));
+      AggConfig = Private(require('ui/Vis/AggConfig'));
+      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+      createFilter = Private(require('ui/agg_types/buckets/create_filter/ip_range'));
+    }));
+
+    it('should return a range filter for ip_range agg', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          {
+            type: 'ip_range',
+            schema: 'segment',
+            params: {
+              field: 'ip',
+              ipRangeType: 'fromTo',
+              ranges: {
+                fromTo: [
+                  { from: '0.0.0.0', to: '1.1.1.1' }
+                ]
+              }
+            }
+          }
+        ]
+      });
+
+      var aggConfig = vis.aggs.byTypeName.ip_range[0];
+      var filter = createFilter(aggConfig, '0.0.0.0-1.1.1.1');
+      expect(filter).to.have.property('range');
+      expect(filter).to.have.property('meta');
+      expect(filter.meta).to.have.property('index', indexPattern.id);
+      expect(filter.range).to.have.property('ip');
+      expect(filter.range.ip).to.have.property('gte', '0.0.0.0');
+      expect(filter.range.ip).to.have.property('lte', '1.1.1.1');
+    });
+
+    it('should return a range filter for ip_range agg using a CIDR mask', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          {
+            type: 'ip_range',
+            schema: 'segment',
+            params: {
+              field: 'ip',
+              ipRangeType: 'mask',
+              ranges: {
+                mask: [
+                  { mask: '67.129.65.201/27' }
+                ]
+              }
+            }
+          }
+        ]
+      });
+
+      var aggConfig = vis.aggs.byTypeName.ip_range[0];
+      var filter = createFilter(aggConfig, '67.129.65.201/27');
+      expect(filter).to.have.property('range');
+      expect(filter).to.have.property('meta');
+      expect(filter.meta).to.have.property('index', indexPattern.id);
+      expect(filter.range).to.have.property('ip');
+      expect(filter.range.ip).to.have.property('gte', '67.129.65.192');
+      expect(filter.range.ip).to.have.property('lte', '67.129.65.223');
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js
new file mode 100644
index 0000000000000..04fa1ddaab9bf
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js
@@ -0,0 +1,48 @@
+
+describe('AggConfig Filters', function () {
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  describe('range', function () {
+    var AggConfig;
+    var indexPattern;
+    var Vis;
+    var createFilter;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      Vis = Private(require('ui/Vis'));
+      AggConfig = Private(require('ui/Vis/AggConfig'));
+      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+      createFilter = Private(require('ui/agg_types/buckets/create_filter/range'));
+    }));
+
+    it('should return a range filter for range agg', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [
+          {
+            type: 'range',
+            schema: 'segment',
+            params: {
+              field: 'bytes',
+              ranges: [
+                { from: 1024, to: 2048 }
+              ]
+            }
+          }
+        ]
+      });
+
+      var aggConfig = vis.aggs.byTypeName.range[0];
+      var filter = createFilter(aggConfig, '1024.0-2048.0');
+      expect(filter).to.have.property('range');
+      expect(filter).to.have.property('meta');
+      expect(filter.meta).to.have.property('index', indexPattern.id);
+      expect(filter.range).to.have.property('bytes');
+      expect(filter.range.bytes).to.have.property('gte', 1024.0);
+      expect(filter.range.bytes).to.have.property('lt', 2048.0);
+    });
+
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js
new file mode 100644
index 0000000000000..f90cbd55b5d2c
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js
@@ -0,0 +1,38 @@
+
+describe('AggConfig Filters', function () {
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  describe('terms', function () {
+    var AggConfig;
+    var indexPattern;
+    var Vis;
+    var createFilter;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      Vis = Private(require('ui/Vis'));
+      AggConfig = Private(require('ui/Vis/AggConfig'));
+      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+      createFilter = Private(require('ui/agg_types/buckets/create_filter/terms'));
+    }));
+
+    it('should return a match filter for terms', function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [ { type: 'terms', schema: 'segment', params: { field: '_type' } } ]
+      });
+      var aggConfig = vis.aggs.byTypeName.terms[0];
+      var filter = createFilter(aggConfig, 'apache');
+      expect(filter).to.have.property('query');
+      expect(filter.query).to.have.property('match');
+      expect(filter.query.match).to.have.property('_type');
+      expect(filter.query.match._type).to.have.property('query', 'apache');
+      expect(filter.query.match._type).to.have.property('type', 'phrase');
+      expect(filter).to.have.property('meta');
+      expect(filter.meta).to.have.property('index', indexPattern.id);
+
+    });
+
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_date_histogram.js b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_date_histogram.js
new file mode 100644
index 0000000000000..48c444f5d3b66
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_date_histogram.js
@@ -0,0 +1,4 @@
+describe('Date Histogram Agg', function () {
+  require('./_editor');
+  require('./_params');
+});
diff --git a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js
new file mode 100644
index 0000000000000..88152a39f55e3
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js
@@ -0,0 +1,123 @@
+describe('editor', function () {
+  var _ = require('lodash');
+  var $ = require('jquery');
+  var ngMock = require('ngMock');
+  var expect = require('expect.js');
+
+  var indexPattern;
+  var vis;
+  var agg;
+  var render;
+  var $scope;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private, $injector, $compile) {
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+
+    var Vis = Private(require('ui/Vis'));
+
+    /**
+     * Render the AggParams editor for the date histogram aggregation
+     *
+     * @param  {object} params - the agg params to give to the date_histogram
+     *                           by default
+     * @return {object} - object pointing to the different inputs, keys
+     *                    are the aggParam name and the value is an object
+     *                    with $el, $scope, and a few helpers for getting
+     *                    data from them.
+     */
+    render = function (params) {
+      vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs:[
+          { schema: 'metric', type: 'avg', params: { field: 'bytes' } },
+          { schema: 'segment', type: 'date_histogram', params: params || {} }
+        ]
+      });
+
+      var $el = $('<vis-editor-agg-params agg="agg" group-name="groupName"></vis-editor-agg-params>');
+      var $parentScope = $injector.get('$rootScope').$new();
+
+      agg = $parentScope.agg = vis.aggs.bySchemaName.segment[0];
+      $parentScope.groupName = 'buckets';
+
+      $compile($el)($parentScope);
+      $scope = $el.scope();
+      $scope.$digest();
+
+      var $inputs = $('vis-agg-param-editor', $el);
+      return _.transform($inputs.toArray(), function (inputs, e) {
+        var $el = $(e);
+        var $scope = $el.scope();
+
+        inputs[$scope.aggParam.name] = {
+          $el: $el,
+          $scope: $scope,
+          $input: function () {
+            return $el.find('[ng-model]').first();
+          },
+          modelValue: function () {
+            return this.$input().controller('ngModel').$modelValue;
+          }
+        };
+      }, {});
+    };
+
+  }));
+
+  describe('random field/interval', function () {
+    var params;
+    var field;
+    var interval;
+
+    beforeEach(ngMock.inject(function (Private) {
+      field = _.sample(indexPattern.fields);
+      interval = _.sample(Private(require('ui/agg_types/buckets/_interval_options')));
+      params = render({ field: field, interval: interval });
+    }));
+
+    it('renders the field editor', function () {
+      expect(agg.params.field).to.be(field);
+
+      expect(params).to.have.property('field');
+      expect(params.field).to.have.property('$el');
+      expect(params.field.modelValue()).to.be(field);
+    });
+
+    it('renders the interval editor', function () {
+      expect(agg.params.interval).to.be(interval);
+
+      expect(params).to.have.property('interval');
+      expect(params.interval).to.have.property('$el');
+      expect(params.interval.modelValue()).to.be(interval);
+    });
+  });
+
+  describe('interval "auto" and indexPattern timeField', function () {
+    var params;
+
+    beforeEach(function () {
+      params = render({ field: indexPattern.timeFieldName, interval: 'auto' });
+    });
+
+    it('clears the interval when the field is changed', function () {
+      expect(params.interval.modelValue().val).to.be('auto');
+      expect(params.field.modelValue().name).to.be(indexPattern.timeFieldName);
+
+      var field = _.find(indexPattern.fields, function (f) {
+        return f.type === 'date' && f.name !== indexPattern.timeFieldName;
+      });
+
+      params.field.$input()
+      .find('option')
+      .filter(function () {
+        return $(this).text().trim() === field.name;
+      })
+      .prop('selected', true);
+      params.field.$input().change();
+
+      expect(params.interval.modelValue()).to.be(undefined);
+    });
+  });
+
+});
diff --git a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js
new file mode 100644
index 0000000000000..4ad58ff3d3026
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js
@@ -0,0 +1,149 @@
+describe('params', function () {
+  var _ = require('lodash');
+  var moment = require('moment');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var paramWriter;
+  var writeInterval;
+
+  var aggTypes;
+  var AggConfig;
+  var setTimeBounds;
+  var timeField;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private, $injector) {
+    var AggParamWriter = Private(require('../../AggParamWriter'));
+    var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    var timefilter = $injector.get('timefilter');
+
+    timeField = indexPattern.timeFieldName;
+    aggTypes = Private(require('ui/agg_types/index'));
+    AggConfig = Private(require('ui/Vis/AggConfig'));
+
+    paramWriter = new AggParamWriter({ aggType: 'date_histogram' });
+    writeInterval = function (interval) {
+      return paramWriter.write({ interval: interval, field: timeField });
+    };
+
+    var now = moment();
+    setTimeBounds = function (n, units) {
+      timefilter.enabled = true;
+      timefilter.getBounds = _.constant({
+        min: now.clone().subtract(n, units),
+        max: now.clone()
+      });
+    };
+  }));
+
+  describe('interval', function () {
+    it('accepts a valid interval', function () {
+      var output = writeInterval('d');
+      expect(output.params).to.have.property('interval', '1d');
+    });
+
+    it('ignores invalid intervals', function () {
+      var output = writeInterval('foo');
+      expect(output.params).to.have.property('interval', '0ms');
+    });
+
+    it('automatically picks an interval', function () {
+      setTimeBounds(15, 'm');
+      var output = writeInterval('auto');
+      expect(output.params.interval).to.be('30s');
+    });
+
+    it('scales up the interval if it will make too many buckets', function () {
+      setTimeBounds(30, 'm');
+      var output = writeInterval('s');
+      expect(output.params.interval).to.be('10s');
+      expect(output.metricScaleText).to.be('second');
+      expect(output.metricScale).to.be(0.1);
+    });
+
+    it('does not scale down the interval', function () {
+      setTimeBounds(1, 'm');
+      var output = writeInterval('h');
+      expect(output.params.interval).to.be('1h');
+      expect(output.metricScaleText).to.be(undefined);
+      expect(output.metricScale).to.be(undefined);
+    });
+
+    describe('only scales when all metrics are sum or count', function () {
+      var tests = [
+        [ false, 'avg', 'count', 'sum' ],
+        [ true, 'count', 'sum' ],
+        [ false, 'count', 'cardinality' ]
+      ];
+
+      tests.forEach(function (test) {
+        var should = test.shift();
+        var typeNames = test.slice();
+
+        it(typeNames.join(', ') + ' should ' + (should ? '' : 'not') + ' scale', function () {
+          setTimeBounds(1, 'y');
+
+          var vis = paramWriter.vis;
+          vis.aggs.splice(0);
+
+          var histoConfig = new AggConfig(vis, {
+            type: aggTypes.byName.date_histogram,
+            schema: 'segment',
+            params: { interval: 's', field: timeField }
+          });
+
+          vis.aggs.push(histoConfig);
+
+          typeNames.forEach(function (type) {
+            vis.aggs.push(new AggConfig(vis, {
+              type: aggTypes.byName[type],
+              schema: 'metric'
+            }));
+          });
+
+          var output = histoConfig.write();
+          expect(_.has(output, 'metricScale')).to.be(should);
+        });
+      });
+    });
+  });
+
+  describe('extended_bounds', function () {
+    it('should write a long value if a moment passed in', function () {
+      var then = moment(0);
+      var now = moment(500);
+      var output = paramWriter.write({
+        extended_bounds: {
+          min: then,
+          max: now
+        }
+      });
+
+      expect(typeof output.params.extended_bounds.min).to.be('number');
+      expect(typeof output.params.extended_bounds.max).to.be('number');
+      expect(output.params.extended_bounds.min).to.be(then.valueOf());
+      expect(output.params.extended_bounds.max).to.be(now.valueOf());
+
+
+    });
+
+    it('should write a long if a long is passed', function () {
+      var then = 0;
+      var now = 500;
+      var output = paramWriter.write({
+        extended_bounds: {
+          min: then,
+          max: now
+        }
+      });
+
+      expect(typeof output.params.extended_bounds.min).to.be('number');
+      expect(typeof output.params.extended_bounds.max).to.be('number');
+      expect(output.params.extended_bounds.min).to.be(then.valueOf());
+      expect(output.params.extended_bounds.max).to.be(now.valueOf());
+
+
+    });
+  });
+});
diff --git a/src/ui/public/agg_types/__tests__/controls/number_list.js b/src/ui/public/agg_types/__tests__/controls/number_list.js
new file mode 100644
index 0000000000000..08a87dab9afd2
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/controls/number_list.js
@@ -0,0 +1,152 @@
+
+describe('NumberList directive', function () {
+  var $ = require('jquery');
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var simulateKeys = require('testUtils/simulateKeys');
+  var ngMock = require('ngMock');
+
+  require('ui/number_list');
+
+  var $el;
+  var $scope;
+  var compile;
+
+  function onlyValidValues() {
+    return $el.find('[ng-model]').toArray().map(function (el) {
+      var ngModel = $(el).controller('ngModel');
+      return ngModel.$valid ? ngModel.$modelValue : undefined;
+    });
+  }
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function ($injector) {
+    var $compile = $injector.get('$compile');
+    var $rootScope = $injector.get('$rootScope');
+
+    $scope = $rootScope.$new();
+    $el = $('<kbn-number-list ng-model="vals">');
+    compile = function (vals, range) {
+      $scope.vals = vals || [];
+      $el.attr('range', range);
+
+      $compile($el)($scope);
+      $scope.$apply();
+    };
+  }));
+
+  afterEach(function () {
+    $el.remove();
+    $scope.$destroy();
+  });
+
+  it('fails on invalid numbers', function () {
+    compile([1, 'foo']);
+    expect(onlyValidValues()).to.eql([1, undefined]);
+  });
+
+  it('supports decimals', function () {
+    compile(['1.2', '000001.6', '99.10']);
+    expect(onlyValidValues()).to.eql([1.2, 1.6, 99.1]);
+  });
+
+  it('ensures that the values are in order', function () {
+    compile([1, 2, 3, 10, 4, 5]);
+    expect(onlyValidValues()).to.eql([1, 2, 3, 10, undefined, 5]);
+  });
+
+  it('requires that values are within a range', function () {
+    compile([50, 100, 200, 250], '[100, 200)');
+    expect(onlyValidValues()).to.eql([undefined, 100, undefined, undefined]);
+  });
+
+  describe('listens for keyboard events', function () {
+    it('up arrow increases by 1', function () {
+      compile([1]);
+
+      return simulateKeys(
+        function () { return $el.find('input').first(); },
+        ['up', 'up', 'up']
+      )
+      .then(function () {
+        expect(onlyValidValues()).to.eql([4]);
+      });
+    });
+
+    it('shift-up increases by 0.1', function () {
+      compile([4.8]);
+
+      var seq = [
+        {
+          type: 'press',
+          key: 'shift',
+          events: [
+            'up',
+            'up',
+            'up'
+          ]
+        }
+      ];
+
+      return simulateKeys(
+        function () { return $el.find('input').first(); },
+        seq
+      )
+      .then(function () {
+        expect(onlyValidValues()).to.eql([5.1]);
+      });
+    });
+
+    it('down arrow decreases by 1', function () {
+      compile([5]);
+
+      return simulateKeys(
+        function () { return $el.find('input').first(); },
+        ['down', 'down', 'down']
+      )
+      .then(function () {
+        expect(onlyValidValues()).to.eql([2]);
+      });
+    });
+
+    it('shift-down decreases by 0.1', function () {
+      compile([5.1]);
+
+      var seq = [
+        {
+          type: 'press',
+          key: 'shift',
+          events: [
+            'down',
+            'down',
+            'down'
+          ]
+        }
+      ];
+
+      return simulateKeys(
+        function () { return $el.find('input').first(); },
+        seq
+      )
+      .then(function () {
+        expect(onlyValidValues()).to.eql([4.8]);
+      });
+    });
+
+    it('maintains valid number', function () {
+      compile([9, 11, 13]);
+
+      var seq = [
+        'down', // 10 (11 - 1)
+        'down'  // 10 (limited by 9)
+      ];
+
+      var getEl = function () { return $el.find('input').eq(1); };
+
+      return simulateKeys(getEl, seq)
+      .then(function () {
+        expect(onlyValidValues()).to.eql([9, 10, 13]);
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/agg_types/__tests__/index.js b/src/ui/public/agg_types/__tests__/index.js
new file mode 100644
index 0000000000000..0c7923677fa67
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/index.js
@@ -0,0 +1,43 @@
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+describe('AggTypesComponent', function () {
+  require('./AggType');
+  require('./AggParams');
+  require('./bucketCountBetween');
+  require('./buckets/_histogram');
+
+  describe('bucket aggs', function () {
+    var bucketAggs;
+    var BucketAggType;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      bucketAggs = Private(require('ui/agg_types/index')).byType.buckets;
+      BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
+    }));
+
+    it('all extend BucketAggType', function () {
+      bucketAggs.forEach(function (bucketAgg) {
+        expect(bucketAgg).to.be.a(BucketAggType);
+      });
+    });
+  });
+
+  describe('metric aggs', function () {
+    var metricAggs;
+    var MetricAggType;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      metricAggs = Private(require('ui/agg_types/index')).byType.metrics;
+      MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
+    }));
+
+    it('all extend MetricAggType', function () {
+      metricAggs.forEach(function (metricAgg) {
+        expect(metricAgg).to.be.a(MetricAggType);
+      });
+    });
+  });
+});
diff --git a/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js b/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js
new file mode 100644
index 0000000000000..594bb14ea6144
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js
@@ -0,0 +1,85 @@
+
+var _ = require('lodash');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+describe('calculateInterval()', function () {
+  var AggConfig;
+  var indexPattern;
+  var Vis;
+  var createFilter;
+  var calculateInterval;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    Vis = Private(require('ui/Vis'));
+    AggConfig = Private(require('ui/Vis/AggConfig'));
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    calculateInterval = Private(require('ui/agg_types/param_types/_calculate_interval'));
+  }));
+
+  var testInterval = function (option, expected) {
+    var msg = 'should return ' + JSON.stringify(expected) + ' for ' + option;
+    it(msg, function () {
+      var vis = new Vis(indexPattern, {
+        type: 'histogram',
+        aggs: [ { type: 'date_histogram', schema: 'segment', params: { field: '@timestamp', interval: option } } ]
+      });
+      var aggConfig = vis.aggs.byTypeName.date_histogram[0];
+      var interval = calculateInterval(aggConfig);
+      _.each(expected, function (val, key) {
+        expect(interval).to.have.property(key, val);
+      });
+    });
+
+  };
+
+  testInterval('auto', {
+    interval: 30000,
+    metricScale: 1,
+    description: '30 sec'
+  });
+
+  testInterval('second', {
+    interval: 10000,
+    metricScale: 0.1,
+    description: 'second'
+  });
+
+  testInterval('minute', {
+    interval: 60000,
+    metricScale: 1,
+    description: 'minute'
+  });
+
+  testInterval('hour', {
+    interval: 3600000,
+    metricScale: 1,
+    description: 'hour'
+  });
+
+  testInterval('day', {
+    interval: 86400000,
+    metricScale: 1,
+    description: 'day'
+  });
+
+  testInterval('week', {
+    interval: 604800000,
+    metricScale: 1,
+    description: 'week'
+  });
+
+  testInterval('month', {
+    interval: 2592000000,
+    metricScale: 1,
+    description: 'month'
+  });
+
+  testInterval('year', {
+    interval: 31536000000,
+    metricScale: 1,
+    description: 'year'
+  });
+
+});
\ No newline at end of file
diff --git a/src/ui/public/agg_types/__tests__/param_types/_field.js b/src/ui/public/agg_types/__tests__/param_types/_field.js
new file mode 100644
index 0000000000000..2bc90026efba4
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/param_types/_field.js
@@ -0,0 +1,25 @@
+describe('Field', function () {
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var BaseAggParam;
+  var FieldAggParam;
+
+  beforeEach(ngMock.module('kibana'));
+  // fetch out deps
+  beforeEach(ngMock.inject(function (Private) {
+    BaseAggParam = Private(require('ui/agg_types/param_types/base'));
+    FieldAggParam = Private(require('ui/agg_types/param_types/field'));
+  }));
+
+  describe('constructor', function () {
+    it('it is an instance of BaseAggParam', function () {
+      var aggParam = new FieldAggParam({
+        name: 'field'
+      });
+
+      expect(aggParam).to.be.a(BaseAggParam);
+    });
+  });
+});
diff --git a/src/ui/public/agg_types/__tests__/param_types/_optioned.js b/src/ui/public/agg_types/__tests__/param_types/_optioned.js
new file mode 100644
index 0000000000000..b15ecd02e47bd
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/param_types/_optioned.js
@@ -0,0 +1,26 @@
+describe('Optioned', function () {
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var BaseAggParam;
+  var OptionedAggParam;
+
+  beforeEach(ngMock.module('kibana'));
+  // fetch out deps
+  beforeEach(ngMock.inject(function (Private) {
+    BaseAggParam = Private(require('ui/agg_types/param_types/base'));
+    OptionedAggParam = Private(require('ui/agg_types/param_types/optioned'));
+  }));
+
+  describe('constructor', function () {
+    it('it is an instance of BaseAggParam', function () {
+      var aggParam = new OptionedAggParam({
+        name: 'some_param',
+        type: 'optioned'
+      });
+
+      expect(aggParam).to.be.a(BaseAggParam);
+    });
+  });
+});
diff --git a/src/ui/public/agg_types/__tests__/param_types/_raw_json.js b/src/ui/public/agg_types/__tests__/param_types/_raw_json.js
new file mode 100644
index 0000000000000..31033b3080d46
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/param_types/_raw_json.js
@@ -0,0 +1,102 @@
+var _ = require('lodash');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+
+module.exports = describe('JSON', function () {
+  var paramName = 'json_test';
+  var BaseAggParam;
+  var JsonAggParam;
+  var aggParam;
+  var aggConfig;
+  var output;
+
+  function initAggParam(config) {
+    config = config || {};
+    var defaults = {
+      name: paramName,
+      type: 'json'
+    };
+
+    aggParam = new JsonAggParam(_.defaults(config, defaults));
+  }
+
+  beforeEach(ngMock.module('kibana'));
+
+  // fetch out deps
+  beforeEach(ngMock.inject(function (Private) {
+    aggConfig = { params: {} };
+    output = { params: {} };
+
+    BaseAggParam = Private(require('ui/agg_types/param_types/base'));
+    JsonAggParam = Private(require('ui/agg_types/param_types/raw_json'));
+
+    initAggParam();
+  }));
+
+  describe('constructor', function () {
+    it('it is an instance of BaseAggParam', function () {
+      expect(aggParam).to.be.a(BaseAggParam);
+    });
+  });
+
+  describe('write', function () {
+    it('should do nothing when param is not defined', function () {
+      expect(aggConfig.params).not.to.have.property(paramName);
+
+      aggParam.write(aggConfig, output);
+      expect(output).not.to.have.property(paramName);
+    });
+
+    it('should not append param when invalid JSON', function () {
+      aggConfig.params[paramName] = 'i am not json';
+
+      aggParam.write(aggConfig, output);
+      expect(aggConfig.params).to.have.property(paramName);
+      expect(output).not.to.have.property(paramName);
+    });
+
+    it('should append param when valid JSON', function () {
+      var jsonData = JSON.stringify({
+        new_param: 'should exist in output'
+      });
+
+      output.params.existing = 'true';
+      aggConfig.params[paramName] = jsonData;
+
+      aggParam.write(aggConfig, output);
+      expect(aggConfig.params).to.have.property(paramName);
+      expect(output.params).to.eql({
+        existing: 'true',
+        new_param: 'should exist in output'
+      });
+    });
+
+    it('should not overwrite existing params', function () {
+      var jsonData = JSON.stringify({
+        new_param: 'should exist in output',
+        existing: 'should be used'
+      });
+
+      output.params.existing = 'true';
+      aggConfig.params[paramName] = jsonData;
+
+      aggParam.write(aggConfig, output);
+      expect(output.params).to.eql(JSON.parse(jsonData));
+    });
+
+    it('should drop nulled params', function () {
+      var jsonData = JSON.stringify({
+        new_param: 'should exist in output',
+        field: null
+      });
+
+      output.params.field = 'extensions';
+      aggConfig.params[paramName] = jsonData;
+
+      aggParam.write(aggConfig, output);
+      expect(Object.keys(output.params)).to.contain('new_param');
+      expect(Object.keys(output.params)).to.not.contain('field');
+    });
+  });
+});
diff --git a/src/ui/public/agg_types/__tests__/param_types/_regex.js b/src/ui/public/agg_types/__tests__/param_types/_regex.js
new file mode 100644
index 0000000000000..6d466df588925
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/param_types/_regex.js
@@ -0,0 +1,88 @@
+describe('Regex', function () {
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var BaseAggParam;
+  var RegexAggParam;
+  var Vis;
+  var indexPattern;
+
+  beforeEach(ngMock.module('kibana'));
+  // fetch out deps
+  beforeEach(ngMock.inject(function (Private) {
+    BaseAggParam = Private(require('ui/agg_types/param_types/base'));
+    RegexAggParam = Private(require('ui/agg_types/param_types/regex'));
+    Vis = Private(require('ui/Vis'));
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+  }));
+
+  describe('constructor', function () {
+    it('should be an instance of BaseAggParam', function () {
+      var aggParam = new RegexAggParam({
+        name: 'some_param',
+        type: 'regex'
+      });
+
+      expect(aggParam).to.be.a(BaseAggParam);
+      expect(aggParam).to.have.property('write');
+    });
+  });
+
+  describe('write results', function () {
+    var aggParam;
+    var aggConfig;
+    var output = { params: {} };
+    var paramName = 'exclude';
+
+    beforeEach(function () {
+      var vis = new Vis(indexPattern, {
+        type: 'pie',
+        aggs: [
+          { type: 'terms', schema: 'split', params: { field: 'extension' }},
+        ]
+      });
+      aggConfig = vis.aggs[0];
+
+      aggParam = new RegexAggParam({
+        name: paramName,
+        type: 'regex'
+      });
+    });
+
+    it('should not include param in output', function () {
+      aggConfig.params[paramName] = {
+        pattern: ''
+      };
+
+      aggParam.write(aggConfig, output);
+      expect(output).to.be.an('object');
+      expect(output).to.have.property('params');
+      expect(output.params).not.to.have.property(paramName);
+    });
+
+    it('should include param in output', function () {
+      aggConfig.params[paramName] = {
+        pattern: 'testing'
+      };
+
+      aggParam.write(aggConfig, output);
+      expect(output.params).to.have.property(paramName);
+      expect(output.params[paramName]).to.eql({ pattern: 'testing' });
+      expect(output.params[paramName]).not.to.have.property('flags');
+    });
+
+    it('should include flags', function () {
+      aggConfig.params[paramName] = {
+        pattern: 'testing',
+        flags: [ 'TEST1', 'TEST2', 'TEST_RED', 'TEST_BLUE' ]
+      };
+
+      aggParam.write(aggConfig, output);
+      expect(output.params).to.have.property(paramName);
+      expect(output.params[paramName]).to.have.property('flags');
+      expect(typeof output.params[paramName].flags).to.be('string');
+      expect(output.params[paramName].flags).to.be('TEST1|TEST2|TEST_RED|TEST_BLUE');
+    });
+  });
+});
diff --git a/src/ui/public/agg_types/__tests__/param_types/_string.js b/src/ui/public/agg_types/__tests__/param_types/_string.js
new file mode 100644
index 0000000000000..f55a0a207b7c0
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/param_types/_string.js
@@ -0,0 +1,68 @@
+var _ = require('lodash');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+module.exports = describe('String', function () {
+  var paramName = 'json_test';
+  var BaseAggParam;
+  var StringAggParam;
+  var aggParam;
+  var aggConfig;
+  var output;
+
+  function initAggParam(config) {
+    config = config || {};
+    var defaults = {
+      name: paramName,
+      type: 'string'
+    };
+
+    aggParam = new StringAggParam(_.defaults(config, defaults));
+  }
+
+  beforeEach(ngMock.module('kibana'));
+
+  // fetch our deps
+  beforeEach(ngMock.inject(function (Private) {
+    BaseAggParam = Private(require('ui/agg_types/param_types/base'));
+    StringAggParam = Private(require('ui/agg_types/param_types/string'));
+
+    aggConfig = { params: {} };
+    output = { params: {} };
+  }));
+
+  describe('constructor', function () {
+    it('it is an instance of BaseAggParam', function () {
+      initAggParam();
+      expect(aggParam).to.be.a(BaseAggParam);
+    });
+  });
+
+  describe('write', function () {
+    it('should append param by name', function () {
+      var paramName = 'testing';
+      var params = {};
+      params[paramName] = 'some input';
+
+      initAggParam({ name: paramName });
+
+      aggConfig.params = params;
+      aggParam.write(aggConfig, output);
+
+      expect(output.params).to.eql(params);
+    });
+
+    it('should not be in output with empty input', function () {
+      var paramName = 'more_testing';
+      var params = {};
+      params[paramName] = '';
+
+      initAggParam({ name: paramName });
+
+      aggConfig.params = params;
+      aggParam.write(aggConfig, output);
+
+      expect(output.params).to.eql({});
+    });
+  });
+});
diff --git a/src/ui/public/agg_types/__tests__/param_types/index.js b/src/ui/public/agg_types/__tests__/param_types/index.js
new file mode 100644
index 0000000000000..2b4cc061cc994
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/param_types/index.js
@@ -0,0 +1,8 @@
+
+describe('ParamTypes', function () {
+  require('./_field');
+  require('./_optioned');
+  require('./_regex');
+  require('./_string');
+  require('./_raw_json');
+});
\ No newline at end of file
diff --git a/src/ui/public/agg_types/__tests__/utils/_stub_agg_params.js b/src/ui/public/agg_types/__tests__/utils/_stub_agg_params.js
new file mode 100644
index 0000000000000..ae20788a015d0
--- /dev/null
+++ b/src/ui/public/agg_types/__tests__/utils/_stub_agg_params.js
@@ -0,0 +1,43 @@
+var _ = require('lodash');
+var sinon = require('auto-release-sinon');
+
+function ParamClassStub(parent, body) {
+  var stub = sinon.spy(body || function () {
+    stub.Super && stub.Super.call(this);
+  });
+  if (parent) _.class(stub).inherits(parent);
+  return stub;
+}
+
+/**
+ * stub all of the param classes, but ensure that they still inherit properly.
+ * This method should be passed directly to ngMock.inject();
+ *
+ * ```js
+ * var stubParamClasses = require('./utils/_stub_agg_params');
+ * describe('something', function () {
+ *   beforeEach(ngMock.inject(stubParamClasses));
+ * })
+ * ```
+ *
+ * @param  {PrivateLoader} Private - The private module loader, inject by passing this function to ngMock.inject()
+ * @return {undefined}
+ */
+module.exports = function stubParamClasses(Private) {
+  var BaseAggParam = Private.stub(
+    require('ui/agg_types/param_types/base'),
+    ParamClassStub(null, function (config) {
+      _.assign(this, config);
+    })
+  );
+
+  Private.stub(
+    require('ui/agg_types/param_types/field'),
+    ParamClassStub(BaseAggParam)
+  );
+
+  Private.stub(
+    require('ui/agg_types/param_types/optioned'),
+    ParamClassStub(BaseAggParam)
+  );
+};
diff --git a/src/kibana/components/agg_types/buckets/_bucket_agg_type.js b/src/ui/public/agg_types/buckets/_bucket_agg_type.js
similarity index 87%
rename from src/kibana/components/agg_types/buckets/_bucket_agg_type.js
rename to src/ui/public/agg_types/buckets/_bucket_agg_type.js
index 3089acdacaa0d..80eeb62785780 100644
--- a/src/kibana/components/agg_types/buckets/_bucket_agg_type.js
+++ b/src/ui/public/agg_types/buckets/_bucket_agg_type.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function BucketAggTypeProvider(Private) {
     var _ = require('lodash');
-    var AggType = Private(require('components/agg_types/_agg_type'));
+    var AggType = Private(require('ui/agg_types/AggType'));
 
     _.class(BucketAggType).inherits(AggType);
     function BucketAggType(config) {
diff --git a/src/ui/public/agg_types/buckets/_bucket_count_between.js b/src/ui/public/agg_types/buckets/_bucket_count_between.js
new file mode 100644
index 0000000000000..a969011a9cfec
--- /dev/null
+++ b/src/ui/public/agg_types/buckets/_bucket_count_between.js
@@ -0,0 +1,44 @@
+define(function (require) {
+  return function BucketCountBetweenProvider() {
+
+    /**
+     * Count the number of bucket aggs between two agg config objects owned
+     * by the same vis.
+     *
+     * If one of the two aggs was not found in the agg list, returns null.
+     * If a was found after b, the count will be negative
+     * If a was found first, the count will be positive.
+     *
+     * @param  {AggConfig} aggConfigA - the aggConfig that is expected first
+     * @param  {AggConfig} aggConfigB - the aggConfig that is expected second
+     * @return {null|number}
+     */
+    function bucketCountBetween(aggConfigA, aggConfigB) {
+      var aggs = aggConfigA.vis.aggs.getRequestAggs();
+
+      var aIndex = aggs.indexOf(aggConfigA);
+      var bIndex = aggs.indexOf(aggConfigB);
+
+      if (aIndex === -1 || bIndex === -1) {
+        return null;
+      }
+
+      // return a negative distance, if b is before a
+      var negative = (aIndex > bIndex);
+
+      var count = aggs
+        .slice(Math.min(aIndex, bIndex), Math.max(aIndex, bIndex))
+        .reduce(function (count, cfg) {
+          if (cfg === aggConfigA || cfg === aggConfigB || cfg.schema.group !== 'buckets') {
+            return count;
+          } else {
+            return count + 1;
+          }
+        }, 0);
+
+      return (negative ? -1 : 1) * count;
+    }
+
+    return bucketCountBetween;
+  };
+});
diff --git a/src/kibana/components/agg_types/buckets/_interval_options.js b/src/ui/public/agg_types/buckets/_interval_options.js
similarity index 95%
rename from src/kibana/components/agg_types/buckets/_interval_options.js
rename to src/ui/public/agg_types/buckets/_interval_options.js
index 48ed13c7a73b5..b42dac83adaf1 100644
--- a/src/kibana/components/agg_types/buckets/_interval_options.js
+++ b/src/ui/public/agg_types/buckets/_interval_options.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function IntervalOptionsService(Private) {
     var moment = require('moment');
-    require('directives/input_whole_number');
+    require('ui/directives/input_whole_number');
 
     // shorthand
     var ms = function (type) { return moment.duration(1, type).asMilliseconds(); };
diff --git a/src/ui/public/agg_types/buckets/create_filter/date_histogram.js b/src/ui/public/agg_types/buckets/create_filter/date_histogram.js
new file mode 100644
index 0000000000000..6040c31ac207b
--- /dev/null
+++ b/src/ui/public/agg_types/buckets/create_filter/date_histogram.js
@@ -0,0 +1,17 @@
+define(function (require) {
+  return function createDateHistogramFilterProvider(Private) {
+    var moment = require('moment');
+    var buildRangeFilter = require('ui/filter_manager/lib/range');
+
+    return function (agg, key) {
+      var start = moment(key);
+      var interval = agg.buckets.getInterval();
+
+      return buildRangeFilter(agg.params.field, {
+        gte: start.valueOf(),
+        lte: start.add(interval).subtract(1, 'ms').valueOf()
+      }, agg.vis.indexPattern);
+    };
+
+  };
+});
diff --git a/src/ui/public/agg_types/buckets/create_filter/date_range.js b/src/ui/public/agg_types/buckets/create_filter/date_range.js
new file mode 100644
index 0000000000000..9b075ee023f03
--- /dev/null
+++ b/src/ui/public/agg_types/buckets/create_filter/date_range.js
@@ -0,0 +1,19 @@
+define(function (require) {
+  var dateRange = require('ui/utils/date_range');
+
+  return function createDateRangeFilterProvider(config) {
+    var buildRangeFilter = require('ui/filter_manager/lib/range');
+
+    return function (agg, key) {
+      var range = dateRange.parse(key, config.get('dateFormat'));
+
+      var filter = {};
+      if (range.from) filter.gte = +range.from;
+      if (range.to) filter.lt = +range.to;
+      if (range.to && range.from) filter.format = 'epoch_millis';
+
+      return buildRangeFilter(agg.params.field, filter, agg.vis.indexPattern);
+    };
+
+  };
+});
diff --git a/src/ui/public/agg_types/buckets/create_filter/filters.js b/src/ui/public/agg_types/buckets/create_filter/filters.js
new file mode 100644
index 0000000000000..89b22f6adc06c
--- /dev/null
+++ b/src/ui/public/agg_types/buckets/create_filter/filters.js
@@ -0,0 +1,15 @@
+define(function (require) {
+  var buildQueryFilter = require('ui/filter_manager/lib/query');
+  var _ = require('lodash');
+  return function CreateFilterFiltersProvider(Private) {
+    return function (aggConfig, key) {
+      // have the aggConfig write agg dsl params
+      var dslFilters = _.get(aggConfig.toDsl(), 'filters.filters');
+      var filter = dslFilters[key];
+
+      if (filter) {
+        return buildQueryFilter(filter.query, aggConfig.vis.indexPattern.id);
+      }
+    };
+  };
+});
diff --git a/src/ui/public/agg_types/buckets/create_filter/histogram.js b/src/ui/public/agg_types/buckets/create_filter/histogram.js
new file mode 100644
index 0000000000000..4b314b90d08ca
--- /dev/null
+++ b/src/ui/public/agg_types/buckets/create_filter/histogram.js
@@ -0,0 +1,14 @@
+define(function (require) {
+  var buildRangeFilter = require('ui/filter_manager/lib/range');
+
+  return function createHistogramFitlerProvider(Private) {
+    return function (aggConfig, key) {
+      var value = parseInt(key, 10);
+
+      return buildRangeFilter(aggConfig.params.field, {
+        gte: value,
+        lt: value + aggConfig.params.interval
+      }, aggConfig.vis.indexPattern);
+    };
+  };
+});
diff --git a/src/ui/public/agg_types/buckets/create_filter/ip_range.js b/src/ui/public/agg_types/buckets/create_filter/ip_range.js
new file mode 100644
index 0000000000000..ccb21d517f4c9
--- /dev/null
+++ b/src/ui/public/agg_types/buckets/create_filter/ip_range.js
@@ -0,0 +1,20 @@
+define(function (require) {
+  var CidrMask = require('ui/utils/CidrMask');
+  var buildRangeFilter = require('ui/filter_manager/lib/range');
+  return function createIpRangeFilterProvider() {
+    return function (aggConfig, key) {
+      var range;
+      if (aggConfig.params.ipRangeType === 'mask') {
+        range = new CidrMask(key).getRange();
+      } else {
+        var addresses = key.split(/\-/);
+        range = {
+          from: addresses[0],
+          to: addresses[1]
+        };
+      }
+
+      return buildRangeFilter(aggConfig.params.field, {gte: range.from, lte: range.to}, aggConfig.vis.indexPattern);
+    };
+  };
+});
diff --git a/src/ui/public/agg_types/buckets/create_filter/range.js b/src/ui/public/agg_types/buckets/create_filter/range.js
new file mode 100644
index 0000000000000..04c29b807e79c
--- /dev/null
+++ b/src/ui/public/agg_types/buckets/create_filter/range.js
@@ -0,0 +1,14 @@
+define(function (require) {
+  var buildRangeFilter = require('ui/filter_manager/lib/range');
+  return function createRangeFilterProvider(Private) {
+    return function (aggConfig, key) {
+      var splits = key.split(/\-/);
+      var gte = Number(splits[0]);
+      var lt = Number(splits[1]);
+      return buildRangeFilter(aggConfig.params.field, {
+        gte: gte,
+        lt: lt
+      }, aggConfig.vis.indexPattern);
+    };
+  };
+});
diff --git a/src/ui/public/agg_types/buckets/create_filter/terms.js b/src/ui/public/agg_types/buckets/create_filter/terms.js
new file mode 100644
index 0000000000000..db2361bffe2f3
--- /dev/null
+++ b/src/ui/public/agg_types/buckets/create_filter/terms.js
@@ -0,0 +1,8 @@
+define(function (require) {
+  var buildPhraseFilter = require('ui/filter_manager/lib/phrase');
+  return function createTermsFilterProvider(Private) {
+    return function (aggConfig, key) {
+      return buildPhraseFilter(aggConfig.params.field, key, aggConfig.vis.indexPattern);
+    };
+  };
+});
diff --git a/src/ui/public/agg_types/buckets/date_histogram.js b/src/ui/public/agg_types/buckets/date_histogram.js
new file mode 100644
index 0000000000000..46dc58ab55fcc
--- /dev/null
+++ b/src/ui/public/agg_types/buckets/date_histogram.js
@@ -0,0 +1,154 @@
+define(function (require) {
+  return function DateHistogramAggType(timefilter, config, Private) {
+    var _ = require('lodash');
+    var moment = require('moment');
+    var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
+    var TimeBuckets = Private(require('ui/time_buckets'));
+    var createFilter = Private(require('ui/agg_types/buckets/create_filter/date_histogram'));
+    var intervalOptions = Private(require('ui/agg_types/buckets/_interval_options'));
+
+    var tzOffset = moment().format('Z');
+
+    function getInterval(agg) {
+      var interval = _.get(agg, ['params', 'interval']);
+      if (interval && interval.val === 'custom') interval = _.get(agg, ['params', 'customInterval']);
+      return interval;
+    }
+
+    function setBounds(agg, force) {
+      if (agg.buckets._alreadySet && !force) return;
+      agg.buckets._alreadySet = true;
+      agg.buckets.setBounds(agg.fieldIsTimeField() && timefilter.getActiveBounds());
+    }
+
+    require('ui/filters/field_type');
+    require('ui/validateDateInterval');
+
+    return new BucketAggType({
+      name: 'date_histogram',
+      title: 'Date Histogram',
+      ordered: {
+        date: true
+      },
+      makeLabel: function (agg) {
+        var output = this.params.write(agg);
+        var params = output.params;
+        return params.field + ' per ' + (output.metricScaleText || output.bucketInterval.description);
+      },
+      createFilter: createFilter,
+      decorateAggConfig: function () {
+        var buckets;
+        return {
+          buckets: {
+            configurable: true,
+            get: function () {
+              if (buckets) return buckets;
+
+              buckets = new TimeBuckets();
+              buckets.setInterval(getInterval(this));
+              setBounds(this);
+
+              return buckets;
+            }
+          }
+        };
+      },
+      params: [
+        {
+          name: 'field',
+          filterFieldTypes: 'date',
+          default: function (agg) {
+            return agg.vis.indexPattern.timeFieldName;
+          },
+          onChange: function (agg) {
+            if (_.get(agg, 'params.interval.val') === 'auto' && !agg.fieldIsTimeField()) {
+              delete agg.params.interval;
+            }
+
+            setBounds(agg, true);
+          }
+        },
+
+        {
+          name: 'interval',
+          type: 'optioned',
+          deserialize: function (state) {
+            var interval = _.find(intervalOptions, {val: state});
+            return interval || _.find(intervalOptions, function (option) {
+              // For upgrading from 4.0.x to 4.1.x - intervals are now stored as 'y' instead of 'year',
+              // but this maps the old values to the new values
+              return Number(moment.duration(1, state)) === Number(moment.duration(1, option.val));
+            });
+          },
+          default: 'auto',
+          options: intervalOptions,
+          editor: require('ui/agg_types/controls/interval.html'),
+          onRequest: function (agg) {
+            setBounds(agg, true);
+          },
+          write: function (agg, output) {
+            setBounds(agg);
+            agg.buckets.setInterval(getInterval(agg));
+
+            var interval = agg.buckets.getInterval();
+            output.bucketInterval = interval;
+            output.params.interval = interval.expression;
+            output.params.time_zone = tzOffset;
+
+            var scaleMetrics = interval.scaled && interval.scale < 1;
+            if (scaleMetrics) {
+              scaleMetrics = _.every(agg.vis.aggs.bySchemaGroup.metrics, function (agg) {
+                return agg.type && (agg.type.name === 'count' || agg.type.name === 'sum');
+              });
+            }
+
+            if (scaleMetrics) {
+              output.metricScale = interval.scale;
+              output.metricScaleText = interval.preScaled.description;
+            }
+          }
+        },
+
+        {
+          name: 'customInterval',
+          default: '2h',
+          write: _.noop
+        },
+
+        {
+          name: 'format'
+        },
+
+        {
+          name: 'min_doc_count',
+          default: 1
+        },
+
+        {
+          name: 'extended_bounds',
+          default: {},
+          write: function (agg, output) {
+            var val = agg.params.extended_bounds;
+
+            if (val.min != null || val.max != null) {
+              output.params.extended_bounds = {
+                min: moment(val.min).valueOf(),
+                max: moment(val.max).valueOf()
+              };
+
+              return;
+            }
+
+            var bounds = timefilter.getActiveBounds();
+            if (bounds) {
+              output.params.extended_bounds = {
+                min: moment(bounds.min).valueOf(),
+                max: moment(bounds.max).valueOf()
+              };
+            }
+          }
+        }
+      ]
+    });
+  };
+});
diff --git a/src/ui/public/agg_types/buckets/date_range.js b/src/ui/public/agg_types/buckets/date_range.js
new file mode 100644
index 0000000000000..5f2b09ba3cccf
--- /dev/null
+++ b/src/ui/public/agg_types/buckets/date_range.js
@@ -0,0 +1,47 @@
+define(function (require) {
+  var moment = require('moment');
+  var dateRange = require('ui/utils/date_range');
+  require('ui/directives/validate_date_math');
+
+  return function DateRangeAggDefinition(Private, config) {
+    var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
+    var createFilter = Private(require('ui/agg_types/buckets/create_filter/date_range'));
+    var fieldFormats = Private(require('ui/registry/field_formats'));
+
+
+    return new BucketAggType({
+      name: 'date_range',
+      title: 'Date Range',
+      createFilter: createFilter,
+      getKey: function (bucket, key, agg) {
+        var formatter;
+        if (agg.field()) {
+          formatter = agg.field().format.getConverterFor('text');
+        } else {
+          formatter = fieldFormats.getDefaultInstance('date').getConverterFor('text');
+        }
+        return dateRange.toString(bucket, formatter);
+      },
+      getFormat: function () {
+        return fieldFormats.getDefaultInstance('string');
+      },
+      makeLabel: function (aggConfig) {
+        return aggConfig.params.field.displayName + ' date ranges';
+      },
+      params: [{
+        name: 'field',
+        filterFieldTypes: 'date',
+        default: function (agg) {
+          return agg.vis.indexPattern.timeFieldName;
+        }
+      }, {
+        name: 'ranges',
+        default: [{
+          from: 'now-1w/w',
+          to: 'now'
+        }],
+        editor: require('ui/agg_types/controls/date_ranges.html')
+      }]
+    });
+  };
+});
\ No newline at end of file
diff --git a/src/ui/public/agg_types/buckets/filters.js b/src/ui/public/agg_types/buckets/filters.js
new file mode 100644
index 0000000000000..4acee45b705f7
--- /dev/null
+++ b/src/ui/public/agg_types/buckets/filters.js
@@ -0,0 +1,45 @@
+define(function (require) {
+  return function FiltersAggDefinition(Private, Notifier) {
+    var _ = require('lodash');
+    var angular = require('angular');
+    var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
+    var createFilter = Private(require('ui/agg_types/buckets/create_filter/filters'));
+    var decorateQuery = Private(require('ui/courier/data_source/_decorate_query'));
+    var notif = new Notifier({ location: 'Filters Agg' });
+
+    return new BucketAggType({
+      name: 'filters',
+      title: 'Filters',
+      createFilter: createFilter,
+      params: [
+        {
+          name: 'filters',
+          editor: require('ui/agg_types/controls/filters.html'),
+          default: [ {input: {}, label: ''} ],
+          write: function (aggConfig, output) {
+            var inFilters = aggConfig.params.filters;
+            if (!_.size(inFilters)) return;
+
+            var outFilters = _.transform(inFilters, function (filters, filter) {
+              var input = filter.input;
+              if (!input) return notif.log('malformed filter agg params, missing "input" query');
+
+              var query = input.query;
+              if (!query) return notif.log('malformed filter agg params, missing "query" on input');
+
+              decorateQuery(query);
+
+              var label = filter.label || _.get(query, 'query_string.query') || angular.toJson(query);
+              filters[label] = input;
+            }, {});
+
+            if (!_.size(outFilters)) return;
+
+            var params = output.params || (output.params = {});
+            params.filters = outFilters;
+          }
+        }
+      ]
+    });
+  };
+});
diff --git a/src/kibana/components/agg_types/buckets/geo_hash.js b/src/ui/public/agg_types/buckets/geo_hash.js
similarity index 90%
rename from src/kibana/components/agg_types/buckets/geo_hash.js
rename to src/ui/public/agg_types/buckets/geo_hash.js
index 6f1179a211104..471b051fc7df6 100644
--- a/src/kibana/components/agg_types/buckets/geo_hash.js
+++ b/src/ui/public/agg_types/buckets/geo_hash.js
@@ -2,7 +2,7 @@ define(function (require) {
   return function GeoHashAggDefinition(Private, config) {
     var _ = require('lodash');
     var moment = require('moment');
-    var BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
+    var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
     var defaultPrecision = 2;
 
     function getPrecision(precision) {
@@ -45,7 +45,7 @@ define(function (require) {
         {
           name: 'precision',
           default: defaultPrecision,
-          editor: require('text!components/agg_types/controls/precision.html'),
+          editor: require('ui/agg_types/controls/precision.html'),
           controller: function ($scope) {
             $scope.$watchMulti([
               'agg.params.autoPrecision',
diff --git a/src/ui/public/agg_types/buckets/histogram.js b/src/ui/public/agg_types/buckets/histogram.js
new file mode 100644
index 0000000000000..416b387d01620
--- /dev/null
+++ b/src/ui/public/agg_types/buckets/histogram.js
@@ -0,0 +1,72 @@
+define(function (require) {
+  return function HistogramAggDefinition(Private) {
+    var _ = require('lodash');
+    var moment = require('moment');
+    var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
+    var createFilter = Private(require('ui/agg_types/buckets/create_filter/histogram'));
+
+    require('ui/validateDateInterval');
+
+    return new BucketAggType({
+      name: 'histogram',
+      title: 'Histogram',
+      ordered: {},
+      makeLabel: function (aggConfig) {
+        return aggConfig.params.field.displayName;
+      },
+      createFilter: createFilter,
+      params: [
+        {
+          name: 'field',
+          filterFieldTypes: 'number'
+        },
+
+        {
+          name: 'interval',
+          editor: require('ui/agg_types/controls/interval.html'),
+          write: function (aggConfig, output) {
+            output.params.interval = parseInt(aggConfig.params.interval, 10);
+          }
+        },
+
+        {
+          name: 'min_doc_count',
+          default: null,
+          editor: require('ui/agg_types/controls/min_doc_count.html'),
+          write: function (aggConfig, output) {
+            if (aggConfig.params.min_doc_count) {
+              output.params.min_doc_count = 0;
+            }
+          }
+        },
+
+        {
+          name: 'extended_bounds',
+          default: {},
+          editor: require('ui/agg_types/controls/extended_bounds.html'),
+          write: function (aggConfig, output) {
+            var val = aggConfig.params.extended_bounds;
+
+            if (val.min != null || val.max != null) {
+              output.params.extended_bounds = {
+                min: val.min,
+                max: val.max
+              };
+            }
+          },
+
+          // called from the editor
+          shouldShow: function (aggConfig) {
+            var field = aggConfig.params.field;
+            if (
+              field
+              && (field.type === 'number' || field.type === 'date')
+            ) {
+              return aggConfig.params.min_doc_count;
+            }
+          }
+        }
+      ]
+    });
+  };
+});
diff --git a/src/ui/public/agg_types/buckets/ip_range.js b/src/ui/public/agg_types/buckets/ip_range.js
new file mode 100644
index 0000000000000..2309043d36f43
--- /dev/null
+++ b/src/ui/public/agg_types/buckets/ip_range.js
@@ -0,0 +1,46 @@
+define(function (require) {
+  var _ = require('lodash');
+  require('ui/directives/validate_ip');
+  require('ui/directives/validate_cidr_mask');
+
+  return function RangeAggDefinition(Private) {
+    var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
+    var createFilter = Private(require('ui/agg_types/buckets/create_filter/ip_range'));
+
+    return new BucketAggType({
+      name: 'ip_range',
+      title: 'IPv4 Range',
+      createFilter: createFilter,
+      makeLabel: function (aggConfig) {
+        return aggConfig.params.field.displayName + ' IP ranges';
+      },
+      params: [
+        {
+          name: 'field',
+          filterFieldTypes: 'ip'
+        }, {
+          name: 'ipRangeType',
+          default: 'fromTo',
+          write: _.noop
+        }, {
+          name: 'ranges',
+          default: {
+            fromTo: [
+              {from: '0.0.0.0', to: '127.255.255.255'},
+              {from: '128.0.0.0', to: '191.255.255.255'}
+            ],
+            mask: [
+              {mask: '0.0.0.0/1'},
+              {mask: '128.0.0.0/2'}
+            ]
+          },
+          editor: require('ui/agg_types/controls/ip_ranges.html'),
+          write: function (aggConfig, output) {
+            var ipRangeType = aggConfig.params.ipRangeType;
+            output.params.ranges = aggConfig.params.ranges[ipRangeType];
+          }
+        }
+      ]
+    });
+  };
+});
\ No newline at end of file
diff --git a/src/ui/public/agg_types/buckets/range.js b/src/ui/public/agg_types/buckets/range.js
new file mode 100644
index 0000000000000..edc9faf39c2c2
--- /dev/null
+++ b/src/ui/public/agg_types/buckets/range.js
@@ -0,0 +1,36 @@
+define(function (require) {
+  return function RangeAggDefinition(Private) {
+    var _ = require('lodash');
+    var moment = require('moment');
+    var angular = require('angular');
+    var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
+    var createFilter = Private(require('ui/agg_types/buckets/create_filter/range'));
+
+    return new BucketAggType({
+      name: 'range',
+      title: 'Range',
+      createFilter: createFilter,
+      makeLabel: function (aggConfig) {
+        return aggConfig.params.field.displayName + ' ranges';
+      },
+      params: [
+        {
+          name: 'field',
+          filterFieldTypes: ['number']
+        },
+        {
+          name: 'ranges',
+          default: [
+            { from: 0, to: 1000 },
+            { from: 1000, to: 2000 }
+          ],
+          editor: require('ui/agg_types/controls/ranges.html'),
+          write: function (aggConfig, output) {
+            output.params.ranges = aggConfig.params.ranges;
+            output.params.keyed = true;
+          }
+        }
+      ]
+    });
+  };
+});
diff --git a/src/ui/public/agg_types/buckets/significant_terms.js b/src/ui/public/agg_types/buckets/significant_terms.js
new file mode 100644
index 0000000000000..65b833ea124c9
--- /dev/null
+++ b/src/ui/public/agg_types/buckets/significant_terms.js
@@ -0,0 +1,36 @@
+define(function (require) {
+  return function SignificantTermsAggDefinition(Private) {
+    var _ = require('lodash');
+    var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
+    var createFilter = Private(require('ui/agg_types/buckets/create_filter/terms'));
+
+    return new BucketAggType({
+      name: 'significant_terms',
+      title: 'Significant Terms',
+      makeLabel: function (aggConfig) {
+        return 'Top ' + aggConfig.params.size + ' unusual terms in ' + aggConfig.params.field.displayName;
+      },
+      createFilter: createFilter,
+      params: [
+        {
+          name: 'field',
+          filterFieldTypes: 'string'
+        },
+        {
+          name: 'size',
+          editor: require('ui/agg_types/controls/order_and_size.html'),
+        },
+        {
+          name: 'exclude',
+          type: 'regex',
+          advanced: true
+        },
+        {
+          name: 'include',
+          type: 'regex',
+          advanced: true
+        }
+      ]
+    });
+  };
+});
diff --git a/src/ui/public/agg_types/buckets/terms.js b/src/ui/public/agg_types/buckets/terms.js
new file mode 100644
index 0000000000000..c9eecec142e1b
--- /dev/null
+++ b/src/ui/public/agg_types/buckets/terms.js
@@ -0,0 +1,177 @@
+define(function (require) {
+  return function TermsAggDefinition(Private) {
+    var _ = require('lodash');
+    var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
+    var bucketCountBetween = Private(require('ui/agg_types/buckets/_bucket_count_between'));
+    var AggConfig = Private(require('ui/Vis/AggConfig'));
+    var Schemas = Private(require('ui/Vis/Schemas'));
+    var createFilter = Private(require('ui/agg_types/buckets/create_filter/terms'));
+
+    var orderAggSchema = (new Schemas([
+      {
+        group: 'none',
+        name: 'orderAgg',
+        title: 'Order Agg',
+        aggFilter: ['!percentiles', '!median', '!std_dev']
+      }
+    ])).all[0];
+
+    function isNotType(type) {
+      return function (agg) {
+        var field = agg.params.field;
+        return !field || field.type !== type;
+      };
+    }
+
+    return new BucketAggType({
+      name: 'terms',
+      title: 'Terms',
+      makeLabel: function (agg) {
+        var params = agg.params;
+        return params.field.displayName + ': ' + params.order.display;
+      },
+      createFilter: createFilter,
+      params: [
+        {
+          name: 'field',
+          scriptable: true,
+          filterFieldTypes: ['number', 'boolean', 'date', 'ip',  'string']
+        },
+        {
+          name: 'exclude',
+          type: 'regex',
+          advanced: true,
+          disabled: isNotType('string')
+        },
+        {
+          name: 'include',
+          type: 'regex',
+          advanced: true,
+          disabled: isNotType('string')
+        },
+        {
+          name: 'size',
+          default: 5
+        },
+        {
+          name: 'orderAgg',
+          type: AggConfig,
+          default: null,
+          editor: require('ui/agg_types/controls/order_agg.html'),
+          serialize: function (orderAgg) {
+            return orderAgg.toJSON();
+          },
+          deserialize: function (state, agg) {
+            return this.makeOrderAgg(agg, state);
+          },
+          makeOrderAgg: function (termsAgg, state) {
+            state = state || {};
+            state.schema = orderAggSchema;
+            var orderAgg = new AggConfig(termsAgg.vis, state);
+            orderAgg.id = termsAgg.id + '-orderAgg';
+            return orderAgg;
+          },
+          controller: function ($scope) {
+            $scope.safeMakeLabel = function (agg) {
+              try {
+                return agg.makeLabel();
+              } catch (e) {
+                return '- agg not valid -';
+              }
+            };
+
+            var INIT = {}; // flag to know when prevOrderBy has changed
+            var prevOrderBy = INIT;
+
+            $scope.$watch('responseValueAggs', updateOrderAgg);
+            $scope.$watch('agg.params.orderBy', updateOrderAgg);
+
+            function updateOrderAgg() {
+              var agg = $scope.agg;
+              var aggs = agg.vis.aggs;
+              var params = agg.params;
+              var orderBy = params.orderBy;
+              var paramDef = agg.type.params.byName.orderAgg;
+
+              // setup the initial value of orderBy
+              if (!orderBy && prevOrderBy === INIT) {
+                // abort until we get the responseValueAggs
+                if (!$scope.responseValueAggs) return;
+                params.orderBy = (_.first($scope.responseValueAggs) || { id: 'custom' }).id;
+                return;
+              }
+
+              // track the previous value
+              prevOrderBy = orderBy;
+
+              // we aren't creating a custom aggConfig
+              if (!orderBy || orderBy !== 'custom') {
+                params.orderAgg = null;
+
+                if (orderBy === '_term') {
+                  params.orderBy = '_term';
+                  return;
+                }
+
+                // ensure that orderBy is set to a valid agg
+                if (!_.find($scope.responseValueAggs, { id: orderBy })) {
+                  params.orderBy = null;
+                }
+                return;
+              }
+
+              params.orderAgg = params.orderAgg || paramDef.makeOrderAgg(agg);
+            }
+          },
+          write: function (agg, output) {
+            var vis = agg.vis;
+            var dir = agg.params.order.val;
+            var order = output.params.order = {};
+
+            var orderAgg = agg.params.orderAgg || vis.aggs.getResponseAggById(agg.params.orderBy);
+
+            // TODO: This works around an Elasticsearch bug the always casts terms agg scripts to strings
+            // thus causing issues with filtering. This probably causes other issues since float might not
+            // be able to contain the number on the elasticsearch side
+            if (output.params.script) {
+              output.params.valueType = agg.field().type === 'number' ? 'float' : agg.field().type;
+            }
+
+            if (!orderAgg) {
+              order[agg.params.orderBy || '_count'] = dir;
+              return;
+            }
+
+            if (orderAgg.type.name === 'count') {
+              order._count = dir;
+              return;
+            }
+
+            var orderAggId = orderAgg.id;
+            if (orderAgg.parentId) {
+              orderAgg = vis.aggs.byId[orderAgg.parentId];
+            }
+
+            output.subAggs = (output.subAggs || []).concat(orderAgg);
+            order[orderAggId] = dir;
+          }
+        },
+        {
+          name: 'order',
+          type: 'optioned',
+          default: 'desc',
+          editor: require('ui/agg_types/controls/order_and_size.html'),
+          options: [
+            { display: 'Descending', val: 'desc' },
+            { display: 'Ascending', val: 'asc' }
+          ],
+          write: _.noop // prevent default write, it's handled by orderAgg
+        },
+        {
+          name: 'orderBy',
+          write: _.noop // prevent default write, it's handled by orderAgg
+        }
+      ]
+    });
+  };
+});
diff --git a/src/kibana/components/agg_types/controls/date_ranges.html b/src/ui/public/agg_types/controls/date_ranges.html
similarity index 100%
rename from src/kibana/components/agg_types/controls/date_ranges.html
rename to src/ui/public/agg_types/controls/date_ranges.html
diff --git a/src/kibana/components/agg_types/controls/extended_bounds.html b/src/ui/public/agg_types/controls/extended_bounds.html
similarity index 100%
rename from src/kibana/components/agg_types/controls/extended_bounds.html
rename to src/ui/public/agg_types/controls/extended_bounds.html
diff --git a/src/kibana/components/agg_types/controls/field.html b/src/ui/public/agg_types/controls/field.html
similarity index 100%
rename from src/kibana/components/agg_types/controls/field.html
rename to src/ui/public/agg_types/controls/field.html
diff --git a/src/kibana/components/agg_types/controls/filters.html b/src/ui/public/agg_types/controls/filters.html
similarity index 100%
rename from src/kibana/components/agg_types/controls/filters.html
rename to src/ui/public/agg_types/controls/filters.html
diff --git a/src/kibana/components/agg_types/controls/interval.html b/src/ui/public/agg_types/controls/interval.html
similarity index 100%
rename from src/kibana/components/agg_types/controls/interval.html
rename to src/ui/public/agg_types/controls/interval.html
diff --git a/src/kibana/components/agg_types/controls/ip_ranges.html b/src/ui/public/agg_types/controls/ip_ranges.html
similarity index 100%
rename from src/kibana/components/agg_types/controls/ip_ranges.html
rename to src/ui/public/agg_types/controls/ip_ranges.html
diff --git a/src/kibana/components/agg_types/controls/min_doc_count.html b/src/ui/public/agg_types/controls/min_doc_count.html
similarity index 100%
rename from src/kibana/components/agg_types/controls/min_doc_count.html
rename to src/ui/public/agg_types/controls/min_doc_count.html
diff --git a/src/kibana/components/agg_types/controls/order_agg.html b/src/ui/public/agg_types/controls/order_agg.html
similarity index 100%
rename from src/kibana/components/agg_types/controls/order_agg.html
rename to src/ui/public/agg_types/controls/order_agg.html
diff --git a/src/kibana/components/agg_types/controls/order_and_size.html b/src/ui/public/agg_types/controls/order_and_size.html
similarity index 100%
rename from src/kibana/components/agg_types/controls/order_and_size.html
rename to src/ui/public/agg_types/controls/order_and_size.html
diff --git a/src/kibana/components/agg_types/controls/percentile_ranks.html b/src/ui/public/agg_types/controls/percentile_ranks.html
similarity index 100%
rename from src/kibana/components/agg_types/controls/percentile_ranks.html
rename to src/ui/public/agg_types/controls/percentile_ranks.html
diff --git a/src/kibana/components/agg_types/controls/percentiles.html b/src/ui/public/agg_types/controls/percentiles.html
similarity index 100%
rename from src/kibana/components/agg_types/controls/percentiles.html
rename to src/ui/public/agg_types/controls/percentiles.html
diff --git a/src/kibana/components/agg_types/controls/precision.html b/src/ui/public/agg_types/controls/precision.html
similarity index 100%
rename from src/kibana/components/agg_types/controls/precision.html
rename to src/ui/public/agg_types/controls/precision.html
diff --git a/src/kibana/components/agg_types/controls/ranges.html b/src/ui/public/agg_types/controls/ranges.html
similarity index 100%
rename from src/kibana/components/agg_types/controls/ranges.html
rename to src/ui/public/agg_types/controls/ranges.html
diff --git a/src/kibana/components/agg_types/controls/raw_json.html b/src/ui/public/agg_types/controls/raw_json.html
similarity index 100%
rename from src/kibana/components/agg_types/controls/raw_json.html
rename to src/ui/public/agg_types/controls/raw_json.html
diff --git a/src/kibana/components/agg_types/controls/regular_expression.html b/src/ui/public/agg_types/controls/regular_expression.html
similarity index 100%
rename from src/kibana/components/agg_types/controls/regular_expression.html
rename to src/ui/public/agg_types/controls/regular_expression.html
diff --git a/src/kibana/components/agg_types/controls/string.html b/src/ui/public/agg_types/controls/string.html
similarity index 100%
rename from src/kibana/components/agg_types/controls/string.html
rename to src/ui/public/agg_types/controls/string.html
diff --git a/src/ui/public/agg_types/index.js b/src/ui/public/agg_types/index.js
new file mode 100644
index 0000000000000..f0b0aa43c6811
--- /dev/null
+++ b/src/ui/public/agg_types/index.js
@@ -0,0 +1,61 @@
+define(function (require) {
+  return function AggTypeService(Private) {
+    var IndexedArray = require('ui/IndexedArray');
+
+    var aggs = {
+      metrics: [
+        Private(require('ui/agg_types/metrics/count')),
+        Private(require('ui/agg_types/metrics/avg')),
+        Private(require('ui/agg_types/metrics/sum')),
+        Private(require('ui/agg_types/metrics/median')),
+        Private(require('ui/agg_types/metrics/min')),
+        Private(require('ui/agg_types/metrics/max')),
+        Private(require('ui/agg_types/metrics/stdDeviation')),
+        Private(require('ui/agg_types/metrics/cardinality')),
+        Private(require('ui/agg_types/metrics/percentiles')),
+        Private(require('ui/agg_types/metrics/percentile_ranks'))
+      ],
+      buckets: [
+        Private(require('ui/agg_types/buckets/date_histogram')),
+        Private(require('ui/agg_types/buckets/histogram')),
+        Private(require('ui/agg_types/buckets/range')),
+        Private(require('ui/agg_types/buckets/date_range')),
+        Private(require('ui/agg_types/buckets/ip_range')),
+        Private(require('ui/agg_types/buckets/terms')),
+        Private(require('ui/agg_types/buckets/filters')),
+        Private(require('ui/agg_types/buckets/significant_terms')),
+        Private(require('ui/agg_types/buckets/geo_hash'))
+      ]
+    };
+
+    Object.keys(aggs).forEach(function (type) {
+      aggs[type].forEach(function (agg) {
+        agg.type = type;
+      });
+    });
+
+
+    /**
+     * IndexedArray of Aggregation Types.
+     *
+     * These types form two groups, metric and buckets.
+     *
+     * @module agg_types
+     * @type {IndexedArray}
+     */
+    return new IndexedArray({
+
+      /**
+       * @type {Array}
+       */
+      index: ['name'],
+
+      /**
+       * [group description]
+       * @type {Array}
+       */
+      group: ['type'],
+      initialSet: aggs.metrics.concat(aggs.buckets)
+    });
+  };
+});
diff --git a/src/ui/public/agg_types/metrics/MetricAggType.js b/src/ui/public/agg_types/metrics/MetricAggType.js
new file mode 100644
index 0000000000000..85c7c98abdc56
--- /dev/null
+++ b/src/ui/public/agg_types/metrics/MetricAggType.js
@@ -0,0 +1,43 @@
+define(function (require) {
+  return function MetricAggTypeProvider(Private) {
+    var _ = require('lodash');
+    var AggType = Private(require('ui/agg_types/AggType'));
+    var fieldFormats = Private(require('ui/registry/field_formats'));
+
+    _.class(MetricAggType).inherits(AggType);
+    function MetricAggType(config) {
+      MetricAggType.Super.call(this, config);
+
+      // allow overriding any value on the prototype
+      _.forOwn(config, function (val, key) {
+        if (_.has(MetricAggType.prototype, key)) {
+          this[key] = val;
+        }
+      }, this);
+    }
+
+    /**
+     * Read the values for this metric from the
+     * @param  {[type]} bucket [description]
+     * @return {[type]}        [description]
+     */
+    MetricAggType.prototype.getValue = function (agg, bucket) {
+      return bucket[agg.id].value;
+    };
+
+    /**
+     * Pick a format for the values produced by this agg type,
+     * overriden by several metrics that always output a simple
+     * number
+     *
+     * @param  {agg} agg - the agg to pick a format for
+     * @return {FieldFromat}
+     */
+    MetricAggType.prototype.getFormat = function (agg) {
+      var field = agg.field();
+      return field ? field.format : fieldFormats.getDefaultInstance('number');
+    };
+
+    return MetricAggType;
+  };
+});
diff --git a/src/kibana/components/agg_types/metrics/avg.js b/src/ui/public/agg_types/metrics/avg.js
similarity index 81%
rename from src/kibana/components/agg_types/metrics/avg.js
rename to src/ui/public/agg_types/metrics/avg.js
index 47ef4574b9b0c..1a7a1abb755c7 100644
--- a/src/kibana/components/agg_types/metrics/avg.js
+++ b/src/ui/public/agg_types/metrics/avg.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function AggTypeMetricAvgProvider(Private) {
-    var MetricAggType = Private(require('components/agg_types/metrics/_metric_agg_type'));
+    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
 
     return new MetricAggType({
       name: 'avg',
diff --git a/src/kibana/components/agg_types/metrics/cardinality.js b/src/ui/public/agg_types/metrics/cardinality.js
similarity index 75%
rename from src/kibana/components/agg_types/metrics/cardinality.js
rename to src/ui/public/agg_types/metrics/cardinality.js
index c587b7f9df34d..f4eef38de8b42 100644
--- a/src/kibana/components/agg_types/metrics/cardinality.js
+++ b/src/ui/public/agg_types/metrics/cardinality.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function AggTypeMetricCardinalityProvider(Private) {
-    var MetricAggType = Private(require('components/agg_types/metrics/_metric_agg_type'));
-    var fieldFormats = Private(require('registry/field_formats'));
+    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
+    var fieldFormats = Private(require('ui/registry/field_formats'));
 
     return new MetricAggType({
       name: 'cardinality',
diff --git a/src/ui/public/agg_types/metrics/count.js b/src/ui/public/agg_types/metrics/count.js
new file mode 100644
index 0000000000000..a4d49d3084dcb
--- /dev/null
+++ b/src/ui/public/agg_types/metrics/count.js
@@ -0,0 +1,21 @@
+define(function (require) {
+  return function AggTypeMetricCountProvider(Private) {
+    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
+    var fieldFormats = Private(require('ui/registry/field_formats'));
+
+    return new MetricAggType({
+      name: 'count',
+      title: 'Count',
+      hasNoDsl: true,
+      makeLabel: function () {
+        return 'Count';
+      },
+      getFormat: function () {
+        return fieldFormats.getDefaultInstance('number');
+      },
+      getValue: function (agg, bucket) {
+        return bucket.doc_count;
+      }
+    });
+  };
+});
diff --git a/src/kibana/components/agg_types/metrics/_get_response_agg_config.js b/src/ui/public/agg_types/metrics/getResponseAggConfigClass.js
similarity index 100%
rename from src/kibana/components/agg_types/metrics/_get_response_agg_config.js
rename to src/ui/public/agg_types/metrics/getResponseAggConfigClass.js
diff --git a/src/kibana/components/agg_types/metrics/max.js b/src/ui/public/agg_types/metrics/max.js
similarity index 81%
rename from src/kibana/components/agg_types/metrics/max.js
rename to src/ui/public/agg_types/metrics/max.js
index 4bbe7bde52d51..ea0a5387d9495 100644
--- a/src/kibana/components/agg_types/metrics/max.js
+++ b/src/ui/public/agg_types/metrics/max.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function AggTypeMetricMaxProvider(Private) {
-    var MetricAggType = Private(require('components/agg_types/metrics/_metric_agg_type'));
+    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
 
     return new MetricAggType({
       name: 'max',
diff --git a/src/ui/public/agg_types/metrics/median.js b/src/ui/public/agg_types/metrics/median.js
new file mode 100644
index 0000000000000..9b8f982ded545
--- /dev/null
+++ b/src/ui/public/agg_types/metrics/median.js
@@ -0,0 +1,29 @@
+define(function (require) {
+  return function AggTypeMetricMaxProvider(Private) {
+    var _ = require('lodash');
+    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
+    var getResponseAggConfigClass = Private(require('ui/agg_types/metrics/getResponseAggConfigClass'));
+    var percentiles = Private(require('ui/agg_types/metrics/percentiles'));
+
+    return new MetricAggType({
+      name: 'median',
+      dslName: 'percentiles',
+      title: 'Median',
+      makeLabel: function (aggConfig) {
+        return 'Median ' + aggConfig.params.field.displayName;
+      },
+      params: [
+        {
+          name: 'field',
+          filterFieldTypes: 'number'
+        },
+        {
+          name: 'percents',
+          default: [50]
+        }
+      ],
+      getResponseAggs: percentiles.getResponseAggs,
+      getValue: percentiles.getValue
+    });
+  };
+});
diff --git a/src/kibana/components/agg_types/metrics/min.js b/src/ui/public/agg_types/metrics/min.js
similarity index 81%
rename from src/kibana/components/agg_types/metrics/min.js
rename to src/ui/public/agg_types/metrics/min.js
index 6007fb069cf17..0a993668158d4 100644
--- a/src/kibana/components/agg_types/metrics/min.js
+++ b/src/ui/public/agg_types/metrics/min.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function AggTypeMetricMinProvider(Private) {
-    var MetricAggType = Private(require('components/agg_types/metrics/_metric_agg_type'));
+    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
 
     return new MetricAggType({
       name: 'min',
diff --git a/src/kibana/components/agg_types/metrics/percentile_ranks.js b/src/ui/public/agg_types/metrics/percentile_ranks.js
similarity index 76%
rename from src/kibana/components/agg_types/metrics/percentile_ranks.js
rename to src/ui/public/agg_types/metrics/percentile_ranks.js
index eec723c5713e4..4e167c8016776 100644
--- a/src/kibana/components/agg_types/metrics/percentile_ranks.js
+++ b/src/ui/public/agg_types/metrics/percentile_ranks.js
@@ -2,13 +2,13 @@ define(function (require) {
   return function AggTypeMetricPercentileRanksProvider(Private) {
     var _ = require('lodash');
 
-    var MetricAggType = Private(require('components/agg_types/metrics/_metric_agg_type'));
-    var getResponseAggConfig = Private(require('components/agg_types/metrics/_get_response_agg_config'));
-    var fieldFormats = Private(require('registry/field_formats'));
+    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
+    var getResponseAggConfigClass = Private(require('ui/agg_types/metrics/getResponseAggConfigClass'));
+    var fieldFormats = Private(require('ui/registry/field_formats'));
 
-    var valuesEditor = require('text!components/agg_types/controls/percentile_ranks.html');
+    var valuesEditor = require('ui/agg_types/controls/percentile_ranks.html');
     // required by the values editor
-    require('components/number_list/number_list');
+    require('ui/number_list');
 
     var valueProps = {
       makeLabel: function () {
@@ -37,7 +37,7 @@ define(function (require) {
         }
       ],
       getResponseAggs: function (agg) {
-        var ValueAggConfig = getResponseAggConfig(agg, valueProps);
+        var ValueAggConfig = getResponseAggConfigClass(agg, valueProps);
 
         return agg.params.values.map(function (value) {
           return new ValueAggConfig(value);
diff --git a/src/ui/public/agg_types/metrics/percentiles.js b/src/ui/public/agg_types/metrics/percentiles.js
new file mode 100644
index 0000000000000..101ee08318f61
--- /dev/null
+++ b/src/ui/public/agg_types/metrics/percentiles.js
@@ -0,0 +1,53 @@
+define(function (require) {
+  return function AggTypeMetricPercentilesProvider(Private) {
+    var _ = require('lodash');
+
+    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
+    var getResponseAggConfigClass = Private(require('ui/agg_types/metrics/getResponseAggConfigClass'));
+    var ordinalSuffix = require('ui/utils/ordinal_suffix');
+    var fieldFormats = Private(require('ui/registry/field_formats'));
+
+    var percentsEditor = require('ui/agg_types/controls/percentiles.html');
+    // required by the percentiles editor
+    require('ui/number_list');
+
+    var valueProps = {
+      makeLabel: function () {
+        return ordinalSuffix(this.key) + ' percentile of ' + this.fieldDisplayName();
+      }
+    };
+
+    return new MetricAggType({
+      name: 'percentiles',
+      title: 'Percentiles',
+      makeLabel: function (agg) {
+        return 'Percentiles of ' + agg.fieldDisplayName();
+      },
+      params: [
+        {
+          name: 'field',
+          filterFieldTypes: 'number'
+        },
+        {
+          name: 'percents',
+          editor: percentsEditor,
+          default: [1, 5, 25, 50, 75, 95, 99]
+        }
+      ],
+      getResponseAggs: function (agg) {
+        var ValueAggConfig = getResponseAggConfigClass(agg, valueProps);
+
+        return agg.params.percents.map(function (percent) {
+          return new ValueAggConfig(percent);
+        });
+      },
+      getValue: function (agg, bucket) {
+        // percentiles for 1, 5, and 10 will come back as 1.0, 5.0, and 10.0 so we
+        // parse the keys and respond with the value that matches
+        return _.find(bucket[agg.parentId].values, function (value, key) {
+          return agg.key === parseFloat(key);
+        });
+      }
+    });
+  };
+});
diff --git a/src/ui/public/agg_types/metrics/stdDeviation.js b/src/ui/public/agg_types/metrics/stdDeviation.js
new file mode 100644
index 0000000000000..17d5d54d0bf1a
--- /dev/null
+++ b/src/ui/public/agg_types/metrics/stdDeviation.js
@@ -0,0 +1,61 @@
+define(function (require) {
+  return function AggTypeMetricStandardDeviationProvider(Private) {
+    var _ = require('lodash');
+    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
+    var getResponseAggConfigClass = Private(require('ui/agg_types/metrics/getResponseAggConfigClass'));
+
+    var responseAggConfigProps = {
+      valProp: function () {
+        var details = this.keyedDetails[this.key];
+        return details.valProp;
+      },
+      makeLabel: function () {
+        var details = this.keyedDetails[this.key];
+        return details.title + ' of ' + this.fieldDisplayName();
+      },
+      keyedDetails: {
+        std_lower: {
+          valProp: ['std_deviation_bounds', 'lower'],
+          title: 'Lower Standard Deviation'
+        },
+        avg: {
+          valProp: 'avg',
+          title: 'Average'
+        },
+        std_upper: {
+          valProp: ['std_deviation_bounds', 'upper'],
+          title: 'Upper Standard Deviation'
+        }
+      }
+    };
+
+    return new MetricAggType({
+      name: 'std_dev',
+      dslName: 'extended_stats',
+      title: 'Standard Deviation',
+      makeLabel: function (agg) {
+        return 'Standard Deviation of ' + agg.fieldDisplayName();
+      },
+      params: [
+        {
+          name: 'field',
+          filterFieldTypes: 'number'
+        }
+      ],
+
+      getResponseAggs: function (agg) {
+        var ValueAggConfig = getResponseAggConfigClass(agg, responseAggConfigProps);
+
+        return [
+          new ValueAggConfig('std_lower'),
+          new ValueAggConfig('avg'),
+          new ValueAggConfig('std_upper')
+        ];
+      },
+
+      getValue: function (agg, bucket) {
+        return _.get(bucket[agg.parentId], agg.valProp());
+      }
+    });
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/components/agg_types/metrics/sum.js b/src/ui/public/agg_types/metrics/sum.js
similarity index 80%
rename from src/kibana/components/agg_types/metrics/sum.js
rename to src/ui/public/agg_types/metrics/sum.js
index d7e5f0bc7d0cd..5d0261f72e0b1 100644
--- a/src/kibana/components/agg_types/metrics/sum.js
+++ b/src/ui/public/agg_types/metrics/sum.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function AggTypeMetricSumProvider(Private) {
-    var MetricAggType = Private(require('components/agg_types/metrics/_metric_agg_type'));
+    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
 
     return new MetricAggType({
       name: 'sum',
diff --git a/src/kibana/components/agg_types/param_types/base.js b/src/ui/public/agg_types/param_types/base.js
similarity index 100%
rename from src/kibana/components/agg_types/param_types/base.js
rename to src/ui/public/agg_types/param_types/base.js
diff --git a/src/kibana/components/agg_types/param_types/field.js b/src/ui/public/agg_types/param_types/field.js
similarity index 89%
rename from src/kibana/components/agg_types/param_types/field.js
rename to src/ui/public/agg_types/param_types/field.js
index 0bca4bd87d6ac..8a697da80f9a3 100644
--- a/src/kibana/components/agg_types/param_types/field.js
+++ b/src/ui/public/agg_types/param_types/field.js
@@ -2,9 +2,9 @@ define(function (require) {
   return function FieldAggParamFactory(Private) {
     var _ = require('lodash');
 
-    var editorHtml = require('text!components/agg_types/controls/field.html');
-    var BaseAggParam = Private(require('components/agg_types/param_types/base'));
-    var SavedObjectNotFound = require('errors').SavedObjectNotFound;
+    var editorHtml = require('ui/agg_types/controls/field.html');
+    var BaseAggParam = Private(require('ui/agg_types/param_types/base'));
+    var SavedObjectNotFound = require('ui/errors').SavedObjectNotFound;
 
     _.class(FieldAggParam).inherits(BaseAggParam);
     function FieldAggParam(config) {
diff --git a/src/kibana/components/agg_types/param_types/optioned.js b/src/ui/public/agg_types/param_types/optioned.js
similarity index 91%
rename from src/kibana/components/agg_types/param_types/optioned.js
rename to src/ui/public/agg_types/param_types/optioned.js
index 0f208a7031f4a..4f66fd42ecf81 100644
--- a/src/kibana/components/agg_types/param_types/optioned.js
+++ b/src/ui/public/agg_types/param_types/optioned.js
@@ -2,8 +2,8 @@ define(function (require) {
   return function OptionedAggParamFactory(Private) {
     var _ = require('lodash');
 
-    var IndexedArray = require('utils/indexed_array/index');
-    var BaseAggParam = Private(require('components/agg_types/param_types/base'));
+    var IndexedArray = require('ui/IndexedArray');
+    var BaseAggParam = Private(require('ui/agg_types/param_types/base'));
 
     _.class(OptionedAggParam).inherits(BaseAggParam);
     function OptionedAggParam(config) {
diff --git a/src/kibana/components/agg_types/param_types/raw_json.js b/src/ui/public/agg_types/param_types/raw_json.js
similarity index 92%
rename from src/kibana/components/agg_types/param_types/raw_json.js
rename to src/ui/public/agg_types/param_types/raw_json.js
index 003a17d0eccb4..c338ee8feec34 100644
--- a/src/kibana/components/agg_types/param_types/raw_json.js
+++ b/src/ui/public/agg_types/param_types/raw_json.js
@@ -2,8 +2,8 @@ define(function (require) {
   return function RawJSONAggParamFactory(Private) {
     var _ = require('lodash');
 
-    var BaseAggParam = Private(require('components/agg_types/param_types/base'));
-    var editorHtml = require('text!components/agg_types/controls/raw_json.html');
+    var BaseAggParam = Private(require('ui/agg_types/param_types/base'));
+    var editorHtml = require('ui/agg_types/controls/raw_json.html');
 
     _.class(RawJSONAggParam).inherits(BaseAggParam);
     function RawJSONAggParam(config) {
diff --git a/src/kibana/components/agg_types/param_types/regex.js b/src/ui/public/agg_types/param_types/regex.js
similarity index 91%
rename from src/kibana/components/agg_types/param_types/regex.js
rename to src/ui/public/agg_types/param_types/regex.js
index fa9c5d8b97578..7a0846e2c36d3 100644
--- a/src/kibana/components/agg_types/param_types/regex.js
+++ b/src/ui/public/agg_types/param_types/regex.js
@@ -2,8 +2,8 @@ define(function (require) {
   return function RegexAggParamFactory(Private) {
     var _ = require('lodash');
 
-    var BaseAggParam = Private(require('components/agg_types/param_types/base'));
-    var editorHtml = require('text!components/agg_types/controls/regular_expression.html');
+    var BaseAggParam = Private(require('ui/agg_types/param_types/base'));
+    var editorHtml = require('ui/agg_types/controls/regular_expression.html');
 
     _.class(RegexAggParam).inherits(BaseAggParam);
     function RegexAggParam(config) {
diff --git a/src/kibana/components/agg_types/param_types/string.js b/src/ui/public/agg_types/param_types/string.js
similarity index 86%
rename from src/kibana/components/agg_types/param_types/string.js
rename to src/ui/public/agg_types/param_types/string.js
index d4d129645fd84..102225e54c8c3 100644
--- a/src/kibana/components/agg_types/param_types/string.js
+++ b/src/ui/public/agg_types/param_types/string.js
@@ -2,8 +2,8 @@ define(function (require) {
   return function FieldAggParamFactory(Private) {
     var _ = require('lodash');
 
-    var editorHtml = require('text!components/agg_types/controls/string.html');
-    var BaseAggParam = Private(require('components/agg_types/param_types/base'));
+    var editorHtml = require('ui/agg_types/controls/string.html');
+    var BaseAggParam = Private(require('ui/agg_types/param_types/base'));
 
     _.class(ScriptAggParam).inherits(BaseAggParam);
     function ScriptAggParam(config) {
diff --git a/src/ui/public/bind/__tests__/bind.js b/src/ui/public/bind/__tests__/bind.js
new file mode 100644
index 0000000000000..9efe5d150d7e2
--- /dev/null
+++ b/src/ui/public/bind/__tests__/bind.js
@@ -0,0 +1,71 @@
+
+describe('$scope.$bind', function () {
+  var sinon = require('auto-release-sinon');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var $rootScope;
+  var $scope;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function ($injector) {
+    $rootScope = $injector.get('$rootScope');
+    $scope = $rootScope.$new();
+  }));
+
+  it('exposes $bind on all scopes', function () {
+    expect($rootScope.$bind).to.be.a('function');
+    expect($scope).to.have.property('$bind', $rootScope.$bind);
+
+    var $isoScope = $scope.$new(true);
+    expect($isoScope).to.have.property('$bind', $rootScope.$bind);
+  });
+
+  it('sets up binding from a parent scope to it\'s child', function () {
+    $rootScope.val = 'foo';
+    $scope.$bind('localVal', 'val');
+    expect($scope.localVal).to.be('foo');
+
+    $rootScope.val = 'bar';
+    expect($scope.localVal).to.be('foo'); // shouldn't have changed yet
+
+    $rootScope.$apply();
+    expect($scope.localVal).to.be('bar');
+  });
+
+  it('sets up a binding from the child to the parent scope', function () {
+    var stub = sinon.stub();
+
+    $rootScope.val = 'foo';
+    $scope.$bind('localVal', 'val');
+    expect($scope.localVal).to.be('foo');
+
+    $scope.localVal = 'bar';
+    expect($rootScope.val).to.be('foo'); // shouldn't have changed yet
+
+    $scope.$apply();
+    expect($rootScope.val).to.be('bar');
+  });
+
+  it('pulls from the scopes $parent by default', function () {
+    var $parent = $rootScope.$new();
+    var $self = $parent.$new();
+
+    $parent.val = 'foo';
+    $self.val = 'bar';
+
+    $self.$bind('localVal', 'val');
+    expect($self.localVal).to.be('foo');
+  });
+
+  it('accepts an alternate scope to read from', function () {
+    var $parent = $rootScope.$new();
+    var $self = $parent.$new();
+
+    $parent.val = 'foo';
+    $self.val = 'bar';
+
+    $self.$bind('localVal', 'val', $self);
+    expect($self.localVal).to.be('bar');
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/bind/bind.js b/src/ui/public/bind/bind.js
new file mode 100644
index 0000000000000..7b826af8eb873
--- /dev/null
+++ b/src/ui/public/bind/bind.js
@@ -0,0 +1,80 @@
+define(function (require) {
+  var _ = require('lodash');
+  var angular = require('angular');
+
+  require('ui/modules').get('kibana')
+  .config(function ($provide) {
+
+    function strictEquality(a, b) {
+      // are the values equal? or, are they both NaN?
+      return a === b || (a !== a && b !== b);
+    }
+
+    function errorNotAssignable(source, target) {
+      throw Error('Unable to accept change to bound $scope property "' + source + '"' +
+        ' because source expression "' + target + '" is not assignable!');
+    }
+
+    $provide.decorator('$rootScope', function ($delegate, $parse) {
+      /**
+       * Two-way bind a value from scope to another property on scope. This
+       * allow values on scope that work like they do in an isolate scope, but
+       * without requiring one.
+       *
+       * @param  {expression} to - the location on scope to bind to
+       * @param  {expression} from - the location on scope to bind from
+       * @param  {Scope} $sourceScope - the scope to read "from" expression from
+       * @return {undefined}
+       */
+      $delegate.constructor.prototype.$bind = function (to, from, $sourceScope) {
+        var $source = $sourceScope || this.$parent;
+        var $target = this;
+
+        // parse expressions
+        var $to = $parse(to);
+        if (!$to.assign) errorNotAssignable(to, from);
+        var $from = $parse(from);
+        $from.assignOrFail = $from.assign || function () {
+          // revert the change and throw an error, child writes aren't supported
+          $to($target, lastSourceVal = $from($source));
+          errorNotAssignable(from, to);
+        };
+
+        // bind scopes to expressions
+        var getTarget = function () { return $to($target); };
+        var setTarget = function (v) { return $to.assign($target, v); };
+        var getSource = function () { return $from($source); };
+        var setSource = function (v) { return $from.assignOrFail($source, v); };
+
+        // if we are syncing down a literal, then we use loose equality check
+        var strict = !$from.literal;
+        var compare = strict ? strictEquality : angular.equals;
+
+        // to support writing from the child to the parent we need to know
+        // which source has changed. Track the source value and anytime it
+        // changes (even if the target value changed too) push from source
+        // to target. If the source hasn't changed then the change is from
+        // the target and push accordingly
+        var lastSourceVal = getSource();
+
+        // push the initial value down, start off in sync
+        setTarget(lastSourceVal);
+
+        $target.$watch(function () {
+          var sourceVal = getSource();
+          var targetVal = getTarget();
+
+          var outOfSync = !compare(sourceVal, targetVal);
+          var sourceChanged = outOfSync && !compare(sourceVal, lastSourceVal);
+
+          if (sourceChanged) setTarget(sourceVal);
+          else if (outOfSync) setSource(targetVal);
+
+          return lastSourceVal = sourceVal;
+        }, null, !strict);
+      };
+
+      return $delegate;
+    });
+  });
+});
diff --git a/src/kibana/components/bound_to_config_obj.js b/src/ui/public/bound_to_config_obj.js
similarity index 100%
rename from src/kibana/components/bound_to_config_obj.js
rename to src/ui/public/bound_to_config_obj.js
diff --git a/src/ui/public/chrome/Tab.js b/src/ui/public/chrome/Tab.js
new file mode 100644
index 0000000000000..4abe392ea4506
--- /dev/null
+++ b/src/ui/public/chrome/Tab.js
@@ -0,0 +1,37 @@
+var _ = require('lodash');
+var storage = window.sessionStorage;
+
+function Tab(spec) {
+  this.id = spec.id;
+  this.title = spec.title;
+  this.active = false;
+  this.resetWhenActive = !!spec.resetWhenActive;
+  this.lastUrlStoreKey = spec.trackLastPath ? 'lastUrl:' + this.id : null;
+  this.rootUrl = '/' + this.id;
+  this.lastUrl = this.lastUrlStoreKey && storage.getItem(this.lastUrlStoreKey);
+
+  this.activeIndicatorColor = spec.activeIndicatorColor || null;
+  if (_.isFunction(this.activeIndicatorColor)) {
+    // convert to a getter
+    Object.defineProperty(this, 'activeIndicatorColor', {
+      get: this.activeIndicatorColor
+    });
+  }
+}
+
+Tab.prototype.persistLastUrl = function (url) {
+  if (!this.lastUrlStoreKey) return;
+  this.lastUrl = url;
+  storage.setItem(this.lastUrlStoreKey, this.lastUrl);
+};
+
+Tab.prototype.href = function () {
+  if (this.active) {
+    if (this.resetWhenActive) return '#' + this.rootUrl;
+    return null;
+  }
+
+  return '#' + (this.lastUrl || this.rootUrl);
+};
+
+module.exports = Tab;
diff --git a/src/ui/public/chrome/TabCollection.js b/src/ui/public/chrome/TabCollection.js
new file mode 100644
index 0000000000000..49b25998c7dad
--- /dev/null
+++ b/src/ui/public/chrome/TabCollection.js
@@ -0,0 +1,62 @@
+var _ = require('lodash');
+var Tab = require('ui/chrome/Tab');
+var format = require('url').format;
+var parse = _.wrap(require('url').parse, function (parse, path) {
+  var parsed = parse(path, true);
+  return {
+    pathname: parsed.pathname,
+    query: parsed.query || {},
+    hash: parsed.hash
+  };
+});
+
+function TabCollection() {
+
+  var tabs = null;
+  var specs = null;
+  var defaults = null;
+  var activeTab = null;
+
+  this.set = function (_specs) {
+    specs = _.cloneDeep([].concat(_specs || []));
+    this._rebuildTabs();
+  };
+
+  this.setDefaults = function () {
+    defaults = _.clone(arguments[0]);
+    this._rebuildTabs();
+  };
+
+  this.get = function () {
+    return [].concat(tabs || []);
+  };
+
+  this._rebuildTabs = function () {
+    _.invoke(this.get(), 'destroy');
+    tabs = _.map(specs, function (spec) {
+      return new Tab(_.defaults({}, spec, defaults));
+    });
+  };
+
+  this.getActive = function () {
+    return activeTab;
+  };
+
+  this.consumeRouteUpdate = function ($location, persist) {
+    var url = parse($location.url(), true);
+    var id = $location.path().split('/')[1] || '';
+
+    tabs.forEach(function (tab) {
+      var active = tab.active = (tab.id === id);
+      var lastUrl = active ? url : parse(tab.lastUrl || tab.rootUrl);
+      lastUrl.query._g = url.query._g;
+
+      if (tab.active) activeTab = tab;
+      if (persist) {
+        tab.persistLastUrl(format(lastUrl));
+      }
+    });
+  };
+}
+
+module.exports = TabCollection;
diff --git a/src/ui/public/chrome/api/angular.js b/src/ui/public/chrome/api/angular.js
new file mode 100644
index 0000000000000..94cd95589f2e5
--- /dev/null
+++ b/src/ui/public/chrome/api/angular.js
@@ -0,0 +1,66 @@
+var modules = require('ui/modules');
+var $ = require('jquery');
+var _ = require('lodash');
+
+module.exports = function (chrome, internals) {
+  chrome.setupAngular = function () {
+    var kibana = modules.get('kibana');
+
+    var esUrl = (function () {
+      var a = document.createElement('a');
+      a.href = '/elasticsearch';
+      return a.href;
+    }());
+
+    kibana
+    .constant('kbnVersion', internals.version)
+    .constant('buildNum', internals.buildNumber)
+    .constant('kbnIndex', internals.kbnIndex)
+    .constant('esShardTimeout', internals.esShardTimeout)
+    .constant('esUrl', esUrl)
+    .constant('commitSha', internals.buildSha)
+    .constant('cacheBust', internals.cacheBust)
+    .constant('minimumElasticsearchVersion', '2.0.0')
+    .constant('sessionId', Date.now())
+    .directive('kbnChrome', function ($rootScope) {
+      return {
+        compile: function ($el) {
+          var $content = $(require('ui/chrome/chrome.html'));
+          var $app = $content.find('.application');
+
+          if (internals.rootController) {
+            $app.attr('ng-controller', internals.rootController);
+          }
+
+          if (internals.rootTemplate) {
+            $app.removeAttr('ng-view');
+            $app.html(internals.rootTemplate);
+          }
+
+          $el.append($content);
+        },
+        controllerAs: 'chrome',
+        controller: function ($scope, $rootScope, $location, $http) {
+
+          // are we showing the embedded version of the chrome?
+          chrome.embedded = Boolean($location.search().embed);
+
+          // listen for route changes, propogate to tabs
+          var onRouteChange = _.bindKey(internals.tabs, 'consumeRouteUpdate', $location, !chrome.embedded);
+          $rootScope.$on('$routeChangeSuccess', onRouteChange);
+          $rootScope.$on('$routeUpdate', onRouteChange);
+          onRouteChange();
+
+          // and some local values
+          $scope.httpActive = $http.pendingRequests;
+          $scope.notifList = require('ui/notify')._notifs;
+
+          return chrome;
+        }
+      };
+    });
+
+    modules.link(kibana);
+  };
+
+};
diff --git a/src/ui/public/chrome/api/apps.js b/src/ui/public/chrome/api/apps.js
new file mode 100644
index 0000000000000..44280701b87d0
--- /dev/null
+++ b/src/ui/public/chrome/api/apps.js
@@ -0,0 +1,34 @@
+var _ = require('lodash');
+
+module.exports = function (chrome, internals) {
+
+  /**
+   * ui/chrome apps API
+   *
+   *   ui/chrome has some metadata about the current app, and enables the
+   *   navbar link, a small grid to the left of the tabs, when there is more
+   *   than one app installed.
+   */
+
+  chrome.setShowAppsLink = function (val) {
+    internals.showAppsLink = !!val;
+    return chrome;
+  };
+
+  chrome.getShowAppsLink = function () {
+    return internals.showAppsLink == null ? internals.appCount > 1 : internals.showAppsLink;
+  };
+
+  chrome.getApp = function () {
+    return _.clone(internals.app);
+  };
+
+  chrome.getAppTitle = function () {
+    return internals.app.title;
+  };
+
+  chrome.getAppId = function () {
+    return internals.app.id;
+  };
+
+};
diff --git a/src/ui/public/chrome/api/tabs.js b/src/ui/public/chrome/api/tabs.js
new file mode 100644
index 0000000000000..0d30385bf1461
--- /dev/null
+++ b/src/ui/public/chrome/api/tabs.js
@@ -0,0 +1,92 @@
+var _ = require('lodash');
+
+module.exports = function (chrome, internals) {
+
+  /**
+   * ui/chrome tabs API
+   *
+   *   The navbar at the top of the page can be assigned links which will
+   *   pile up on the left. Each of these links has several properties that define
+   *   how it is rendered, how it looks when it's "active" and what happens when
+   *   it's clicked.
+   *
+   *   To define a set of tabs, pass setTabs an array of TabSpec objects,
+   *   which are just plain objects with the following properties:
+   *
+   *   id {string}
+   *     a unique value for this tab, should match the first path segment of
+   *     routes that are supposed to belong to this tab and is matched against the route
+   *     everytime it changes. When clicking the tab for the first time the user will be
+   *     sent to the '/${tab.id}' url which you can use to redirect to another url if needed
+   *
+   *   title {string}
+   *     the text the tab should show
+   *
+   *   resetWhenActive {boolean}
+   *     when the the tab is considered active, should clicking it
+   *     cause a redirect to just the id?
+   *
+   *   trackLastPath {boolean}
+   *     When this tab is active, should the current path be tracked
+   *     and persisted to session storage, then used as the tabs href attribute when the user navigates
+   *     away from the tab?
+   *
+   *   activeIndicatorColor {string}
+   *     css color string that will be used to style the active
+   *     indicator applied to tabs which are currently active.
+   */
+
+  /**
+   * @param {TabSpec[]} tabSpecs
+   * @return {chrome}
+   */
+  chrome.setTabs = function (tabSpecs) {
+    internals.tabs.set(tabSpecs);
+    return chrome;
+  };
+
+  /**
+   * @param {Object} defaults - defaults used for each tab
+   * @return {chrome}
+   */
+  chrome.setTabDefaults = function (defaults) {
+    internals.tabs.setDefaults(defaults);
+    return chrome;
+  };
+
+  /**
+   * @return {Tab[]}
+   */
+  chrome.getTabs = function () {
+    return internals.tabs.get();
+  };
+
+
+  /**
+   * @return {Tab}
+   */
+  chrome.getActiveTab = function () {
+    return internals.tabs.getActive();
+  };
+
+  /**
+   * @param {any} def - the default value if there isn't any active tab
+   * @return {any}
+   */
+  chrome.getActiveTabId = activeGetter('id');
+
+  /**
+   * @param {any} def - the default value if there isn't any active tab
+   * @return {any}
+   */
+  chrome.getActiveTabTitle = activeGetter('title');
+
+  // create a getter for properties of the active tab
+  function activeGetter(prop) {
+    return function (def) {
+      var active = chrome.getActiveTab();
+      return !active ? def : active[prop];
+    };
+  }
+
+};
diff --git a/src/ui/public/chrome/api/template.js b/src/ui/public/chrome/api/template.js
new file mode 100644
index 0000000000000..8d91e96abe1a6
--- /dev/null
+++ b/src/ui/public/chrome/api/template.js
@@ -0,0 +1,60 @@
+var _ = require('lodash');
+
+module.exports = function (chrome, internals) {
+
+  /**
+   * ui/chrome Template API
+   *
+   *   Root Template
+   *     The root template is rendered within the primary chrome ui and should
+   *     be used when building an app that is more of a page, or to override the
+   *     placement of ng-view. When including a root template, the mark-up will
+   *     look something like this:
+   *
+   *     body
+   *       notifs
+   *       div.content
+   *         nav
+   *         config
+   *         div.application
+   *           <-- your template here -->
+   *
+   *   Root Controller
+   *     To attach a controller to the root of ui/chrome's content area, outside of
+   *     where it attaches the ng-view directive (assuming no rootTemplate is used)
+   *     which will allow cause the controller to persist across views or make for
+   *     a simple place to define some quick global functionality for a very simple
+   *     app (like the status page).
+   */
+
+  /**
+   * @param {string} template
+   * @return {chrome}
+   */
+  chrome.setRootTemplate = function (template) {
+    internals.rootTemplate = template;
+    return chrome;
+  };
+
+  /**
+   * @param {string} as - the name that the controller should bind to
+   * @param {Function} controller - the controller initializer function
+   * @return {chrome}
+   */
+  chrome.setRootController = function (as, controllerName) {
+    if (controllerName === undefined) {
+      controllerName = as;
+      as = null;
+    }
+
+    if (typeof controllerName === 'function') {
+      chrome.$$rootControllerConstruct = controllerName;
+      controllerName = 'chrome.$$rootControllerConstruct';
+    }
+
+    internals.rootController = controllerName + ( as ? ' as ' + as : '' );
+    return chrome;
+  };
+
+
+};
diff --git a/src/ui/public/chrome/api/theme.js b/src/ui/public/chrome/api/theme.js
new file mode 100644
index 0000000000000..c69ce132efa60
--- /dev/null
+++ b/src/ui/public/chrome/api/theme.js
@@ -0,0 +1,70 @@
+var _ = require('lodash');
+
+module.exports = function (chrome, internals) {
+
+  /**
+   * ui/chrome Theme API
+   *
+   *   Nav Background
+   *     applies to the entire nav bar and is specified as a css string.
+   *     eg. 'red' or 'url(..) no-repeat left center'
+   *
+   *   Logo
+   *     Set the background for the logo and small logo in the navbar.
+   *     When the app is in the "small" category, a modified version of the
+   *     logo is displayed that is 45px wide.
+   *     eg. 'url(/plugins/app/logo.png) center no-repeat'
+   *
+   *   Brand
+   *     Similar to a logo, but is just text with styles to make it stick out.
+   */
+
+  /**
+   * @param {string} background - css background definition
+   * @return {chrome}
+   */
+  chrome.setNavBackground = function (cssBackground) {
+    internals.navBackground = cssBackground;
+    return chrome;
+  };
+
+  /**
+   * @return {string} - css background
+   */
+  chrome.getNavBackground = function () {
+    return internals.navBackground;
+  };
+
+  /**
+   * @param {string} logo - css background value
+   * @param {string|bool} [smallLogo] - css background value, true to reuse the regular logo
+   * @return {chrome}
+   */
+  chrome.setLogo = function (logo, smallLogo) {
+    if (smallLogo === true) {
+      smallLogo = logo;
+    }
+
+    chrome.logo = logo;
+    chrome.smallLogo = smallLogo;
+
+    return chrome;
+  };
+
+  /**
+   * @param {string} val - the text to display
+   * @return {chrome}
+   */
+  chrome.setBrand = function (val) {
+    internals.brand = val;
+    return chrome;
+  };
+
+  /**
+   * @return {string} - the brand text
+   */
+  chrome.getBrand = function () {
+    return internals.brand;
+  };
+
+};
diff --git a/src/ui/public/chrome/chrome.html b/src/ui/public/chrome/chrome.html
new file mode 100644
index 0000000000000..00bd815befaff
--- /dev/null
+++ b/src/ui/public/chrome/chrome.html
@@ -0,0 +1,106 @@
+<kbn-notifications list="notifList"></kbn-notifications>
+<div class="content" style="display: none;" chrome-context >
+  <nav
+    ng-style="{ background: chrome.navBackground }"
+    ng-class="{ show: !chrome.embedded }"
+    bindonce
+    class="hide navbar navbar-inverse navbar-static-top">
+
+    <!-- Mobile navbar -->
+    <div class="navbar-header">
+      <button ng-click="showCollapsed = !showCollapsed" type="button" class="navbar-toggle">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <span class="visible-xs">
+        <span ng-if="chrome.getBrand()" class="navbar-brand">{{ chrome.getBrand() }}</span>
+        <span ng-if="chrome.getActiveTabTitle()" class="navbar-brand">{{ chrome.getActiveTabTitle() }}</span>
+        <span ng-show="chrome.httpActive.length" class="spinner"></span>
+      </span>
+    </div>
+    <!-- /Mobile navbar -->
+
+    <!-- Full navbar -->
+    <div collapse="!showCollapsed" class="navbar-collapse">
+      <ul class="nav navbar-nav" role="navigation">
+        <li
+          ng-if="chrome.logo"
+          ng-style="{ 'background': chrome.logo }"
+          aria-label="{{ chrome.getAppTitle() }} Logo"
+          class="logo hidden-sm"
+          ></li>
+
+        <li
+          ng-if="chrome.smallLogo"
+          ng-style="{ 'background': chrome.smallLogo }"
+          aria-label="{{ chrome.getAppTitle() }} Logo"
+          class="logo-small visible-sm hidden-xs"
+          ></li>
+
+        <li ng-if="chrome.getBrand()" class="navbar-brand">{{ chrome.getBrand() }}</li>
+
+        <li ng-if="chrome.getShowAppsLink()">
+          <a href="/apps"><i class="fa fa-th" alt="Go to app switcher"></i></a>
+        </li>
+
+        <li ng-repeat="tab in chrome.getTabs()" ng-class="{ active: tab.active }">
+          <a ng-href="{{ tab.href() }}" ng-style="{ 'border-bottom-color': tab.activeIndicatorColor }">
+            {{ tab.title }}
+          </a>
+        </li>
+      </ul>
+
+      <ul ng-show="timefilter.enabled" class="nav navbar-nav navbar-right navbar-timepicker">
+        <li>
+          <a
+            ng-click="toggleRefresh()"
+            ng-show="timefilter.refreshInterval.value > 0">
+
+            <i class="fa" ng-class="timefilter.refreshInterval.pause ? 'fa-play' : 'fa-pause'"></i>
+          </a>
+        </li>
+
+        <li
+          ng-class="{active: pickerTemplate.is('interval') }"
+          ng-show="timefilter.refreshInterval.value > 0 || !!pickerTemplate.current"
+          class="to-body">
+
+          <a ng-click="pickerTemplate.toggle('interval')" class="navbar-timepicker-auto-refresh-desc">
+            <span ng-show="timefilter.refreshInterval.value === 0"><i class="fa fa-repeat"></i> Auto-refresh</span>
+            <span ng-show="timefilter.refreshInterval.value > 0">{{timefilter.refreshInterval.display}}</span>
+          </a>
+
+        </li>
+
+        <li class="to-body" ng-class="{active: pickerTemplate.is('filter')}">
+          <a
+            ng-click="pickerTemplate.toggle('filter')"
+            aria-haspopup="true"
+            aria-expanded="false"
+            class="navbar-timepicker-time-desc">
+            <i aria-hidden="true" class="fa fa-clock-o"></i>
+            <pretty-duration from="timefilter.time.from" to="timefilter.time.to"></pretty-duration>
+          </a>
+        </li>
+      </ul>
+
+      <ul class="nav navbar-nav navbar-right navbar-timepicker" >
+        <li ng-show="httpActive.length" class="navbar-text hidden-xs">
+          <div class="spinner"></div>
+        </li>
+      </ul>
+    </div>
+    <!-- /Full navbar -->
+  </nav>
+
+  <config
+    ng-show="timefilter.enabled"
+    config-template="pickerTemplate"
+    config-object="timefilter"
+    config-close="pickerTemplate.close">
+  </config>
+
+  <div class="application" ng-class="'tab-' + chrome.getActiveTabId('-none-')" ng-view></div>
+</div>
diff --git a/src/ui/public/chrome/chrome.js b/src/ui/public/chrome/chrome.js
new file mode 100644
index 0000000000000..2d007ddc6783e
--- /dev/null
+++ b/src/ui/public/chrome/chrome.js
@@ -0,0 +1,45 @@
+var _ = require('lodash');
+var $ = require('jquery');
+var angular = require('angular');
+
+require('ui/timefilter');
+require('ui/private');
+require('ui/promises');
+
+var TabCollection = require('ui/chrome/TabCollection');
+
+var chrome = {
+  navBackground: '#222222',
+  logo: null,
+  smallLogo: null
+};
+
+var internals = _.assign(
+  _.cloneDeep(window.__KBN__ || {}),
+  {
+    tabs: new TabCollection(),
+    rootController: null,
+    rootTemplate: null,
+    showAppsLink: null,
+    brand: null
+  }
+);
+
+$('<link>').attr({
+  href: require('ui/images/elk.ico'),
+  rel: 'shortcut icon'
+}).appendTo('head');
+
+require('./api/apps')(chrome, internals);
+require('./api/angular')(chrome, internals);
+require('./api/tabs')(chrome, internals);
+require('./api/template')(chrome, internals);
+require('./api/theme')(chrome, internals);
+
+chrome.bootstrap = function () {
+  chrome.setupAngular();
+  angular.bootstrap(document, ['kibana']);
+  $(document.body).children(':not(style-compile)').show();
+};
+
+module.exports = chrome;
diff --git a/src/ui/public/chrome/config/filter.html b/src/ui/public/chrome/config/filter.html
new file mode 100644
index 0000000000000..71a3dd32645ef
--- /dev/null
+++ b/src/ui/public/chrome/config/filter.html
@@ -0,0 +1,7 @@
+<kbn-timepicker
+  from="timefilter.time.from"
+  to="timefilter.time.to"
+  mode="timefilter.time.mode"
+  active-tab="'filter'"
+  interval="timefilter.refreshInterval">
+</kbn-timepicker>
diff --git a/src/ui/public/chrome/config/interval.html b/src/ui/public/chrome/config/interval.html
new file mode 100644
index 0000000000000..d41a601709709
--- /dev/null
+++ b/src/ui/public/chrome/config/interval.html
@@ -0,0 +1,7 @@
+<kbn-timepicker
+  from="timefilter.time.from"
+  to="timefilter.time.to"
+  mode="timefilter.time.mode"
+  active-tab="'interval'"
+  interval="timefilter.refreshInterval">
+</kbn-timepicker>
diff --git a/src/ui/public/chrome/context.js b/src/ui/public/chrome/context.js
new file mode 100644
index 0000000000000..5dd82caa70bde
--- /dev/null
+++ b/src/ui/public/chrome/context.js
@@ -0,0 +1,35 @@
+define(function (require) {
+  var _ = require('lodash');
+  var ConfigTemplate = require('ui/ConfigTemplate');
+
+  require('ui/modules')
+  .get('kibana')
+  .directive('chromeContext', function (timefilter, globalState) {
+
+    var listenForUpdates = _.once(function ($scope) {
+      $scope.$listen(timefilter, 'update', function (newVal, oldVal) {
+        globalState.time = _.clone(timefilter.time);
+        globalState.refreshInterval = _.clone(timefilter.refreshInterval);
+        globalState.save();
+      });
+    });
+
+    return {
+      link: function ($scope) {
+        listenForUpdates($scope);
+
+        // chrome is responsible for timepicker ui and state transfer...
+        $scope.timefilter = timefilter;
+        $scope.pickerTemplate = new ConfigTemplate({
+          filter: require('ui/chrome/config/filter.html'),
+          interval: require('ui/chrome/config/interval.html')
+        });
+
+        $scope.toggleRefresh = function () {
+          timefilter.refreshInterval.pause = !timefilter.refreshInterval.pause;
+        };
+      }
+    };
+  });
+
+});
diff --git a/src/ui/public/clipboard/__tests__/clipboard.js b/src/ui/public/clipboard/__tests__/clipboard.js
new file mode 100644
index 0000000000000..36a1d23f8cfe4
--- /dev/null
+++ b/src/ui/public/clipboard/__tests__/clipboard.js
@@ -0,0 +1,102 @@
+
+var angular = require('angular');
+var _ = require('lodash');
+var sinon = require('auto-release-sinon');
+var expect = require('expect.js');
+var $ = require('jquery');
+var ngMock = require('ngMock');
+
+require('ui/clipboard');
+
+describe('Clipboard directive', function () {
+  var $scope;
+  var $rootScope;
+  var $compile;
+  var $interpolate;
+  var el;
+  var tips;
+
+  function init() {
+    // load the application
+    ngMock.module('kibana');
+
+    ngMock.inject(function (_$rootScope_, _$compile_, _$interpolate_) {
+      $rootScope = _$rootScope_;
+      $compile = _$compile_;
+      $interpolate = _$interpolate_;
+      $rootScope.text = 'foo';
+
+      el = $compile('<kbn-clipboard copy="text"></kbn-clipboard>')($rootScope);
+
+      $scope = el.scope();
+      $scope.$digest();
+    });
+  }
+
+  describe.skip('With flash disabled', function () {
+    beforeEach(function () {
+      this.timeout(5000);
+      sinon.stub(window.ZeroClipboard, 'isFlashUnusable', _.constant(true));
+      init();
+    });
+
+    it('should be an empty element', function () {
+      expect(el.children()).to.have.length(0);
+    });
+
+    it('should not show the tooltip', function () {
+      var clip = el.find('[tooltip]');
+      expect(clip).to.have.length(0);
+    });
+
+    it('should not show the clipboard button', function () {
+      var clip = el.find('[clip-copy]');
+      expect(clip).to.have.length(0);
+    });
+  });
+
+  describe.skip('With flash enabled', function () {
+    beforeEach(function () {
+      this.timeout(5000);
+      sinon.stub(window.ZeroClipboard, 'isFlashUnusable', _.constant(false));
+      init();
+    });
+
+    it('should contain an element with clip-copy', function () {
+      var clip = el.find('[clip-copy]');
+      expect(clip).to.have.length(1);
+    });
+
+    it('should have a tooltip', function () {
+      var clip = el.find('[tooltip]');
+      expect(clip).to.have.length(1);
+
+      var clipText = $interpolate($(clip).attr('tooltip'))();
+      expect(clipText).to.be('Copy to clipboard');
+
+    });
+
+    it('should change the tooltip text when clicked, back when mouse leaves', function () {
+      el.mouseenter();
+      el.click();
+      $scope.$digest();
+
+      var clipText = $interpolate($('[tooltip]', el).attr('tooltip'))();
+      expect(clipText).to.be('Copied!');
+
+      el.mouseleave();
+      $scope.$digest();
+
+      clipText = $interpolate($('[tooltip]', el).attr('tooltip'))();
+      expect(clipText).to.be('Copy to clipboard');
+    });
+
+    it('should unbind all handlers on destroy', function () {
+      var handlers = $._data(el.get(0), 'events');
+      expect(Object.keys(handlers)).to.have.length(2);
+
+      $scope.$destroy();
+      expect(Object.keys(handlers)).to.have.length(0);
+    });
+  });
+});
diff --git a/src/kibana/components/clipboard/clipboard.html b/src/ui/public/clipboard/clipboard.html
similarity index 100%
rename from src/kibana/components/clipboard/clipboard.html
rename to src/ui/public/clipboard/clipboard.html
diff --git a/src/ui/public/clipboard/clipboard.js b/src/ui/public/clipboard/clipboard.js
new file mode 100644
index 0000000000000..da21491eb395f
--- /dev/null
+++ b/src/ui/public/clipboard/clipboard.js
@@ -0,0 +1,47 @@
+define(function (require) {
+  var ZeroClipboard = require('ng-clip');
+  var $ = require('jquery');
+  var html = require('ui/clipboard/clipboard.html');
+
+  require('ui/modules')
+  .get('kibana')
+  .directive('kbnClipboard', function ($compile, $timeout) {
+    return {
+      restrict: 'E',
+      template: html,
+      replace: true,
+      scope: {
+        copyText: '=copy'
+      },
+      transclude: true,
+      link: function ($scope, $el, attr) {
+        if (ZeroClipboard.isFlashUnusable()) {
+          $scope.disabled = true;
+          return;
+        }
+
+        $scope.tipPlacement = attr.tipPlacement || 'top';
+        $scope.tipText = attr.tipText || 'Copy to clipboard';
+        $scope.tipConfirm = attr.tipConfirm = 'Copied!';
+        $scope.icon = attr.icon || 'fa-clipboard';
+
+        $scope.shownText = $scope.tipText;
+
+        $el.on('click', function () {
+          $scope.shownText = $scope.tipConfirm;
+          // Reposition tooltip to account for text length change
+          $('a', $el).mouseenter();
+        });
+
+        $el.on('mouseleave', function () {
+          $scope.shownText = $scope.tipText;
+        });
+
+        $scope.$on('$destroy', function () {
+          $el.off('click');
+          $el.off('mouseleave');
+        });
+      }
+    };
+  });
+});
diff --git a/src/kibana/components/collapsible_sidebar/collapsible_sidebar.js b/src/ui/public/collapsible_sidebar/collapsible_sidebar.js
similarity index 92%
rename from src/kibana/components/collapsible_sidebar/collapsible_sidebar.js
rename to src/ui/public/collapsible_sidebar/collapsible_sidebar.js
index 48b9a830e979a..b880ebfbf37c6 100644
--- a/src/kibana/components/collapsible_sidebar/collapsible_sidebar.js
+++ b/src/ui/public/collapsible_sidebar/collapsible_sidebar.js
@@ -1,10 +1,10 @@
 define(function (require) {
-  require('css!components/collapsible_sidebar/collapsible_sidebar.css');
+  require('ui/collapsible_sidebar/collapsible_sidebar.less');
 
   var _ = require('lodash');
   var $ = require('jquery');
 
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .directive('collapsibleSidebar', function () {
     // simply a list of all of all of angulars .col-md-* classes except 12
diff --git a/src/kibana/components/collapsible_sidebar/collapsible_sidebar.less b/src/ui/public/collapsible_sidebar/collapsible_sidebar.less
similarity index 100%
rename from src/kibana/components/collapsible_sidebar/collapsible_sidebar.less
rename to src/ui/public/collapsible_sidebar/collapsible_sidebar.less
diff --git a/src/kibana/services/compile_recursive_directive.js b/src/ui/public/compile_recursive_directive.js
similarity index 98%
rename from src/kibana/services/compile_recursive_directive.js
rename to src/ui/public/compile_recursive_directive.js
index 07fa56141684d..87220985823e7 100644
--- a/src/kibana/services/compile_recursive_directive.js
+++ b/src/ui/public/compile_recursive_directive.js
@@ -6,7 +6,7 @@ define(function (require) {
    * http://stackoverflow.com/a/18609594/296172
    */
 
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .service('compileRecursiveDirective', function ($compile) {
     return {
diff --git a/src/ui/public/config/__tests__/config.js b/src/ui/public/config/__tests__/config.js
new file mode 100644
index 0000000000000..430ef26e1e304
--- /dev/null
+++ b/src/ui/public/config/__tests__/config.js
@@ -0,0 +1,69 @@
+
+describe('config component', function () {
+  var $scope;
+  var config;
+  var defaults;
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function ($injector, Private) {
+    config = $injector.get('config');
+    $scope = $injector.get('$rootScope');
+    defaults = Private(require('ui/config/defaults'));
+  }));
+
+  describe('#get', function () {
+
+    it('gives access to config values', function () {
+      expect(config.get('dateFormat')).to.be.a('string');
+    });
+
+    it('reads from the defaults', function () {
+      var initial = config.get('dateFormat');
+      var newDefault = initial + '- new';
+      defaults.dateFormat.value = newDefault;
+      expect(config.get('dateFormat')).to.be(newDefault);
+    });
+
+  });
+
+  describe('#set', function () {
+
+    it('stores a value in the config val set', function () {
+      var initial = config.get('dateFormat');
+      config.set('dateFormat', 'notaformat');
+      expect(config.get('dateFormat')).to.be('notaformat');
+    });
+
+  });
+
+  describe('#$bind', function () {
+
+    it('binds a config key to a $scope property', function () {
+      var dateFormat = config.get('dateFormat');
+      config.$bind($scope, 'dateFormat');
+      expect($scope).to.have.property('dateFormat', dateFormat);
+    });
+
+    it('alows overriding the property name', function () {
+      var dateFormat = config.get('dateFormat');
+      config.$bind($scope, 'dateFormat', 'defaultDateFormat');
+      expect($scope).to.not.have.property('dateFormat');
+      expect($scope).to.have.property('defaultDateFormat', dateFormat);
+    });
+
+    it('keeps the property up to date', function () {
+      var dateFormat = config.get('dateFormat');
+      var newDateFormat = dateFormat + ' NEW NEW NEW!';
+      config.$bind($scope, 'dateFormat');
+
+      expect($scope).to.have.property('dateFormat', dateFormat);
+      config.set('dateFormat', newDateFormat);
+      expect($scope).to.have.property('dateFormat', newDateFormat);
+
+    });
+
+  });
+
+});
\ No newline at end of file
diff --git a/src/kibana/components/config/_delayed_updater.js b/src/ui/public/config/_delayed_updater.js
similarity index 97%
rename from src/kibana/components/config/_delayed_updater.js
rename to src/ui/public/config/_delayed_updater.js
index 764f52f61ee54..56cc1c19b9623 100644
--- a/src/kibana/components/config/_delayed_updater.js
+++ b/src/ui/public/config/_delayed_updater.js
@@ -4,7 +4,7 @@ define(function (require) {
     var _ = require('lodash');
     var angular = require('angular');
 
-    var vals = Private(require('components/config/_vals'));
+    var vals = Private(require('ui/config/_vals'));
 
     return function DelayedUpdater(doc) {
       var updater = this;
diff --git a/src/kibana/components/config/_vals.js b/src/ui/public/config/_vals.js
similarity index 100%
rename from src/kibana/components/config/_vals.js
rename to src/ui/public/config/_vals.js
diff --git a/src/ui/public/config/config.js b/src/ui/public/config/config.js
new file mode 100644
index 0000000000000..e5b370bc712ce
--- /dev/null
+++ b/src/ui/public/config/config.js
@@ -0,0 +1,154 @@
+define(function (require) {
+  var module = require('ui/modules').get('kibana/config', [
+    'kibana/notify'
+  ]);
+
+  // service for delivering config variables to everywhere else
+  module.service('config', function (Private, Notifier, kbnVersion, kbnIndex, $rootScope, buildNum) {
+    var config = this;
+
+    var angular = require('angular');
+    var _ = require('lodash');
+    var defaults = Private(require('ui/config/defaults'));
+    var DelayedUpdater = Private(require('ui/config/_delayed_updater'));
+    var vals = Private(require('ui/config/_vals'));
+
+    var notify = new Notifier({
+      location: 'Config'
+    });
+
+    // active or previous instance of DelayedUpdater. This will log and then process an
+    // update once it is requested by calling #set() or #clear().
+    var updater;
+
+    var DocSource = Private(require('ui/courier/data_source/doc_source'));
+    var doc = (new DocSource())
+      .index(kbnIndex)
+      .type('config')
+      .id(kbnVersion);
+
+    /******
+     * PUBLIC API
+     ******/
+
+    /**
+     * Executes once and returns a promise that is resolved once the
+     * config has loaded for the first time.
+     *
+     * @return {Promise} - Resolved when the config loads initially
+     */
+    config.init = _.once(function () {
+      var complete = notify.lifecycle('config init');
+
+      return (function getDoc() {
+
+        // used to apply an entire es response to the vals, silentAndLocal will prevent
+        // event/notifications/writes from occuring.
+        var applyMassUpdate = function (resp, silentAndLocal) {
+          _.union(_.keys(resp._source), _.keys(vals)).forEach(function (key) {
+            change(key, resp._source[key], silentAndLocal);
+          });
+        };
+
+        return doc.fetch().then(function initDoc(resp) {
+          if (!resp.found) {
+            return doc.doIndex({
+              buildNum: buildNum
+            }).then(getDoc);
+          } else {
+            // apply update, and keep it quiet the first time
+            applyMassUpdate(resp, true);
+
+            // don't keep it quiet other times
+            doc.onUpdate(function (resp) {
+              applyMassUpdate(resp, false);
+            });
+          }
+        });
+      }())
+      .then(function () {
+        $rootScope.$broadcast('init:config');
+      })
+      .then(complete, complete.failure);
+    });
+
+    config.get = function (key, defaultVal) {
+      var keyVal;
+
+      if (vals[key] == null) {
+        if (defaultVal == null) {
+          keyVal = defaults[key].value;
+        } else {
+          keyVal = _.cloneDeep(defaultVal);
+        }
+      } else {
+        keyVal = vals[key];
+      }
+
+      if (defaults[key] && defaults[key].type === 'json') {
+        return JSON.parse(keyVal);
+      }
+      return keyVal;
+    };
+
+    // sets a value in the config
+    config.set = function (key, val) {
+      if (_.isPlainObject(val)) {
+        return change(key, angular.toJson(val));
+      } else {
+        return change(key, val);
+      }
+    };
+
+    // clears a value from the config
+    config.clear = function (key) {
+      return change(key);
+    };
+    // alias for clear
+    config.delete = config.clear;
+
+    config.close = function () {
+      if (updater) updater.fire();
+    };
+
+    /**
+     * A little helper for binding config variables to $scopes
+     *
+     * @param  {Scope} $scope - an angular $scope object
+     * @param  {string} key - the config key to bind to
+     * @param  {string} [property] - optional property name where the value should
+     *                             be stored. Defaults to the config key
+     * @return {function} - an unbind function
+     */
+    config.$bind = function ($scope, key, property) {
+      if (!property) property = key;
+
+      var update = function () {
+        $scope[property] = config.get(key);
+      };
+
+      update();
+      return _.partial(_.invoke, [
+        $scope.$on('change:config.' + key, update),
+        $scope.$on('init:config', update)
+      ], 'call');
+    };
+
+    /*****
+     * PRIVATE API
+     *****/
+    var change = function (key, val, silentAndLocal) {
+      // if the previous updater has already fired, then start over with null
+      if (updater && updater.fired) updater = null;
+      // create a new updater
+      if (!updater) updater = new DelayedUpdater(doc);
+      // return a promise that will be resolved once the action is eventually done
+      return updater.update(key, val, silentAndLocal);
+    };
+
+    config._vals = function () {
+      return _.cloneDeep(vals);
+    };
+
+  });
+});
diff --git a/src/kibana/components/config/defaults.js b/src/ui/public/config/defaults.js
similarity index 100%
rename from src/kibana/components/config/defaults.js
rename to src/ui/public/config/defaults.js
diff --git a/src/kibana/components/config/migrations/_empty_ b/src/ui/public/config/migrations/_empty_
similarity index 100%
rename from src/kibana/components/config/migrations/_empty_
rename to src/ui/public/config/migrations/_empty_
diff --git a/src/kibana/components/courier/_error_handlers.js b/src/ui/public/courier/_error_handlers.js
similarity index 100%
rename from src/kibana/components/courier/_error_handlers.js
rename to src/ui/public/courier/_error_handlers.js
diff --git a/src/kibana/components/courier/_redirect_when_missing.js b/src/ui/public/courier/_redirect_when_missing.js
similarity index 93%
rename from src/kibana/components/courier/_redirect_when_missing.js
rename to src/ui/public/courier/_redirect_when_missing.js
index 1e35220c1a004..70809a5eabec4 100644
--- a/src/kibana/components/courier/_redirect_when_missing.js
+++ b/src/ui/public/courier/_redirect_when_missing.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var errors = require('errors');
-  var qs = require('utils/query_string');
+  var errors = require('ui/errors');
+  var qs = require('ui/utils/query_string');
 
   return function RedirectWhenMissingFn($location, kbnUrl, Notifier, Promise) {
     var SavedObjectNotFound = errors.SavedObjectNotFound;
diff --git a/src/kibana/components/courier/_request_queue.js b/src/ui/public/courier/_request_queue.js
similarity index 100%
rename from src/kibana/components/courier/_request_queue.js
rename to src/ui/public/courier/_request_queue.js
diff --git a/src/ui/public/courier/courier.js b/src/ui/public/courier/courier.js
new file mode 100644
index 0000000000000..c01c3814ecb43
--- /dev/null
+++ b/src/ui/public/courier/courier.js
@@ -0,0 +1,139 @@
+define(function (require) {
+  var errors = require('ui/errors');
+  var _ = require('lodash');
+
+  require('ui/es');
+  require('ui/promises');
+  require('ui/index_patterns');
+
+  require('ui/modules').get('kibana/courier')
+  .service('courier', function ($rootScope, Private, Promise, indexPatterns, Notifier) {
+    function Courier() {
+      var self = this;
+
+      var DocSource = Private(require('ui/courier/data_source/doc_source'));
+      var SearchSource = Private(require('ui/courier/data_source/search_source'));
+      var searchStrategy = Private(require('ui/courier/fetch/strategy/search'));
+
+      var requestQueue = Private(require('ui/courier/_request_queue'));
+      var errorHandlers = Private(require('ui/courier/_error_handlers'));
+
+      var fetch = Private(require('ui/courier/fetch/fetch'));
+      var docLooper = self.docLooper = Private(require('ui/courier/looper/doc'));
+      var searchLooper = self.searchLooper = Private(require('ui/courier/looper/search'));
+
+      // expose some internal modules
+      self.setRootSearchSource = Private(require('ui/courier/data_source/_root_search_source')).set;
+
+      self.SavedObject = Private(require('ui/courier/saved_object/saved_object'));
+      self.indexPatterns = indexPatterns;
+      self.redirectWhenMissing = Private(require('ui/courier/_redirect_when_missing'));
+
+      self.DocSource = DocSource;
+      self.SearchSource = SearchSource;
+
+      var HastyRefresh = errors.HastyRefresh;
+
+      /**
+       * update the time between automatic search requests
+       *
+       * @chainable
+       */
+      self.fetchInterval = function (ms) {
+        searchLooper.ms(ms);
+        return this;
+      };
+
+      /**
+       * Start fetching search requests on an interval
+       * @chainable
+       */
+      self.start = function () {
+        searchLooper.start();
+        docLooper.start();
+        return this;
+      };
+
+      /**
+       * Process the pending request queue right now, returns
+       * a promise that resembles the success of the fetch completing,
+       * individual errors are routed to their respective requests.
+       */
+      self.fetch = function () {
+        fetch.fetchQueued(searchStrategy).then(function () {
+          searchLooper.restart();
+        });
+      };
+
+
+      /**
+       * is the currior currently fetching search
+       * results automatically?
+       *
+       * @return {boolean}
+       */
+      self.started = function () {
+        return searchLooper.started();
+      };
+
+
+      /**
+       * stop the courier from fetching more search
+       * results, does not stop vaidating docs.
+       *
+       * @chainable
+       */
+      self.stop = function () {
+        searchLooper.stop();
+        return this;
+      };
+
+
+      /**
+       * create a source object that is a child of this courier
+       *
+       * @param {string} type - the type of Source to create
+       */
+      self.createSource = function (type) {
+        switch (type) {
+        case 'doc':
+          return new DocSource();
+        case 'search':
+          return new SearchSource();
+        }
+      };
+
+      /**
+       * Abort all pending requests
+       * @return {[type]} [description]
+       */
+      self.close = function () {
+        searchLooper.stop();
+        docLooper.stop();
+
+        _.invoke(requestQueue, 'abort');
+
+        if (requestQueue.length) {
+          throw new Error('Aborting all pending requests failed.');
+        }
+      };
+
+      // Listen for refreshInterval changes
+      $rootScope.$watchCollection('timefilter.refreshInterval', function () {
+        var refreshValue = _.get($rootScope, 'timefilter.refreshInterval.value');
+        var refreshPause = _.get($rootScope, 'timefilter.refreshInterval.pause');
+        if (_.isNumber(refreshValue) && !refreshPause) {
+          self.fetchInterval(refreshValue);
+        } else {
+          self.fetchInterval(0);
+        }
+      });
+
+      var onFatalDefer = Promise.defer();
+      onFatalDefer.promise.then(self.close);
+      Notifier.fatalCallbacks.push(onFatalDefer.resolve);
+    }
+
+    return new Courier();
+  });
+});
diff --git a/src/ui/public/courier/data_source/__tests__/decorate_query.js b/src/ui/public/courier/data_source/__tests__/decorate_query.js
new file mode 100644
index 0000000000000..59dcc6434c80b
--- /dev/null
+++ b/src/ui/public/courier/data_source/__tests__/decorate_query.js
@@ -0,0 +1,39 @@
+var moment = require('moment');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+describe('Query decorator', function () {
+
+  var _ = require('lodash');
+  var config;
+
+  var indexPattern, getComputedFields, fn;
+  beforeEach(ngMock.module(
+    'kibana',
+    function ($provide) {
+      // Super simple config stub
+      $provide.service('config', function () {
+        var keys = {};
+        return {
+          get: function (key) { return keys[key]; },
+          set: function (key, value) { keys[key] = value; }
+        };
+      });
+    }
+  ));
+
+  beforeEach(ngMock.inject(function (Private, $injector, _config_) {
+    config = _config_;
+    fn = Private(require('ui/courier/data_source/_decorate_query'));
+  }));
+
+  it('should be a function', function () {
+    expect(fn).to.be.a(Function);
+  });
+
+  it('should merge in the query string options', function () {
+    config.set('query:queryString:options', {analyze_wildcard: true});
+    expect(fn({query_string: {query: '*'}})).to.eql({query_string: {query: '*', analyze_wildcard: true}});
+  });
+
+});
diff --git a/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js b/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js
new file mode 100644
index 0000000000000..a3560f3f91fa9
--- /dev/null
+++ b/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js
@@ -0,0 +1,90 @@
+
+describe('SearchSource#normalizeSortRequest', function () {
+  require('ui/private');
+
+  var ngMock = require('ngMock');
+  var expect = require('expect.js');
+
+  var normalizeSortRequest;
+  var indexPattern;
+  var normalizedSort;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    normalizeSortRequest = Private(require('ui/courier/data_source/_normalize_sort_request'));
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+
+    normalizedSort = [{
+      someField: {
+        order: 'desc',
+        unmapped_type: 'boolean'
+      }
+    }];
+  }));
+
+  it('should return an array', function () {
+    var sortable = { someField: 'desc'};
+    var result = normalizeSortRequest(sortable, indexPattern);
+    expect(result).to.be.an(Array);
+    expect(result).to.eql(normalizedSort);
+    // ensure object passed in is not mutated
+    expect(result[0]).to.not.be.equal(sortable);
+    expect(sortable).to.eql({ someField: 'desc'});
+  });
+
+  it('should make plain string sort into the more verbose format', function () {
+    var result = normalizeSortRequest([{ someField: 'desc'}], indexPattern);
+    expect(result).to.eql(normalizedSort);
+  });
+
+  it('should append default sort options', function () {
+    var sortState = [{
+      someField: {
+        order: 'desc',
+        unmapped_type: 'boolean'
+      }
+    }];
+    var result = normalizeSortRequest(sortState, indexPattern);
+    expect(result).to.eql(normalizedSort);
+  });
+
+  it('should enable script based sorting', function () {
+    var fieldName = 'script string';
+    var direction = 'desc';
+    var indexField = indexPattern.fields.byName[fieldName];
+
+    var sortState = {};
+    sortState[fieldName] = direction;
+    normalizedSort = {
+      _script: {
+        script: indexField.script,
+        type: indexField.type,
+        order: direction
+      }
+    };
+
+    var result = normalizeSortRequest(sortState, indexPattern);
+    expect(result).to.eql([normalizedSort]);
+
+    sortState[fieldName] = { order: direction };
+    result = normalizeSortRequest([sortState], indexPattern);
+    expect(result).to.eql([normalizedSort]);
+  });
+
+  it('should use script based sorting only on sortable types', function () {
+    var fieldName = 'script murmur3';
+    var direction = 'asc';
+    var indexField = indexPattern.fields.byName[fieldName];
+
+    var sortState = {};
+    sortState[fieldName] = direction;
+    normalizedSort = {};
+    normalizedSort[fieldName] = {
+      order: direction,
+      unmapped_type: 'boolean'
+    };
+    var result = normalizeSortRequest([sortState], indexPattern);
+
+    expect(result).to.eql([normalizedSort]);
+  });
+});
diff --git a/src/kibana/components/courier/data_source/_abstract.js b/src/ui/public/courier/data_source/_abstract.js
similarity index 96%
rename from src/kibana/components/courier/data_source/_abstract.js
rename to src/ui/public/courier/data_source/_abstract.js
index b771e3c691bb6..2196ce07f2abb 100644
--- a/src/kibana/components/courier/data_source/_abstract.js
+++ b/src/ui/public/courier/data_source/_abstract.js
@@ -3,9 +3,9 @@ define(function (require) {
   var angular = require('angular');
 
   return function SourceAbstractFactory(Private, Promise, PromiseEmitter) {
-    var requestQueue = Private(require('components/courier/_request_queue'));
-    var errorHandlers = Private(require('components/courier/_error_handlers'));
-    var courierFetch = Private(require('components/courier/fetch/fetch'));
+    var requestQueue = Private(require('ui/courier/_request_queue'));
+    var errorHandlers = Private(require('ui/courier/_error_handlers'));
+    var courierFetch = Private(require('ui/courier/fetch/fetch'));
 
     function SourceAbstract(initialState, strategy) {
       var self = this;
@@ -255,7 +255,7 @@ define(function (require) {
       .then(function () {
         if (type === 'search') {
           // This is down here to prevent the circular dependency
-          var decorateQuery = Private(require('components/courier/data_source/_decorate_query'));
+          var decorateQuery = Private(require('ui/courier/data_source/_decorate_query'));
 
           flatState.body = flatState.body || {};
 
diff --git a/src/kibana/components/courier/data_source/_decorate_query.js b/src/ui/public/courier/data_source/_decorate_query.js
similarity index 100%
rename from src/kibana/components/courier/data_source/_decorate_query.js
rename to src/ui/public/courier/data_source/_decorate_query.js
diff --git a/src/kibana/components/courier/data_source/_doc_send_to_es.js b/src/ui/public/courier/data_source/_doc_send_to_es.js
similarity index 92%
rename from src/kibana/components/courier/data_source/_doc_send_to_es.js
rename to src/ui/public/courier/data_source/_doc_send_to_es.js
index cf5359eb34e62..57b0dca60ea6c 100644
--- a/src/kibana/components/courier/data_source/_doc_send_to_es.js
+++ b/src/ui/public/courier/data_source/_doc_send_to_es.js
@@ -1,10 +1,10 @@
 define(function (require) {
   var _ = require('lodash');
-  var errors = require('errors');
+  var errors = require('ui/errors');
 
   return function (Promise, Private, es) {
-    var requestQueue = Private(require('components/courier/_request_queue'));
-    var courierFetch = Private(require('components/courier/fetch/fetch'));
+    var requestQueue = Private(require('ui/courier/_request_queue'));
+    var courierFetch = Private(require('ui/courier/fetch/fetch'));
 
     /**
      * Backend for doUpdate and doIndex
diff --git a/src/kibana/components/courier/data_source/_normalize_sort_request.js b/src/ui/public/courier/data_source/_normalize_sort_request.js
similarity index 100%
rename from src/kibana/components/courier/data_source/_normalize_sort_request.js
rename to src/ui/public/courier/data_source/_normalize_sort_request.js
diff --git a/src/kibana/components/courier/data_source/_root_search_source.js b/src/ui/public/courier/data_source/_root_search_source.js
similarity index 96%
rename from src/kibana/components/courier/data_source/_root_search_source.js
rename to src/ui/public/courier/data_source/_root_search_source.js
index 553359dd7fa7a..d8d9d3b2da492 100644
--- a/src/kibana/components/courier/data_source/_root_search_source.js
+++ b/src/ui/public/courier/data_source/_root_search_source.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function RootSearchSource(Private, $rootScope, config, Promise, indexPatterns, timefilter, Notifier) {
-    var SearchSource = Private(require('components/courier/data_source/search_source'));
+    var SearchSource = Private(require('ui/courier/data_source/search_source'));
 
     var notify = new Notifier({ location: 'Root Search Source' });
 
diff --git a/src/kibana/components/courier/data_source/doc_source.js b/src/ui/public/courier/data_source/doc_source.js
similarity index 92%
rename from src/kibana/components/courier/data_source/doc_source.js
rename to src/ui/public/courier/data_source/doc_source.js
index bf6a21a47fdd9..925f037f05f3c 100644
--- a/src/kibana/components/courier/data_source/doc_source.js
+++ b/src/ui/public/courier/data_source/doc_source.js
@@ -2,10 +2,10 @@ define(function (require) {
   var _ = require('lodash');
 
   return function DocSourceFactory(Private, Promise, es, sessionStorage) {
-    var sendToEs = Private(require('components/courier/data_source/_doc_send_to_es'));
-    var SourceAbstract = Private(require('components/courier/data_source/_abstract'));
-    var DocRequest = Private(require('components/courier/fetch/request/doc'));
-    var docStrategy = Private(require('components/courier/fetch/strategy/doc'));
+    var sendToEs = Private(require('ui/courier/data_source/_doc_send_to_es'));
+    var SourceAbstract = Private(require('ui/courier/data_source/_abstract'));
+    var DocRequest = Private(require('ui/courier/fetch/request/doc'));
+    var docStrategy = Private(require('ui/courier/fetch/strategy/doc'));
 
     _.class(DocSource).inherits(SourceAbstract);
     function DocSource(initialState) {
diff --git a/src/kibana/components/courier/data_source/search_source.js b/src/ui/public/courier/data_source/search_source.js
similarity index 86%
rename from src/kibana/components/courier/data_source/search_source.js
rename to src/ui/public/courier/data_source/search_source.js
index fcc7e6079ebe1..4855f481a5b24 100644
--- a/src/kibana/components/courier/data_source/search_source.js
+++ b/src/ui/public/courier/data_source/search_source.js
@@ -1,11 +1,12 @@
 define(function (require) {
   return function SearchSourceFactory(Promise, Private) {
     var _ = require('lodash');
-    var SourceAbstract = Private(require('components/courier/data_source/_abstract'));
-    var SearchRequest = Private(require('components/courier/fetch/request/search'));
-    var SegmentedRequest = Private(require('components/courier/fetch/request/segmented'));
-    var searchStrategy = Private(require('components/courier/fetch/strategy/search'));
-    var normalizeSortRequest = Private(require('components/courier/data_source/_normalize_sort_request'));
+    var SourceAbstract = Private(require('ui/courier/data_source/_abstract'));
+    var SearchRequest = Private(require('ui/courier/fetch/request/search'));
+    var SegmentedRequest = Private(require('ui/courier/fetch/request/segmented'));
+    var searchStrategy = Private(require('ui/courier/fetch/strategy/search'));
+    var normalizeSortRequest = Private(require('ui/courier/data_source/_normalize_sort_request'));
+    var rootSearchSource = require('ui/courier/data_source/_root_search_source');
 
     _.class(SearchSource).inherits(SourceAbstract);
     function SearchSource(initialState) {
@@ -13,13 +14,6 @@ define(function (require) {
     }
 
     // expose a ready state for the route setup to read
-    var rootSearchSource;
-    SearchSource.ready = new Promise(function (resolve) {
-      require(['components/courier/data_source/_root_search_source'], function (PromiseModule) {
-        rootSearchSource = Private(PromiseModule);
-        resolve();
-      });
-    });
 
     /*****
      * PUBLIC API
@@ -76,7 +70,7 @@ define(function (require) {
       var self = this;
       if (self._parent === false) return;
       if (self._parent) return self._parent;
-      return onlyHardLinked ? undefined : rootSearchSource.get();
+      return onlyHardLinked ? undefined : Private(rootSearchSource).get();
     };
 
     /**
diff --git a/src/ui/public/courier/fetch/__tests__/doc.js b/src/ui/public/courier/fetch/__tests__/doc.js
new file mode 100644
index 0000000000000..026d69fa1c84f
--- /dev/null
+++ b/src/ui/public/courier/fetch/__tests__/doc.js
@@ -0,0 +1,106 @@
+
+describe('Courier DocFetchRequest class', function () {
+  var sinon = require('auto-release-sinon');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var storage;
+  var source;
+  var defer;
+  var req;
+
+  var setVersion;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private, Promise, $injector) {
+    var DocSource = Private(require('ui/courier/data_source/doc_source'));
+    var DocFetchRequest = Private(require('ui/courier/fetch/request/doc'));
+
+    storage =
+    $injector.get('localStorage').store =
+    $injector.get('sessionStorage').store = {
+      getItem: sinon.stub(),
+      setItem: sinon.stub(),
+      removeItem: sinon.stub(),
+      clear: sinon.stub()
+    };
+
+    source = new DocSource({})
+    .set('index', 'doc-index')
+    .set('type', 'doc-type')
+    .set('id', 'doc-id');
+
+    defer = Promise.defer();
+
+    req = new DocFetchRequest(source, defer);
+
+    /**
+     * Setup the version numbers for tests. There are two versions for the
+     * purposes of these tests.
+     *
+     * @param {number} mine - the version that the DocSource most
+     *                      recently received from elasticsearch.
+     * @param {number} theirs - the version that other DocSources have
+     *                        received from elasticsearfch.
+     */
+    setVersion = function (mine, theirs) {
+      // mine – the version the source think is accurate
+      // theirs - the version other sources think is accurate
+
+      source._version = mine;
+      storage.getItem.withArgs(source._versionKey()).returns(theirs);
+    };
+  }));
+
+  describe('#canStart', function () {
+    it('can if the doc is unknown', function () {
+      setVersion(undefined, undefined);
+
+      expect(req.canStart()).to.be(true);
+    });
+
+    it('cannot if the doc is unknown but the request is already in progress', function () {
+      setVersion(undefined, undefined);
+      req.start();
+
+      expect(req.canStart()).to.be(false);
+    });
+
+    it('can if the doc is out of date', function () {
+      setVersion(1, 2);
+
+      expect(req.canStart()).to.be(true);
+    });
+
+    it('can if the doc is out of date and the request is in progress', function () {
+      setVersion(1, 2);
+      req.start();
+
+      expect(req.canStart()).to.be(true);
+    });
+
+    it('cannot if the doc is up to date', function () {
+      setVersion(2, 2);
+
+      expect(req.canStart()).to.be(false);
+    });
+
+    it('can if the doc is overdated', function () {
+      setVersion(5, 2);
+
+      expect(req.canStart()).to.be(true);
+    });
+
+    it('can if shared version is cleared', function () {
+      setVersion(10, undefined);
+
+      expect(req.canStart()).to.be(true);
+    });
+
+    it('can if everyone else has a doc', function () {
+      setVersion(undefined, 10);
+
+      expect(req.canStart()).to.be(true);
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/_call_client.js b/src/ui/public/courier/fetch/_call_client.js
similarity index 86%
rename from src/kibana/components/courier/fetch/_call_client.js
rename to src/ui/public/courier/fetch/_call_client.js
index 2ac51a3604b7d..4f072df4d2ce6 100644
--- a/src/kibana/components/courier/fetch/_call_client.js
+++ b/src/ui/public/courier/fetch/_call_client.js
@@ -1,12 +1,12 @@
 define(function (require) {
-  return function CourierFetchCallClient(Private, Promise, es, configFile, sessionId) {
+  return function CourierFetchCallClient(Private, Promise, es, esShardTimeout, sessionId) {
     var _ = require('lodash');
 
-    var isRequest = Private(require('components/courier/fetch/_is_request'));
-    var mergeDuplicateRequests = Private(require('components/courier/fetch/_merge_duplicate_requests'));
+    var isRequest = Private(require('ui/courier/fetch/_is_request'));
+    var mergeDuplicateRequests = Private(require('ui/courier/fetch/_merge_duplicate_requests'));
 
-    var ABORTED = Private(require('components/courier/fetch/_req_status')).ABORTED;
-    var DUPLICATE = Private(require('components/courier/fetch/_req_status')).DUPLICATE;
+    var ABORTED = Private(require('ui/courier/fetch/_req_status')).ABORTED;
+    var DUPLICATE = Private(require('ui/courier/fetch/_req_status')).DUPLICATE;
 
     function callClient(strategy, requests) {
       // merging docs can change status to DUPLICATE, capture new statuses
@@ -83,7 +83,7 @@ define(function (require) {
         }
 
         return (esPromise = es[strategy.clientMethod]({
-          timeout: configFile.shard_timeout,
+          timeout: esShardTimeout,
           ignore_unavailable: true,
           preference: sessionId,
           body: body
@@ -112,4 +112,4 @@ define(function (require) {
 
     return callClient;
   };
-});
\ No newline at end of file
+});
diff --git a/src/ui/public/courier/fetch/_call_response_handlers.js b/src/ui/public/courier/fetch/_call_response_handlers.js
new file mode 100644
index 0000000000000..91b05adcf33b0
--- /dev/null
+++ b/src/ui/public/courier/fetch/_call_response_handlers.js
@@ -0,0 +1,57 @@
+define(function (require) {
+  return function CourierFetchCallResponseHandlers(Private, Promise) {
+    var ABORTED = Private(require('ui/courier/fetch/_req_status')).ABORTED;
+    var INCOMPLETE = Private(require('ui/courier/fetch/_req_status')).INCOMPLETE;
+    var notify = Private(require('ui/courier/fetch/_notifier'));
+
+    var SearchTimeout = require('ui/errors').SearchTimeout;
+    var RequestFailure = require('ui/errors').RequestFailure;
+    var ShardFailure = require('ui/errors').ShardFailure;
+
+    function callResponseHandlers(requests, responses) {
+      return Promise.map(requests, function (req, i) {
+        if (req === ABORTED || req.aborted) {
+          return ABORTED;
+        }
+
+        var resp = responses[i];
+
+        if (resp.timed_out) {
+          notify.warning(new SearchTimeout());
+        }
+
+        if (resp._shards && resp._shards.failed) {
+          notify.warning(new ShardFailure(resp));
+        }
+
+        function progress() {
+          if (req.isIncomplete()) {
+            return INCOMPLETE;
+          }
+
+          req.complete();
+          return resp;
+        }
+
+        if (resp.error) {
+          if (req.filterError(resp)) {
+            return progress();
+          } else {
+            return req.handleFailure(new RequestFailure(null, resp));
+          }
+        }
+
+        return Promise.try(function () {
+          return req.transformResponse(resp);
+        })
+        .then(function () {
+          resp = arguments[0];
+          return req.handleResponse(resp);
+        })
+        .then(progress);
+      });
+    }
+
+    return callResponseHandlers;
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/_continue_incomplete.js b/src/ui/public/courier/fetch/_continue_incomplete.js
similarity index 89%
rename from src/kibana/components/courier/fetch/_continue_incomplete.js
rename to src/ui/public/courier/fetch/_continue_incomplete.js
index 49070040d36f3..c6f8dd4446d33 100644
--- a/src/kibana/components/courier/fetch/_continue_incomplete.js
+++ b/src/ui/public/courier/fetch/_continue_incomplete.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function CourierFetchContinueIncompleteRequests(Private) {
-    var INCOMPLETE = Private(require('components/courier/fetch/_req_status')).INCOMPLETE;
+    var INCOMPLETE = Private(require('ui/courier/fetch/_req_status')).INCOMPLETE;
 
     function continueIncompleteRequests(strategy, requests, responses, fetchWithStrategy) {
       var incomplete = [];
diff --git a/src/ui/public/courier/fetch/_fetch_these.js b/src/ui/public/courier/fetch/_fetch_these.js
new file mode 100644
index 0000000000000..3643f1b1bd1ed
--- /dev/null
+++ b/src/ui/public/courier/fetch/_fetch_these.js
@@ -0,0 +1,68 @@
+define(function (require) {
+  return function FetchTheseProvider(Private, Promise) {
+    var notify = Private(require('ui/courier/fetch/_notifier'));
+    var forEachStrategy = Private(require('ui/courier/fetch/_for_each_strategy'));
+
+    // core tasks
+    var callClient = Private(require('ui/courier/fetch/_call_client'));
+    var callResponseHandlers = Private(require('ui/courier/fetch/_call_response_handlers'));
+    var continueIncomplete = Private(require('ui/courier/fetch/_continue_incomplete'));
+
+    var ABORTED = Private(require('ui/courier/fetch/_req_status')).ABORTED;
+    var DUPLICATE = Private(require('ui/courier/fetch/_req_status')).DUPLICATE;
+    var INCOMPLETE = Private(require('ui/courier/fetch/_req_status')).INCOMPLETE;
+
+    function fetchThese(requests) {
+      return forEachStrategy(requests, function (strategy, requests) {
+        return fetchWithStrategy(strategy, requests.map(function (req) {
+          if (!req.started) return req;
+          return req.retry();
+        }));
+      })
+      .catch(notify.fatal);
+    }
+
+    function fetchWithStrategy(strategy, requests) {
+
+      requests = requests.map(function (req) {
+        if (req.aborted) {
+          return ABORTED;
+        }
+
+        if (req.started) {
+          req.continue();
+        } else {
+          req.start();
+        }
+
+        return req;
+      });
+
+      return Promise.resolve()
+      .then(function () {
+        return callClient(strategy, requests);
+      })
+      .then(function (responses) {
+        return callResponseHandlers(requests, responses);
+      })
+      .then(function (responses) {
+        return continueIncomplete(strategy, requests, responses, fetchWithStrategy);
+      })
+      .then(function (responses) {
+        return responses.map(function (resp) {
+          switch (resp) {
+          case ABORTED:
+            return null;
+          case DUPLICATE:
+          case INCOMPLETE:
+            throw new Error('Failed to clear incomplete or duplicate request from responses.');
+          default:
+            return resp;
+          }
+        });
+      });
+    }
+
+    return fetchThese;
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/_for_each_strategy.js b/src/ui/public/courier/fetch/_for_each_strategy.js
similarity index 100%
rename from src/kibana/components/courier/fetch/_for_each_strategy.js
rename to src/ui/public/courier/fetch/_for_each_strategy.js
diff --git a/src/ui/public/courier/fetch/_is_request.js b/src/ui/public/courier/fetch/_is_request.js
new file mode 100644
index 0000000000000..e0c368ebe3730
--- /dev/null
+++ b/src/ui/public/courier/fetch/_is_request.js
@@ -0,0 +1,9 @@
+define(function (require) {
+  return function CourierFetchIsRequestProvider(Private) {
+    var AbstractRequest = Private(require('ui/courier/fetch/request/request'));
+
+    return function isRequest(obj) {
+      return obj instanceof AbstractRequest;
+    };
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/_merge_duplicate_requests.js b/src/ui/public/courier/fetch/_merge_duplicate_requests.js
similarity index 79%
rename from src/kibana/components/courier/fetch/_merge_duplicate_requests.js
rename to src/ui/public/courier/fetch/_merge_duplicate_requests.js
index 03127fd582fdb..e76f7bf4cc046 100644
--- a/src/kibana/components/courier/fetch/_merge_duplicate_requests.js
+++ b/src/ui/public/courier/fetch/_merge_duplicate_requests.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function FetchMergeDuplicateRequests(Private) {
-    var isRequest = Private(require('components/courier/fetch/_is_request'));
-    var DUPLICATE = Private(require('components/courier/fetch/_req_status')).DUPLICATE;
+    var isRequest = Private(require('ui/courier/fetch/_is_request'));
+    var DUPLICATE = Private(require('ui/courier/fetch/_req_status')).DUPLICATE;
 
     function mergeDuplicateRequests(requests) {
       // dedupe requests
diff --git a/src/kibana/components/courier/fetch/_notifier.js b/src/ui/public/courier/fetch/_notifier.js
similarity index 100%
rename from src/kibana/components/courier/fetch/_notifier.js
rename to src/ui/public/courier/fetch/_notifier.js
diff --git a/src/kibana/components/courier/fetch/_req_status.js b/src/ui/public/courier/fetch/_req_status.js
similarity index 100%
rename from src/kibana/components/courier/fetch/_req_status.js
rename to src/ui/public/courier/fetch/_req_status.js
diff --git a/src/kibana/components/courier/fetch/fetch.js b/src/ui/public/courier/fetch/fetch.js
similarity index 84%
rename from src/kibana/components/courier/fetch/fetch.js
rename to src/ui/public/courier/fetch/fetch.js
index 163e2d8a50a39..dc67bcd6691c5 100644
--- a/src/kibana/components/courier/fetch/fetch.js
+++ b/src/ui/public/courier/fetch/fetch.js
@@ -2,11 +2,11 @@ define(function (require) {
   return function fetchService(Private, Promise) {
     var _ = require('lodash');
 
-    var requestQueue = Private(require('components/courier/_request_queue'));
-    var fetchThese = Private(require('components/courier/fetch/_fetch_these'));
+    var requestQueue = Private(require('ui/courier/_request_queue'));
+    var fetchThese = Private(require('ui/courier/fetch/_fetch_these'));
 
-    var callResponseHandlers = Private(require('components/courier/fetch/_call_response_handlers'));
-    var INCOMPLETE = Private(require('components/courier/fetch/_req_status')).INCOMPLETE;
+    var callResponseHandlers = Private(require('ui/courier/fetch/_call_response_handlers'));
+    var INCOMPLETE = Private(require('ui/courier/fetch/_req_status')).INCOMPLETE;
 
     function fetchQueued(strategy) {
       var requests = requestQueue.get(strategy);
diff --git a/src/ui/public/courier/fetch/request/_error_handler.js b/src/ui/public/courier/fetch/request/_error_handler.js
new file mode 100644
index 0000000000000..7510540a018ae
--- /dev/null
+++ b/src/ui/public/courier/fetch/request/_error_handler.js
@@ -0,0 +1,27 @@
+define(function (require) {
+  return function RequestErrorHandlerFactory(Private, Notifier) {
+    var errHandlers = Private(require('ui/courier/_error_handlers'));
+
+    var notify = new Notifier({
+      location: 'Courier Fetch Error'
+    });
+
+    function handleError(req, error) {
+      var myHandlers = [];
+
+      errHandlers.splice(0).forEach(function (handler) {
+        (handler.source === req.source ? myHandlers : errHandlers).push(handler);
+      });
+
+      if (!myHandlers.length) {
+        notify.fatal(new Error('unhandled error ' + (error.stack || error.message)));
+      } else {
+        myHandlers.forEach(function (handler) {
+          handler.defer.resolve(error);
+        });
+      }
+    }
+
+    return handleError;
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/request/_segmented_handle.js b/src/ui/public/courier/fetch/request/_segmented_handle.js
similarity index 94%
rename from src/kibana/components/courier/fetch/request/_segmented_handle.js
rename to src/ui/public/courier/fetch/request/_segmented_handle.js
index bc45848f11ed4..a75badae29e1c 100644
--- a/src/kibana/components/courier/fetch/request/_segmented_handle.js
+++ b/src/ui/public/courier/fetch/request/_segmented_handle.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function CourierSegmentedReqHandle(Private) {
     var _ = require('lodash');
-    var Events = Private(require('factories/events'));
+    var Events = Private(require('ui/events'));
 
 
     /**
diff --git a/src/ui/public/courier/fetch/request/doc.js b/src/ui/public/courier/fetch/request/doc.js
new file mode 100644
index 0000000000000..c056ed9ebf19d
--- /dev/null
+++ b/src/ui/public/courier/fetch/request/doc.js
@@ -0,0 +1,42 @@
+define(function (require) {
+  return function DocRequestProvider(Private) {
+    var _ = require('lodash');
+
+    var docStrategy = Private(require('ui/courier/fetch/strategy/doc'));
+    var AbstractRequest = Private(require('ui/courier/fetch/request/request'));
+
+    _.class(DocRequest).inherits(AbstractRequest);
+    function DocRequest(source, defer) {
+      DocRequest.Super.call(this, source, defer);
+
+      this.type = 'doc';
+      this.strategy = docStrategy;
+    }
+
+    DocRequest.prototype.canStart = function () {
+      var parent = DocRequest.Super.prototype.canStart.call(this);
+      if (!parent) return false;
+
+      var version = this.source._version;
+      var storedVersion = this.source._getStoredVersion();
+
+      // conditions that equal "fetch This DOC!"
+      var unkown = !version && !storedVersion;
+      var mismatch = version !== storedVersion;
+
+      return Boolean(mismatch || (unkown && !this.started));
+    };
+
+    DocRequest.prototype.handleResponse = function (resp) {
+      if (resp.found) {
+        this.source._storeVersion(resp._version);
+      } else {
+        this.source._clearVersion();
+      }
+
+      return DocRequest.Super.prototype.handleResponse.call(this, resp);
+    };
+
+    return DocRequest;
+  };
+});
diff --git a/src/kibana/components/courier/fetch/request/request.js b/src/ui/public/courier/fetch/request/request.js
similarity index 93%
rename from src/kibana/components/courier/fetch/request/request.js
rename to src/ui/public/courier/fetch/request/request.js
index cda072085aa23..30d72080fea0e 100644
--- a/src/kibana/components/courier/fetch/request/request.js
+++ b/src/ui/public/courier/fetch/request/request.js
@@ -2,9 +2,9 @@ define(function (require) {
   return function AbstractReqProvider(Private, Promise) {
     var _ = require('lodash');
     var moment = require('moment');
-    var errors = require('errors');
-    var requestQueue = Private(require('components/courier/_request_queue'));
-    var requestErrorHandler = Private(require('components/courier/fetch/request/_error_handler'));
+    var errors = require('ui/errors');
+    var requestQueue = Private(require('ui/courier/_request_queue'));
+    var requestErrorHandler = Private(require('ui/courier/fetch/request/_error_handler'));
 
     function AbstractReq(source, defer) {
       if (!(this instanceof AbstractReq) || !this.constructor || this.constructor === AbstractReq) {
diff --git a/src/ui/public/courier/fetch/request/search.js b/src/ui/public/courier/fetch/request/search.js
new file mode 100644
index 0000000000000..63f9c6a1355ac
--- /dev/null
+++ b/src/ui/public/courier/fetch/request/search.js
@@ -0,0 +1,19 @@
+define(function (require) {
+  return function SearchReqProvider(Private) {
+    var _ = require('lodash');
+
+    var searchStrategy = Private(require('ui/courier/fetch/strategy/search'));
+    var AbstractRequest = Private(require('ui/courier/fetch/request/request'));
+
+    _.class(SearchReq).inherits(AbstractRequest);
+    var Super = SearchReq.Super;
+    function SearchReq(source, defer) {
+      Super.call(this, source, defer);
+
+      this.type = 'search';
+      this.strategy = searchStrategy;
+    }
+
+    return SearchReq;
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/components/courier/fetch/request/segmented.js b/src/ui/public/courier/fetch/request/segmented.js
similarity index 96%
rename from src/kibana/components/courier/fetch/request/segmented.js
rename to src/ui/public/courier/fetch/request/segmented.js
index 9ee42707a42af..41e97f2880c5b 100644
--- a/src/kibana/components/courier/fetch/request/segmented.js
+++ b/src/ui/public/courier/fetch/request/segmented.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function CourierSegmentedReqProvider(es, Private, Promise, Notifier, timefilter, config) {
     var _ = require('lodash');
-    var SearchReq = Private(require('components/courier/fetch/request/search'));
-    var requestQueue = Private(require('components/courier/_request_queue'));
-    var SegmentedHandle = Private(require('components/courier/fetch/request/_segmented_handle'));
+    var SearchReq = Private(require('ui/courier/fetch/request/search'));
+    var requestQueue = Private(require('ui/courier/_request_queue'));
+    var SegmentedHandle = Private(require('ui/courier/fetch/request/_segmented_handle'));
 
     var notify = new Notifier({
       location: 'Segmented Fetch'
diff --git a/src/kibana/components/courier/fetch/strategy/doc.js b/src/ui/public/courier/fetch/strategy/doc.js
similarity index 100%
rename from src/kibana/components/courier/fetch/strategy/doc.js
rename to src/ui/public/courier/fetch/strategy/doc.js
diff --git a/src/ui/public/courier/fetch/strategy/search.js b/src/ui/public/courier/fetch/strategy/search.js
new file mode 100644
index 0000000000000..9fc50bbbba8d9
--- /dev/null
+++ b/src/ui/public/courier/fetch/strategy/search.js
@@ -0,0 +1,45 @@
+define(function (require) {
+  return function FetchStrategyForSearch(Private, Promise, timefilter) {
+    var _ = require('lodash');
+    var angular = require('angular');
+
+    return {
+      clientMethod: 'msearch',
+
+      /**
+       * Flatten a series of requests into as ES request body
+       *
+       * @param  {array} requests - the requests to serialize
+       * @return {string} - the request body
+       */
+      reqsFetchParamsToBody: function (reqsFetchParams) {
+        return reqsFetchParams.map(function (fetchParams) {
+          var indexList = fetchParams.index;
+
+          if (_.isFunction(_.get(indexList, 'toIndexList'))) {
+            var timeBounds = timefilter.getBounds();
+            indexList = indexList.toIndexList(timeBounds.min, timeBounds.max);
+          }
+
+          return angular.toJson({
+            index: indexList,
+            type: fetchParams.type,
+            search_type: fetchParams.search_type,
+            ignore_unavailable: true
+          })
+          + '\n'
+          + angular.toJson(fetchParams.body || {});
+        }).join('\n') + '\n';
+      },
+
+      /**
+       * Fetch the multiple responses from the ES Response
+       * @param  {object} resp - The response sent from Elasticsearch
+       * @return {array} - the list of responses
+       */
+      getResponses: function (resp) {
+        return resp.responses;
+      }
+    };
+  };
+});
diff --git a/src/kibana/components/courier/looper/_looper.js b/src/ui/public/courier/looper/_looper.js
similarity index 94%
rename from src/kibana/components/courier/looper/_looper.js
rename to src/ui/public/courier/looper/_looper.js
index a7e7e7598c512..341be68416a47 100644
--- a/src/kibana/components/courier/looper/_looper.js
+++ b/src/ui/public/courier/looper/_looper.js
@@ -9,7 +9,7 @@ define(function (require) {
       this._timer;
       this._started = false;
 
-      this._looperOver = _.bind(this._looperOver, this);
+      this._loopTheLoop = _.bind(this._loopTheLoop, this);
     }
 
     /**
@@ -59,7 +59,7 @@ define(function (require) {
       }
 
       if (loopOver) {
-        this._looperOver();
+        this._loopTheLoop();
       } else {
         this._scheduleLoop();
       }
@@ -126,7 +126,7 @@ define(function (require) {
      * @private
      * @return {undefined}
      */
-    Looper.prototype._looperOver = function () {
+    Looper.prototype._loopTheLoop = function () {
       var self = this;
 
       if (self.active) {
@@ -156,7 +156,7 @@ define(function (require) {
      */
     Looper.prototype._scheduleLoop = function () {
       this._unScheduleLoop();
-      this._timer = this._ms ? $timeout(this._looperOver, this._ms) : null;
+      this._timer = this._ms ? $timeout(this._loopTheLoop, this._ms) : null;
       return this._timer;
     };
 
@@ -182,4 +182,4 @@ define(function (require) {
 
     return Looper;
   };
-});
\ No newline at end of file
+});
diff --git a/src/ui/public/courier/looper/doc.js b/src/ui/public/courier/looper/doc.js
new file mode 100644
index 0000000000000..1bb9bf23ae5e7
--- /dev/null
+++ b/src/ui/public/courier/looper/doc.js
@@ -0,0 +1,17 @@
+define(function (require) {
+  return function DocLooperService(Private) {
+    var fetch = Private(require('ui/courier/fetch/fetch'));
+    var Looper = Private(require('ui/courier/looper/_looper'));
+    var docStrategy = Private(require('ui/courier/fetch/strategy/doc'));
+
+    /**
+     * The Looper which will manage the doc fetch interval
+     * @type {Looper}
+     */
+    var docLooper = new Looper(1500, function () {
+      fetch.fetchQueued(docStrategy);
+    });
+
+    return docLooper;
+  };
+});
diff --git a/src/ui/public/courier/looper/search.js b/src/ui/public/courier/looper/search.js
new file mode 100644
index 0000000000000..11ddc5f2fa1b2
--- /dev/null
+++ b/src/ui/public/courier/looper/search.js
@@ -0,0 +1,35 @@
+define(function (require) {
+  return function SearchLooperService(Private, Promise, Notifier, $rootScope) {
+    var fetch = Private(require('ui/courier/fetch/fetch'));
+    var searchStrategy = Private(require('ui/courier/fetch/strategy/search'));
+    var requestQueue = Private(require('ui/courier/_request_queue'));
+
+    var Looper = Private(require('ui/courier/looper/_looper'));
+    var notif = new Notifier({ location: 'Search Looper' });
+
+    /**
+     * The Looper which will manage the doc fetch interval
+     * @type {Looper}
+     */
+    var searchLooper = new Looper(null, function () {
+      $rootScope.$broadcast('courier:searchRefresh');
+      return fetch.these(
+        requestQueue.getInactive(searchStrategy)
+      );
+    });
+
+    searchLooper.onHastyLoop = function () {
+      if (searchLooper.afterHastyQueued) return;
+
+      searchLooper.afterHastyQueued = Promise.resolve(searchLooper.active)
+      .then(function () {
+        return searchLooper._loopTheLoop();
+      })
+      .finally(function () {
+        searchLooper.afterHastyQueued = null;
+      });
+    };
+
+    return searchLooper;
+  };
+});
diff --git a/src/kibana/components/courier/saved_object/saved_object.js b/src/ui/public/courier/saved_object/saved_object.js
similarity index 93%
rename from src/kibana/components/courier/saved_object/saved_object.js
rename to src/ui/public/courier/saved_object/saved_object.js
index 275d124aa07d7..5280fc75ce9ae 100644
--- a/src/kibana/components/courier/saved_object/saved_object.js
+++ b/src/ui/public/courier/saved_object/saved_object.js
@@ -1,13 +1,13 @@
 define(function (require) {
-  return function SavedObjectFactory(es, configFile, Promise, Private, Notifier, indexPatterns) {
+  return function SavedObjectFactory(es, kbnIndex, Promise, Private, Notifier, indexPatterns) {
     var angular = require('angular');
-    var errors = require('errors');
+    var errors = require('ui/errors');
     var _ = require('lodash');
-    var slugifyId = require('utils/slugify_id');
+    var slugifyId = require('ui/utils/slugify_id');
 
-    var DocSource = Private(require('components/courier/data_source/doc_source'));
-    var SearchSource = Private(require('components/courier/data_source/search_source'));
-    var mappingSetup = Private(require('utils/mapping_setup'));
+    var DocSource = Private(require('ui/courier/data_source/doc_source'));
+    var SearchSource = Private(require('ui/courier/data_source/search_source'));
+    var mappingSetup = Private(require('ui/utils/mapping_setup'));
 
     function SavedObject(config) {
       if (!_.isObject(config)) config = {};
@@ -58,7 +58,7 @@ define(function (require) {
 
         // tell the docSource where to find the doc
         docSource
-        .index(configFile.kibana_index)
+        .index(kbnIndex)
         .type(type)
         .id(self.id);
 
@@ -236,7 +236,7 @@ define(function (require) {
         var finish = function (id) {
           self.id = id;
           return es.indices.refresh({
-            index: configFile.kibana_index
+            index: kbnIndex
           })
           .then(function () {
             return self.id;
@@ -279,12 +279,12 @@ define(function (require) {
        */
       self.delete = function () {
         return es.delete({
-          index: configFile.kibana_index,
+          index: kbnIndex,
           type: type,
           id: this.id
         }).then(function () {
           return es.indices.refresh({
-            index: configFile.kibana_index
+            index: kbnIndex
           });
         });
       };
diff --git a/src/ui/public/debounce/__tests__/debounce.js b/src/ui/public/debounce/__tests__/debounce.js
new file mode 100644
index 0000000000000..4b0cea4de9ca6
--- /dev/null
+++ b/src/ui/public/debounce/__tests__/debounce.js
@@ -0,0 +1,85 @@
+
+var sinon = require('auto-release-sinon');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+var debounce;
+var $timeout;
+var $timeoutSpy;
+
+function init() {
+  ngMock.module('kibana');
+
+  ngMock.inject(function ($injector, _$timeout_) {
+    $timeout = _$timeout_;
+    $timeoutSpy = sinon.spy($timeout);
+
+    debounce = $injector.get('debounce');
+  });
+}
+
+describe('debounce service', function () {
+  var spy;
+  beforeEach(function () {
+    spy = sinon.spy(function () {});
+    init();
+  });
+
+  describe('API', function () {
+    it('should have a cancel method', function () {
+      var bouncer = debounce(function () {}, 100);
+      expect(bouncer).to.have.property('cancel');
+    });
+  });
+
+  describe('delayed execution', function () {
+    it('should delay execution', function () {
+      var bouncer = debounce(spy, 100);
+      bouncer();
+      expect(spy.callCount).to.be(0);
+      $timeout.flush();
+      expect(spy.callCount).to.be(1);
+    });
+
+    it('should fire on leading edge', function () {
+      var bouncer = debounce(spy, 100, { leading: true });
+      bouncer();
+      expect(spy.callCount).to.be(1);
+      $timeout.flush();
+      expect(spy.callCount).to.be(2);
+    });
+
+    it('should only fire on leading edge', function () {
+      var bouncer = debounce(spy, 100, { leading: true, trailing: false });
+      bouncer();
+      expect(spy.callCount).to.be(1);
+      $timeout.flush();
+      expect(spy.callCount).to.be(1);
+    });
+
+    it('should reset delayed execution', function (done) {
+      var cancelSpy = sinon.spy($timeout, 'cancel');
+      var bouncer = debounce(spy, 100);
+      bouncer();
+      setTimeout(function () {
+        bouncer();
+        expect(spy.callCount).to.be(0);
+        $timeout.flush();
+        expect(spy.callCount).to.be(1);
+        expect(cancelSpy.callCount).to.be(1);
+        done();
+      }, 1);
+    });
+  });
+
+  describe('cancel', function () {
+    it('should cancel the $timeout', function () {
+      var cancelSpy = sinon.spy($timeout, 'cancel');
+      var bouncer = debounce(spy, 100);
+      bouncer();
+      bouncer.cancel();
+      expect(cancelSpy.callCount).to.be(1);
+      $timeout.verifyNoPendingTasks(); // throws if pending timeouts
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/debounce/debounce.js b/src/ui/public/debounce/debounce.js
new file mode 100644
index 0000000000000..ab5901e45a79b
--- /dev/null
+++ b/src/ui/public/debounce/debounce.js
@@ -0,0 +1,49 @@
+// Debounce service, angularized version of lodash debounce
+// borrowed heavily from https://github.com/shahata/angular-debounce
+
+define(function (require) {
+  var _ = require('lodash');
+  var module = require('ui/modules').get('kibana');
+
+  module.service('debounce', ['$timeout', function ($timeout) {
+    return function (func, wait, options) {
+      var timeout, args, self, result;
+      options = _.defaults(options || {}, {
+        leading: false,
+        trailing: true
+      });
+
+      function debounce() {
+        self = this;
+        args = arguments;
+
+        var later = function () {
+          timeout = null;
+          if (!options.leading || options.trailing) {
+            result = func.apply(self, args);
+          }
+        };
+
+        var callNow = options.leading && !timeout;
+
+        if (timeout) {
+          $timeout.cancel(timeout);
+        }
+        timeout = $timeout(later, wait);
+
+        if (callNow) {
+          result = func.apply(self, args);
+        }
+
+        return result;
+      }
+
+      debounce.cancel = function () {
+        $timeout.cancel(timeout);
+        timeout = null;
+      };
+
+      return debounce;
+    };
+  }]);
+});
\ No newline at end of file
diff --git a/src/ui/public/directives/__tests__/auto_select_if_only_one.js b/src/ui/public/directives/__tests__/auto_select_if_only_one.js
new file mode 100644
index 0000000000000..112c34c1f6ce8
--- /dev/null
+++ b/src/ui/public/directives/__tests__/auto_select_if_only_one.js
@@ -0,0 +1,51 @@
+
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+require('ui/directives/auto_select_if_only_one');
+
+describe('Auto-select if only one directive', function () {
+  var $compile, $rootScope;
+  var html = '<select ng-model="value" ng-options="option.name for option in options" auto-select-if-only-one="options"></select>';
+  var zeroOptions = [];
+  var oneOption = [{label: 'foo'}];
+  var multiOptions = [{label: 'foo'}, {label: 'bar'}];
+
+  beforeEach(ngMock.module('kibana'));
+
+  beforeEach(ngMock.inject(function (_$compile_, _$rootScope_) {
+    $compile = _$compile_;
+    $rootScope = _$rootScope_;
+    $compile(html)($rootScope);
+    $rootScope.value = null;
+  }));
+
+  it('should not auto-select if there are no options', function () {
+    $rootScope.options = zeroOptions;
+    $rootScope.$digest();
+    expect($rootScope.value).to.not.be.ok();
+  });
+
+  it('should not auto-select if there are multiple options', function () {
+    $rootScope.options = multiOptions;
+    $rootScope.$digest();
+    expect($rootScope.value).to.not.be.ok();
+  });
+
+  it('should auto-select if there is only one option', function () {
+    $rootScope.options = oneOption;
+    $rootScope.$digest();
+    expect($rootScope.value).to.be(oneOption[0]);
+  });
+
+  it('should still auto select if the collection contains 2 items but is filtered to 1', function () {
+    $rootScope.options = multiOptions;
+    var html = '<select ng-model="value" ng-options="option.name for option in options | filter:{label:\'bar\'}" ' +
+    'auto-select-if-only-one="options | filter:{label:\'bar\'}"></select>';
+    $compile(html)($rootScope);
+    $rootScope.value = null;
+    $rootScope.$digest();
+
+    expect($rootScope.value).to.be(multiOptions[1]);
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/directives/__tests__/confirm-click.js b/src/ui/public/directives/__tests__/confirm-click.js
new file mode 100644
index 0000000000000..8120c45baacc9
--- /dev/null
+++ b/src/ui/public/directives/__tests__/confirm-click.js
@@ -0,0 +1,118 @@
+var angular = require('angular');
+var $ = require('jquery');
+var sinon = require('sinon');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+require('ui/directives/confirm_click');
+require('plugins/kibana/discover/index');
+
+var $parentScope, $scope, $elem;
+
+var init = function (text) {
+  // Load the application
+  ngMock.module('kibana');
+
+  // Create the scope
+  ngMock.inject(function ($rootScope, $compile) {
+
+    // Give us a scope
+    $parentScope = $rootScope;
+
+    // Create the element
+    $elem = angular.element(
+      '<a confirm-click="runThis()">runThis</a>'
+    );
+
+    // And compile it
+    $compile($elem)($parentScope);
+
+    // Fire a digest cycle
+    $elem.scope().$digest();
+
+    // Grab the isolate scope so we can test it
+    $scope = $elem.scope();
+
+    // Add a function to check the run status of.
+    $scope.runThis = sinon.spy();
+  });
+};
+
+
+describe('confirmClick directive', function () {
+
+
+  describe('event handlers', function () {
+    var events;
+
+    beforeEach(function () {
+      init();
+      events = $._data($elem[0], 'events');
+    });
+
+    it('should get a click handler', function (done) {
+      expect(events).to.be.a(Object);
+      expect(events.click).to.be.a(Array);
+      done();
+    });
+
+    it('should unbind click handlers when the scope is destroyed', function (done) {
+      $scope.$destroy();
+      expect(events.click).to.be(undefined);
+      done();
+    });
+
+  });
+
+
+
+  describe('confirmed', function () {
+    var confirmed;
+
+    beforeEach(function () {
+      init();
+      confirmed = sinon.stub(window, 'confirm');
+      confirmed.returns(true);
+    });
+
+    afterEach(function () {
+      window.confirm.restore();
+    });
+
+    it('should trigger window.confirm when clicked', function (done) {
+      $elem.click();
+      expect(confirmed.called).to.be(true);
+      done();
+    });
+
+    it('should run the click function when positively confirmed', function (done) {
+      $elem.click();
+      expect($scope.runThis.called).to.be(true);
+      done();
+    });
+
+  });
+
+  describe('not confirmed', function () {
+    var confirmed;
+
+    beforeEach(function () {
+      init();
+      confirmed = sinon.stub(window, 'confirm');
+      confirmed.returns(false);
+    });
+
+    afterEach(function () {
+      window.confirm.restore();
+    });
+
+    it('should not run the click function when canceled', function (done) {
+      $elem.click();
+      expect($scope.runThis.called).to.be(false);
+      done();
+    });
+
+  });
+
+
+});
diff --git a/src/ui/public/directives/__tests__/css_truncate.js b/src/ui/public/directives/__tests__/css_truncate.js
new file mode 100644
index 0000000000000..da11c0b3f0e14
--- /dev/null
+++ b/src/ui/public/directives/__tests__/css_truncate.js
@@ -0,0 +1,61 @@
+var angular = require('angular');
+var $ = require('jquery');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+require('plugins/kibana/discover/index');
+
+var $parentScope, $scope, $elem;
+
+var init = function (expandable) {
+  // Load the application
+  ngMock.module('kibana');
+
+  // Create the scope
+  ngMock.inject(function ($rootScope, $compile) {
+
+    // Give us a scope
+    $parentScope = $rootScope;
+
+    // Create the element
+    $elem = angular.element(
+      '<span css-truncate ' + (expandable ? 'css-truncate-expandable' : '') + '>this isnt important</span>'
+    );
+
+    // And compile it
+    $compile($elem)($parentScope);
+
+    // Fire a digest cycle
+    $elem.scope().$digest();
+
+    // Grab the isolate scope so we can test it
+    $scope = $elem.isolateScope();
+  });
+};
+
+
+describe('cssTruncate directive', function () {
+
+  describe('expandable', function () {
+
+    beforeEach(function () {
+      init(true);
+    });
+
+    it('should set text-overflow to ellipsis and whitespace to nowrap', function (done) {
+      expect($elem.css('text-overflow')).to.be('ellipsis');
+      expect($elem.css('white-space')).to.be('nowrap');
+      done();
+    });
+
+    it('should set white-space to normal when clicked, and back to nowrap when clicked again', function (done) {
+      $scope.toggle();
+      expect($elem.css('white-space')).to.be('normal');
+
+      $scope.toggle();
+      expect($elem.css('white-space')).to.be('nowrap');
+      done();
+    });
+
+  });
+
+});
diff --git a/src/ui/public/directives/__tests__/fixedScroll.js b/src/ui/public/directives/__tests__/fixedScroll.js
new file mode 100644
index 0000000000000..2efd8dab85596
--- /dev/null
+++ b/src/ui/public/directives/__tests__/fixedScroll.js
@@ -0,0 +1,160 @@
+
+require('ui/fixedScroll');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+describe('FixedScroll directive', function () {
+  var $ = require('jquery');
+  var sinon = require('auto-release-sinon');
+  var Promise = require('bluebird');
+
+  var compile;
+  var trash = [];
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function ($compile, $rootScope) {
+
+    compile = function (ratioY, ratioX) {
+      if (ratioX == null) ratioX = ratioY;
+
+      // since the directive works at the sibling level we create a
+      // parent for everything to happen in
+      var $parent = $('<div>').css({
+        position: 'fixed',
+        top: 0,
+        left: 0,
+        right: 0,
+        bottom: 0
+      });
+
+      $parent.appendTo(document.body);
+      trash.push($parent);
+
+      var $el = $('<div fixed-scroll></div>').css({
+        'overflow-x': 'auto',
+        'width': $parent.width()
+      }).appendTo($parent);
+
+      var $content = $('<div>').css({
+        width: $parent.width() * ratioX,
+        height: $parent.height() * ratioY
+      }).appendTo($el);
+
+      $compile($parent)($rootScope);
+      $rootScope.$digest();
+
+      return {
+        $container: $el,
+        $content: $content,
+        $scroller: $parent.find('.fixed-scroll-scroller')
+      };
+    };
+
+  }));
+
+  afterEach(function () {
+    trash.splice(0).forEach(function ($el) {
+      $el.remove();
+    });
+  });
+
+  it('does nothing when not needed', function () {
+    var els = compile(0.5, 1.5);
+    expect(els.$scroller).to.have.length(0);
+
+    els = compile(1.5, 0.5);
+    expect(els.$scroller).to.have.length(0);
+  });
+
+  it('attaches a scroller below the element when the content is larger then the container', function () {
+    var els = compile(1.5);
+    expect(els.$scroller).to.have.length(1);
+  });
+
+  it('copies the width of the container', function () {
+    var els = compile(1.5);
+    expect(els.$scroller.width()).to.be(els.$container.width());
+  });
+
+  it('mimics the scrollWidth of the element', function () {
+    var els = compile(1.5);
+    expect(els.$scroller.prop('scrollWidth')).to.be(els.$container.prop('scrollWidth'));
+  });
+
+  describe('scroll event handling / tug of war prevention', function () {
+    it('listens when needed, unlistens when not needed', function () {
+      var on = sinon.spy($.fn, 'on');
+      var off = sinon.spy($.fn, 'off');
+
+      function checkThisVals(name, spy) {
+        // the this values should be different
+        expect(spy.thisValues[0].is(spy.thisValues[1])).to.be(false);
+        // but they should be either $scroller or $container
+        spy.thisValues.forEach(function ($this) {
+          if ($this.is(els.$scroller) || $this.is(els.$container)) return;
+          expect.fail('expected ' + name + ' to be called with $scroller or $container');
+        });
+      }
+
+      var els = compile(1.5);
+      expect(on.callCount).to.be(2);
+      checkThisVals('$.fn.on', on);
+
+      expect(off.callCount).to.be(0);
+      els.$container.width(els.$container.prop('scrollWidth'));
+      els.$container.scope().$digest();
+      expect(off.callCount).to.be(2);
+
+      checkThisVals('$.fn.off', off);
+    });
+
+    [
+      { from: '$container', to: '$scroller' },
+      { from: '$scroller', to: '$container' }
+    ].forEach(function (names) {
+      describe('scroll events ' + JSON.stringify(names), function () {
+        var spy;
+        var els;
+        var $from;
+        var $to;
+
+        beforeEach(function () {
+          spy = sinon.spy($.fn, 'scrollLeft');
+          els = compile(1.5);
+          $from = els[names.from];
+          $to = els[names.to];
+        });
+
+        it('transfers the scrollLeft', function () {
+          expect(spy.callCount).to.be(0);
+          $from.scroll();
+          expect(spy.callCount).to.be(2);
+
+          // first call should read the scrollLeft from the $container
+          var firstCall = spy.getCall(0);
+          expect(firstCall.thisValue.is($from)).to.be(true);
+          expect(firstCall.args).to.eql([]);
+
+          // second call should be setting the scrollLeft on the $scroller
+          var secondCall = spy.getCall(1);
+          expect(secondCall.thisValue.is($to)).to.be(true);
+          expect(secondCall.args).to.eql([firstCall.returnValue]);
+        });
+
+        /**
+         * In practice, calling $el.scrollLeft() causes the "scroll" event to trigger,
+         * but the browser seems to be very careful about triggering the event too much
+         * and I can't reliably recreate the browsers behavior in a test. So... faking it!
+         */
+        it('prevents tug of war by ignoring echo scroll events', function () {
+          $from.scroll();
+          expect(spy.callCount).to.be(2);
+
+          spy.reset();
+          $to.scroll();
+          expect(spy.callCount).to.be(0);
+        });
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/directives/__tests__/inequality.js b/src/ui/public/directives/__tests__/inequality.js
new file mode 100644
index 0000000000000..d2ff1530a7ff4
--- /dev/null
+++ b/src/ui/public/directives/__tests__/inequality.js
@@ -0,0 +1,73 @@
+
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+require('ui/directives/inequality');
+
+describe('greater_than model validator directive', function () {
+  var $compile, $rootScope;
+  var html;
+
+  beforeEach(ngMock.module('kibana'));
+
+  beforeEach(ngMock.inject(function (_$compile_, _$rootScope_) {
+    $compile = _$compile_;
+    $rootScope = _$rootScope_;
+  }));
+
+  // no value is the same as 0
+  describe('without value', function () {
+    var element;
+    beforeEach(function () {
+      html = '<input type="text" ng-model="value" greater-than />';
+      element = $compile(html)($rootScope);
+    });
+
+    it('should be valid when larger than 0', function () {
+      $rootScope.value = '1';
+      $rootScope.$digest();
+      expect(element.hasClass('ng-valid')).to.be.ok();
+    });
+
+    it('should be valid for 0', function () {
+      $rootScope.value = '0';
+      $rootScope.$digest();
+      expect(element.hasClass('ng-valid')).to.be.ok();
+    });
+
+    it('should be valid for negatives', function () {
+      $rootScope.value = '-10';
+      $rootScope.$digest();
+      expect(element.hasClass('ng-valid')).to.be.ok();
+    });
+  });
+
+  [0, 1, 10, 42, -12].forEach(function (num) {
+    describe('with value ' + num, function () {
+      var element;
+      beforeEach(function () {
+        html = '<input type="text" ng-model="value" greater-than="' + num + '" />';
+        element = $compile(html)($rootScope);
+      });
+
+      it('should be valid when larger than ' + num, function () {
+        $rootScope.value = num + 1;
+        $rootScope.$digest();
+        expect(element.hasClass('ng-valid')).to.be.ok();
+      });
+
+      it('should be invalid for ' + num, function () {
+        $rootScope.value = num;
+        $rootScope.$digest();
+        expect(element.hasClass('ng-invalid')).to.be.ok();
+      });
+
+      it('should be invalid for less than ' + num, function () {
+        $rootScope.value = num - 1;
+        $rootScope.$digest();
+        expect(element.hasClass('ng-invalid')).to.be.ok();
+      });
+    });
+  });
+
+});
\ No newline at end of file
diff --git a/src/ui/public/directives/__tests__/input_focus.js b/src/ui/public/directives/__tests__/input_focus.js
new file mode 100644
index 0000000000000..aab8f97155d8f
--- /dev/null
+++ b/src/ui/public/directives/__tests__/input_focus.js
@@ -0,0 +1,54 @@
+
+var angular = require('angular');
+var $ = require('jquery');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+require('ui/directives/input_focus');
+
+describe('Input focus directive', function () {
+  var $compile, $rootScope, $timeout, element;
+  var $el, selectedEl, selectedText;
+  var inputValue = 'Input Text Value';
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (_$compile_, _$rootScope_, _$timeout_) {
+    $compile = _$compile_;
+    $rootScope = _$rootScope_;
+    $timeout = _$timeout_;
+
+    $el = $('<div>');
+    $el.appendTo('body');
+  }));
+
+  afterEach(function () {
+    $el.remove();
+    $el = null;
+  });
+
+  function renderEl(html) {
+    $rootScope.value = inputValue;
+    element = $compile(html)($rootScope);
+    element.appendTo($el);
+    $rootScope.$digest();
+    $timeout.flush();
+    selectedEl = document.activeElement;
+    selectedText = selectedEl.value.slice(
+      selectedEl.selectionStart,
+      selectedEl.selectionEnd
+    );
+  }
+
+
+  it('should focus the input', function () {
+    renderEl('<input type="text" ng-model="value" input-focus />');
+    expect(selectedEl).to.equal(element[0]);
+    expect(selectedText.length).to.equal(0);
+  });
+
+  it('should select the text in the input', function () {
+    renderEl('<input type="text" ng-model="value" input-focus="select" />');
+    expect(selectedEl).to.equal(element[0]);
+    expect(selectedText.length).to.equal(inputValue.length);
+    expect(selectedText).to.equal(inputValue);
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/directives/__tests__/input_whole_number.js b/src/ui/public/directives/__tests__/input_whole_number.js
new file mode 100644
index 0000000000000..727513dce471c
--- /dev/null
+++ b/src/ui/public/directives/__tests__/input_whole_number.js
@@ -0,0 +1,49 @@
+
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+require('ui/directives/input_whole_number');
+
+describe('Whole number input directive', function () {
+  var $compile, $rootScope;
+  var html = '<input type="text" ng-model="value" input-whole-number />';
+
+  beforeEach(ngMock.module('kibana'));
+
+  beforeEach(ngMock.inject(function (_$compile_, _$rootScope_) {
+    $compile = _$compile_;
+    $rootScope = _$rootScope_;
+  }));
+
+  it('should allow whole numbers', function () {
+    var element = $compile(html)($rootScope);
+
+    $rootScope.value = '123';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+
+    $rootScope.value = '1.0';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+
+    $rootScope.value = '-5.0';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+  });
+
+  it('should disallow numbers with decimals', function () {
+    var element = $compile(html)($rootScope);
+
+    $rootScope.value = '123.0';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+
+    $rootScope.value = '1.2';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-invalid')).to.be.ok();
+
+    $rootScope.value = '-5.5';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-invalid')).to.be.ok();
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/directives/__tests__/spinner.js b/src/ui/public/directives/__tests__/spinner.js
new file mode 100644
index 0000000000000..5c46ce9d7c49d
--- /dev/null
+++ b/src/ui/public/directives/__tests__/spinner.js
@@ -0,0 +1,48 @@
+var angular = require('angular');
+var $ = require('jquery');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+require('plugins/kibana/discover/index');
+
+var $parentScope, $scope, $elem;
+
+var init = function () {
+  // Load the application
+  ngMock.module('kibana');
+
+  // Create the scope
+  ngMock.inject(function ($rootScope, $compile) {
+
+    // Give us a scope
+    $parentScope = $rootScope;
+
+    // Create the element
+    $elem = angular.element(
+      '<span class="spinner"></span>'
+    );
+
+    // And compile it
+    $compile($elem)($parentScope);
+
+    // Fire a digest cycle
+    $elem.scope().$digest();
+
+    // Grab the isolate scope so we can test it
+    $scope = $elem.isolateScope();
+  });
+};
+
+
+describe('spinner directive', function () {
+
+  beforeEach(function () {
+    init();
+  });
+
+  it('should contain 3 divs', function (done) {
+    expect($elem.children('div').length).to.be(3);
+    done();
+  });
+
+});
diff --git a/src/ui/public/directives/__tests__/timepicker.js b/src/ui/public/directives/__tests__/timepicker.js
new file mode 100644
index 0000000000000..2398c20805188
--- /dev/null
+++ b/src/ui/public/directives/__tests__/timepicker.js
@@ -0,0 +1,444 @@
+var angular = require('angular');
+var moment = require('moment');
+var expect = require('expect.js');
+var _ = require('lodash');
+var $ = require('jquery');
+var sinon = require('auto-release-sinon');
+var ngMock = require('ngMock');
+
+require('plugins/kibana/visualize/index');
+require('plugins/kibana/dashboard/index');
+
+// TODO: This should not be needed, timefilter is only included here, it should move
+require('plugins/kibana/discover/index');
+
+var $parentScope, $scope, $elem;
+var anchor = '2014-01-01T06:06:06.666Z';
+var clock;
+
+var init = function () {
+  // Load the application
+  ngMock.module('kibana');
+
+  // Stub out the clock so 'now' doesn't move
+  clock = sinon.useFakeTimers(moment(anchor).valueOf());
+
+  // Create the scope
+  ngMock.inject(function ($rootScope, $compile) {
+
+    // Give us a scope
+    $parentScope = $rootScope;
+
+    // Add some parameters to it
+    var timefilter = {
+      time : {
+        from: moment().subtract(15, 'minutes'),
+        to: moment(),
+        mode: undefined
+      },
+      refreshInterval : {
+        value : 0,
+        display : 'Off'
+      }
+    };
+    $parentScope.timefilter = timefilter;
+
+    // Create the element
+    $elem = angular.element(
+      '<kbn-timepicker' +
+      ' from="timefilter.time.from"' +
+      ' to="timefilter.time.to"' +
+      ' mode="timefilter.time.mode"' +
+      ' active-tab="timefilter.timepickerActiveTab"' +
+      ' interval="timefilter.refreshInterval">' +
+      '</kbn-timepicker>'
+    );
+
+    // And compile it
+    $compile($elem)($parentScope);
+
+    // Fire a digest cycle
+    $elem.scope().$digest();
+
+    // Grab the isolate scope so we can test it
+    $scope = $elem.isolateScope();
+  });
+};
+
+
+describe('timepicker directive', function () {
+
+  describe('tabs', function () {
+
+    beforeEach(function () {
+      init();
+    });
+
+    it('should contain two tabs', function (done) {
+      expect($elem.find('.tab-pane').length).to.be(2);
+      done();
+    });
+  });
+
+  describe('refresh interval', function () {
+    var $courier;
+    beforeEach(function () {
+      init();
+      ngMock.inject(function (courier, $rootScope) {
+        $courier = courier;
+        $rootScope.$apply();
+      });
+    });
+
+    it('should contain a list of options', function (done) {
+      expect($elem.find('.kbn-refresh-section').length).to.be.greaterThan(0);
+      done();
+    });
+
+    it('should have a $scope.setRefreshInterval() that sets interval variable', function (done) {
+      $scope.setRefreshInterval('interval');
+      expect($scope.interval).to.be('interval');
+      done();
+    });
+
+    it('should set the interval on the courier', function (done) {
+      // Change refresh interval and digest
+      $scope.setRefreshInterval({ value : 1000});
+      $elem.scope().$digest();
+      expect($courier.searchLooper.loopInterval()).to.be(1000);
+      done();
+    });
+
+    it('should disable the looper when paused', function (done) {
+      $scope.setRefreshInterval({ value : 1000, pause: true});
+      $elem.scope().$digest();
+      expect($courier.searchLooper.loopInterval()).to.be(0);
+      expect($scope.interval.value).to.be(1000);
+      done();
+    });
+
+    it('but keep interval.value set', function (done) {
+      $scope.setRefreshInterval({ value : 1000, pause: true});
+      $elem.scope().$digest();
+      expect($scope.interval.value).to.be(1000);
+      done();
+    });
+
+    it('should unpause when setRefreshInterval is called without pause:true', function (done) {
+      $scope.setRefreshInterval({ value : 1000, pause: true});
+      expect($scope.interval.pause).to.be(true);
+
+      $scope.setRefreshInterval({ value : 1000, pause: false});
+      expect($scope.interval.pause).to.be(false);
+
+      $scope.setRefreshInterval({ value : 1000});
+      expect($scope.interval.pause).to.be(false);
+
+      done();
+    });
+
+
+    it('should highlight the current active interval', function (done) {
+      $scope.setRefreshInterval({ value: 300000 });
+      $elem.scope().$digest();
+      expect($elem.find('.refresh-interval-active').length).to.be(1);
+      expect($elem.find('.refresh-interval-active').text().trim()).to.be('5 minutes');
+      done();
+    });
+
+    it('should default the interval on the courier with incorrect values', function (done) {
+      // Change refresh interval and digest
+      $scope.setRefreshInterval('undefined');
+      $elem.scope().$digest();
+      expect($courier.searchLooper.loopInterval()).to.be(0);
+      done();
+    });
+  });
+
+  describe('mode setting', function () {
+
+    beforeEach(function () {
+      init();
+    });
+
+    it('should be in quick mode by default', function (done) {
+      expect($scope.mode).to.be('quick');
+      done();
+    });
+
+    it('should highlight the right mode', function (done) {
+      expect($elem.find('.kbn-timepicker-modes .active').text().trim()).to.be('quick');
+
+      // Each of the 3 modes
+      var modes = ['absolute', 'relative', 'quick'];
+      _.each(modes, function (mode) {
+        $scope.setMode(mode);
+        $scope.$digest();
+        expect($elem.find('.kbn-timepicker-modes .active').text().trim()).to.be(mode);
+      });
+
+      done();
+    });
+  });
+
+  describe('quick mode', function () {
+
+    beforeEach(function () {
+      init();
+      $scope.setMode('quick');
+      $scope.$digest();
+    });
+
+    it('should contain 4 lists of options', function (done) {
+      expect($elem.find('.kbn-timepicker-section .list-unstyled').length).to.be(4);
+      done();
+    });
+
+    it('should have a $scope.setQuick() that sets the to and from variables to strings', function (done) {
+      $scope.setQuick('now', 'now');
+      expect($scope.from).to.be('now');
+      expect($scope.to).to.be('now');
+      done();
+    });
+  });
+
+  describe('relative mode', function () {
+
+    beforeEach(function () {
+      init();
+      $scope.setMode('relative');
+      $scope.$digest();
+    });
+
+    it('has a preview of the "from" input', function (done) {
+      var preview = $elem.find('.kbn-timepicker-section span[ng-show="relative.preview"]');
+      expect(preview.text()).to.be(moment().subtract(15, 'minutes').format($scope.format));
+      done();
+    });
+
+    it('has a disabled "to" field that contains "Now"', function (done) {
+      expect($elem.find('.kbn-timepicker-section input[disabled]').val()).to.be('Now');
+      done();
+    });
+
+    it('has a submit handler', function (done) {
+      var form = $elem.find('form[ng-submit="applyRelative()"]');
+      expect(form.length).to.be(1);
+      done();
+    });
+
+    it('disables the submit button if the form is invalid', function (done) {
+      var button;
+      button = $elem.find('button[disabled]');
+      expect(button.length).to.be(0);
+
+      // Make the form invalid
+      $scope.relative.count = 'foo';
+      $scope.formatRelative();
+      $scope.$digest();
+
+      button = $elem.find('button[disabled]');
+      expect(button.length).to.be(1);
+      done();
+    });
+
+    it('has a dropdown bound to relative.unit that contains all of the intervals', function (done) {
+      var select = $elem.find('.kbn-timepicker-section select[ng-model="relative.unit"]');
+      expect(select.length).to.be(1);
+      expect(select.find('option').length).to.be(7);
+
+      // Check each relative option, make sure it is in the list
+      _.each($scope.relativeOptions, function (unit, i) {
+        expect(select.find('option')[i].text).to.be(unit.text);
+      });
+      done();
+    });
+
+    it('has a checkbox that is checked when rounding is enabled', function (done) {
+      var checkbox = $elem.find('.kbn-timepicker-section input[ng-model="relative.round"]');
+      expect(checkbox.length).to.be(1);
+
+      // Rounding is disabled by default
+      expect(checkbox.attr('checked')).to.be(undefined);
+
+      // Enable rounding
+      $scope.relative.round = true;
+      $scope.$digest();
+      expect(checkbox.attr('checked')).to.be('checked');
+
+      done();
+    });
+
+    it('rounds the preview down to the unit when rounding is enabled', function (done) {
+      // Enable rounding
+      $scope.relative.round = true;
+      $scope.relative.count = 0;
+
+      _.each($scope.units, function (longUnit, shortUnit) {
+        $scope.relative.count = 0;
+        $scope.relative.unit = shortUnit;
+        $scope.formatRelative();
+
+        // The preview should match the start of the unit eg, the start of the minute
+        expect($scope.relative.preview).to.be(moment().startOf(longUnit).format($scope.format));
+      });
+
+      done();
+    });
+
+    it('does not round the preview down to the unit when rounding is disable', function (done) {
+      // Disable rounding
+      $scope.relative.round = false;
+      $scope.relative.count = 0;
+
+      _.each($scope.units, function (longUnit, shortUnit) {
+        $scope.relative.unit = shortUnit;
+        $scope.formatRelative();
+
+        // The preview should match the start of the unit eg, the start of the minute
+        expect($scope.relative.preview).to.be(moment().format($scope.format));
+      });
+
+      done();
+    });
+
+    it('has a $scope.applyRelative() that sets from and to based on relative.round, relative.count and relative.unit', function (done) {
+      // Disable rounding
+      $scope.relative.round = false;
+      $scope.relative.count = 1;
+      $scope.relative.unit = 's';
+      $scope.applyRelative();
+      expect($scope.from).to.be('now-1s');
+
+      $scope.relative.count = 2;
+      $scope.relative.unit = 'm';
+      $scope.applyRelative();
+      expect($scope.from).to.be('now-2m');
+
+      $scope.relative.count = 3;
+      $scope.relative.unit = 'h';
+      $scope.applyRelative();
+      expect($scope.from).to.be('now-3h');
+
+      // Enable rounding
+      $scope.relative.round = true;
+      $scope.relative.count = 7;
+      $scope.relative.unit = 'd';
+      $scope.applyRelative();
+      expect($scope.from).to.be('now-7d/d');
+
+      done();
+    });
+
+    it('updates the input fields when the scope variables are changed', function (done) {
+      var input = $elem.find('.kbn-timepicker-section input[ng-model="relative.count"]');
+      var select = $elem.find('.kbn-timepicker-section select[ng-model="relative.unit"]');
+
+      $scope.relative.count = 5;
+      $scope.$digest();
+      expect(input.val()).to.be('5');
+
+
+      // Should update the selected option
+      var i = 0;
+      _.each($scope.units, function (longUnit, shortUnit) {
+        $scope.relative.unit = shortUnit;
+        $scope.$digest();
+
+        expect(select.val()).to.be(i.toString());
+        i++;
+      });
+
+      done();
+
+    });
+
+  });
+
+  describe('absolute mode', function () {
+
+    var inputs;
+
+    beforeEach(function () {
+      init();
+      $scope.setMode('absolute');
+      $scope.$digest();
+
+      inputs = {
+        fromInput: $elem.find('.kbn-timepicker-section input[ng-model="absolute.from"]'),
+        toInput: $elem.find('.kbn-timepicker-section input[ng-model="absolute.to"]'),
+        fromCalendar: $elem.find('.kbn-timepicker-section table[ng-model="absolute.from"] '),
+        toCalendar: $elem.find('.kbn-timepicker-section table[ng-model="absolute.to"] '),
+      };
+
+    });
+
+    it('should have input boxes for absolute.from and absolute.to', function (done) {
+      expect(inputs.fromInput.length).to.be(1);
+      expect(inputs.toInput.length).to.be(1);
+      done();
+    });
+
+    it('should have tables that contain calendars bound to absolute.from and absolute.to', function (done) {
+      expect(inputs.fromCalendar.length).to.be(1);
+      expect(inputs.toCalendar.length).to.be(1);
+      done();
+    });
+
+    it('should present a timeframe of 15 minutes ago to now if scope.from and scope.to are not set', function (done) {
+      delete $scope.from;
+      delete $scope.to;
+      $scope.setMode('absolute');
+      $scope.$digest();
+
+      expect($scope.absolute.from.valueOf()).to.be(moment().subtract(15, 'minutes').valueOf());
+      expect($scope.absolute.to.valueOf()).to.be(moment().valueOf());
+      done();
+    });
+
+
+    it('should parse the time of scope.from and scope.to to set its own variables', function (done) {
+      $scope.setQuick('now-30m', 'now');
+      $scope.setMode('absolute');
+      $scope.$digest();
+
+      expect($scope.absolute.from.valueOf()).to.be(moment().subtract(30, 'minutes').valueOf());
+      expect($scope.absolute.to.valueOf()).to.be(moment().valueOf());
+      done();
+    });
+
+    it('should disable the "Go" button if from > to', function (done) {
+      $scope.absolute.from = moment('2012-02-01');
+      $scope.absolute.to = moment('2012-02-11');
+      $scope.$digest();
+      expect($elem.find('.kbn-timepicker-section button.kbn-timepicker-go').attr('disabled')).to.be(undefined);
+
+      $scope.absolute.from = moment('2012-02-12');
+      $scope.absolute.to = moment('2012-02-11');
+      $scope.$digest();
+      expect($elem.find('.kbn-timepicker-section button.kbn-timepicker-go').attr('disabled')).to.be('disabled');
+      done();
+    });
+
+    it('should only copy its input to scope.from and scope.to when scope.applyAbsolute() is called', function (done) {
+      $scope.setQuick('now-30m', 'now');
+      expect($scope.from).to.be('now-30m');
+      expect($scope.to).to.be('now');
+
+      $scope.absolute.from = moment('2012-02-01');
+      $scope.absolute.to = moment('2012-02-11');
+      expect($scope.from).to.be('now-30m');
+      expect($scope.to).to.be('now');
+
+      $scope.applyAbsolute();
+      expect($scope.from.valueOf()).to.be(moment('2012-02-01').valueOf());
+      expect($scope.to.valueOf()).to.be(moment('2012-02-11').valueOf());
+
+      $scope.$digest();
+
+      done();
+    });
+
+  });
+
+});
diff --git a/src/ui/public/directives/__tests__/truncate.js b/src/ui/public/directives/__tests__/truncate.js
new file mode 100644
index 0000000000000..ba275afddee40
--- /dev/null
+++ b/src/ui/public/directives/__tests__/truncate.js
@@ -0,0 +1,89 @@
+var angular = require('angular');
+var $ = require('jquery');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+require('plugins/kibana/discover/index');
+
+var $parentScope, $scope, $elem;
+
+var init = function (text) {
+  // Load the application
+  ngMock.module('kibana');
+
+  // Create the scope
+  ngMock.inject(function ($rootScope, $compile) {
+
+    // Give us a scope
+    $parentScope = $rootScope;
+
+    // Create the element
+    $elem = angular.element(
+      '<kbn-truncated orig="' + text + '" length="10"></kbn-timepicker>'
+    );
+
+    // And compile it
+    $compile($elem)($parentScope);
+
+    // Fire a digest cycle
+    $elem.scope().$digest();
+
+    // Grab the isolate scope so we can test it
+    $scope = $elem.isolateScope();
+  });
+};
+
+
+describe('kbnTruncate directive', function () {
+
+  describe('long strings', function () {
+
+    beforeEach(function () {
+      init('some string of text over 10 characters');
+    });
+
+    it('should trim long strings', function (done) {
+      expect($elem.text()).to.be('some strin... more');
+      done();
+    });
+
+    it('should have a link to see more text', function (done) {
+      expect($elem.find('[ng-click="toggle()"]').text()).to.be('more');
+      done();
+    });
+
+    it('should should more text if the link is clicked and less text if clicked again', function (done) {
+      $scope.toggle();
+      $scope.$digest();
+      expect($elem.text()).to.be('some string of text over 10 characters less');
+      expect($elem.find('[ng-click="toggle()"]').text()).to.be('less');
+
+      $scope.toggle();
+      $scope.$digest();
+      expect($elem.text()).to.be('some strin... more');
+      expect($elem.find('[ng-click="toggle()"]').text()).to.be('more');
+
+      done();
+    });
+
+  });
+
+  describe('short strings', function () {
+
+    beforeEach(function () {
+      init('short');
+    });
+
+    it('should not trim short strings', function (done) {
+      expect($elem.text()).to.be('short');
+      done();
+    });
+
+    it('should not have a link', function (done) {
+      expect($elem.find('[ng-click="toggle()"]').length).to.be(0);
+      done();
+    });
+
+  });
+
+});
diff --git a/src/ui/public/directives/__tests__/typeahead.js b/src/ui/public/directives/__tests__/typeahead.js
new file mode 100644
index 0000000000000..721c0203a0316
--- /dev/null
+++ b/src/ui/public/directives/__tests__/typeahead.js
@@ -0,0 +1,213 @@
+
+var angular = require('angular');
+var sinon = require('sinon');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+require('ui/typeahead');
+
+// TODO: This should not be needed, timefilter is only included here, it should move
+require('plugins/kibana/discover/index');
+
+var typeaheadHistoryCount = 10;
+var typeaheadName = 'unittest';
+var $parentScope;
+var $typeaheadScope, $elem;
+var $typeaheadInputScope;
+var typeaheadCtrl, PersistedLog;
+
+var markup = '<div class="typeahead" kbn-typeahead="' + typeaheadName + '">' +
+  '<input type="text" placeholder="Filter..." class="form-control" ng-model="query" kbn-typeahead-input>' +
+  '<kbn-typeahead-items></kbn-typeahead-items>' +
+  '</div>';
+var typeaheadItems = ['abc', 'def', 'ghi'];
+
+var init = function () {
+  // Load the application
+  ngMock.module('kibana');
+
+  ngMock.module('kibana/typeahead', function ($provide) {
+    $provide.factory('PersistedLog', function () {
+      function PersistedLogMock(name, options) {
+        this.name = name;
+        this.options = options;
+      }
+
+      PersistedLogMock.prototype.add = sinon.stub();
+      PersistedLogMock.prototype.get = sinon.stub().returns(typeaheadItems);
+
+      return PersistedLogMock;
+    });
+
+    $provide.service('config', function () {
+      this.get = sinon.stub().returns(typeaheadHistoryCount);
+    });
+  });
+
+
+  // Create the scope
+  ngMock.inject(function ($injector, $controller, $rootScope, $compile) {
+    // Give us a scope
+    $parentScope = $rootScope;
+
+    $elem = angular.element(markup);
+
+    PersistedLog = $injector.get('PersistedLog');
+
+    $compile($elem)($parentScope);
+    $elem.scope().$digest();
+    $typeaheadScope = $elem.isolateScope();
+    typeaheadCtrl = $elem.controller('kbnTypeahead');
+  });
+};
+
+describe('typeahead directive', function () {
+  describe('typeahead requirements', function () {
+    describe('missing input', function () {
+      var goodMarkup = markup;
+
+      before(function () {
+        markup = '<div class="typeahead" kbn-typeahead="' + typeaheadName + '">' +
+          '<kbn-typeahead-items></kbn-typeahead-items>' +
+          '</div>';
+      });
+
+      after(function () {
+        markup = goodMarkup;
+      });
+
+      it('should throw with message', function () {
+        expect(init).to.throwException(/kbn-typeahead-input must be defined/);
+      });
+    });
+  });
+
+  describe('internal functionality', function () {
+    beforeEach(function () {
+      init();
+    });
+
+    describe('PersistedLog', function () {
+      it('should instantiate PersistedLog', function () {
+        expect(typeaheadCtrl.history.name).to.equal('typeahead:' + typeaheadName);
+        expect(typeaheadCtrl.history.options.maxLength).to.equal(typeaheadHistoryCount);
+        expect(typeaheadCtrl.history.options.filterDuplicates).to.equal(true);
+      });
+
+      it('should read data when directive is instantiated', function () {
+        expect(typeaheadCtrl.history.get.callCount).to.be(1);
+      });
+
+      it('should not save empty entries', function () {
+        var entries = typeaheadItems.slice(0);
+        entries.push('', 'jkl');
+        for (var i = 0; i < entries.length; i++) {
+          $typeaheadScope.inputModel.$setViewValue(entries[i]);
+          typeaheadCtrl.persistEntry();
+        }
+        expect(typeaheadCtrl.history.add.callCount).to.be(4);
+      });
+
+    });
+
+    describe('controller scope', function () {
+      it('should contain the input model', function () {
+        expect($typeaheadScope.inputModel).to.be.an('object');
+        expect($typeaheadScope.inputModel).to.have.keys(['$viewValue', '$modelValue', '$setViewValue']);
+      });
+
+      it('should save data to the scope', function () {
+        // $scope.items is set via history.add, so mock the output
+        typeaheadCtrl.history.add.returns(typeaheadItems);
+
+        // a single call will call history.add, which will respond with the mocked data
+        $typeaheadScope.inputModel.$setViewValue(typeaheadItems[0]);
+        typeaheadCtrl.persistEntry();
+
+        expect($typeaheadScope.items).to.be.an('array');
+        expect($typeaheadScope.items.length).to.be(typeaheadItems.length);
+      });
+
+      it('should order fitlered results', function () {
+        var entries = ['ac/dc', 'anthrax', 'abba', 'phantogram', 'skrillex'];
+        var allEntries = typeaheadItems.concat(entries);
+        var startMatches = allEntries.filter(function (item) {
+          return /^a/.test(item);
+        });
+        typeaheadCtrl.history.add.returns(allEntries);
+
+        for (var i = 0; i < entries.length; i++) {
+          $typeaheadScope.inputModel.$setViewValue(entries[i]);
+          typeaheadCtrl.persistEntry();
+        }
+
+        typeaheadCtrl.filterItemsByQuery('a');
+
+        expect($typeaheadScope.filteredItems).to.contain('phantogram');
+        var nonStarterIndex = $typeaheadScope.filteredItems.indexOf('phantogram');
+
+        startMatches.forEach(function (item) {
+          expect($typeaheadScope.filteredItems).to.contain(item);
+          expect($typeaheadScope.filteredItems.indexOf(item)).to.be.below(nonStarterIndex);
+        });
+
+        expect($typeaheadScope.filteredItems).not.to.contain('skrillex');
+      });
+    });
+
+    describe('list appearance', function () {
+      beforeEach(function () {
+        typeaheadCtrl.history.add.returns(typeaheadItems);
+        $typeaheadScope.inputModel.$setViewValue(typeaheadItems[0]);
+        typeaheadCtrl.persistEntry();
+
+        // make sure the data looks how we expect
+        expect($typeaheadScope.items.length).to.be(3);
+      });
+
+      it('should default to hidden', function () {
+        expect(typeaheadCtrl.isVisible()).to.be(false);
+      });
+
+      it('should appear when not hidden, has matches input and focused', function () {
+        typeaheadCtrl.setHidden(false);
+        expect(typeaheadCtrl.isVisible()).to.be(false);
+
+        typeaheadCtrl.filterItemsByQuery(typeaheadItems[0]);
+        expect(typeaheadCtrl.isVisible()).to.be(false);
+
+        // only visible when all conditions match
+        typeaheadCtrl.setFocused(true);
+        expect(typeaheadCtrl.isVisible()).to.be(true);
+
+        typeaheadCtrl.setFocused(false);
+        expect(typeaheadCtrl.isVisible()).to.be(false);
+      });
+
+      it('should appear when not hidden, has matches input and moused over', function () {
+        typeaheadCtrl.setHidden(false);
+        expect(typeaheadCtrl.isVisible()).to.be(false);
+
+        typeaheadCtrl.filterItemsByQuery(typeaheadItems[0]);
+        expect(typeaheadCtrl.isVisible()).to.be(false);
+
+        // only visible when all conditions match
+        typeaheadCtrl.setMouseover(true);
+        expect(typeaheadCtrl.isVisible()).to.be(true);
+
+        typeaheadCtrl.setMouseover(false);
+        expect(typeaheadCtrl.isVisible()).to.be(false);
+      });
+
+      it('should hide when no matches', function () {
+        typeaheadCtrl.setHidden(false);
+        typeaheadCtrl.setFocused(true);
+
+        typeaheadCtrl.filterItemsByQuery(typeaheadItems[0]);
+        expect(typeaheadCtrl.isVisible()).to.be(true);
+
+        typeaheadCtrl.filterItemsByQuery('a8h4o8ah48thal4i7rlia4ujru4glia47gf');
+        expect(typeaheadCtrl.isVisible()).to.be(false);
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/directives/__tests__/validate_cidr_mask.js b/src/ui/public/directives/__tests__/validate_cidr_mask.js
new file mode 100644
index 0000000000000..e870d642dd9c2
--- /dev/null
+++ b/src/ui/public/directives/__tests__/validate_cidr_mask.js
@@ -0,0 +1,86 @@
+
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+require('ui/directives/validate_cidr_mask');
+
+describe('Validate CIDR mask directive', function () {
+  var $compile, $rootScope;
+  var html = '<input type="text" ng-model="value" validate-cidr-mask />';
+
+  beforeEach(ngMock.module('kibana'));
+
+  beforeEach(ngMock.inject(function (_$compile_, _$rootScope_) {
+    $compile = _$compile_;
+    $rootScope = _$rootScope_;
+  }));
+
+  it('should allow empty input', function () {
+    var element = $compile(html)($rootScope);
+
+    $rootScope.value = '';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+
+    $rootScope.value = null;
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+
+    $rootScope.value = undefined;
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+  });
+
+  it('should allow valid CIDR masks', function () {
+    var element = $compile(html)($rootScope);
+
+    $rootScope.value = '0.0.0.0/1';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+
+    $rootScope.value = '128.0.0.1/31';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+
+    $rootScope.value = '1.2.3.4/2';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+
+    $rootScope.value = '67.129.65.201/27';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+  });
+
+  it('should disallow invalid CIDR masks', function () {
+    var element = $compile(html)($rootScope);
+
+    $rootScope.value = 'hello, world';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-invalid')).to.be.ok();
+
+    $rootScope.value = '0.0.0.0';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-invalid')).to.be.ok();
+
+    $rootScope.value = '0.0.0.0/0';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-invalid')).to.be.ok();
+
+    $rootScope.value = '0.0.0.0/33';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-invalid')).to.be.ok();
+
+    $rootScope.value = '256.0.0.0/32';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-invalid')).to.be.ok();
+
+    $rootScope.value = '0.0.0.0/32/32';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-invalid')).to.be.ok();
+
+    $rootScope.value = '1.2.3/1';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-invalid')).to.be.ok();
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/directives/__tests__/validate_date_math.js b/src/ui/public/directives/__tests__/validate_date_math.js
new file mode 100644
index 0000000000000..39a456af1fd53
--- /dev/null
+++ b/src/ui/public/directives/__tests__/validate_date_math.js
@@ -0,0 +1,70 @@
+
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+require('ui/directives/validate_date_math');
+
+describe('Validate date math directive', function () {
+  var $compile, $rootScope;
+  var html = '<input type="text" ng-model="value" validate-date-math />';
+
+  beforeEach(ngMock.module('kibana'));
+
+  beforeEach(ngMock.inject(function (_$compile_, _$rootScope_) {
+    $compile = _$compile_;
+    $rootScope = _$rootScope_;
+  }));
+
+  it('should allow valid date math', function () {
+    var element = $compile(html)($rootScope);
+
+    $rootScope.value = 'now';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+
+    $rootScope.value = '2012-02-28';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+
+    $rootScope.value = 'now-3d';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+
+    $rootScope.value = 'now-3M/M';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+
+    $rootScope.value = '2012-05-31||-3M/M';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+  });
+
+  it('should disallow invalid date math', function () {
+    var element = $compile(html)($rootScope);
+
+    $rootScope.value = 'hello, world';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-invalid')).to.be.ok();
+
+    $rootScope.value = 'now+-5w';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-invalid')).to.be.ok();
+
+    $rootScope.value = '2012-02-31';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-invalid')).to.be.ok();
+
+    $rootScope.value = '5/5/2005+3d';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-invalid')).to.be.ok();
+  });
+
+  it('should allow empty values', function () {
+    var element = $compile(html)($rootScope);
+
+    $rootScope.value = '';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/directives/__tests__/validate_index_name.js b/src/ui/public/directives/__tests__/validate_index_name.js
new file mode 100644
index 0000000000000..7f1aed66b5991
--- /dev/null
+++ b/src/ui/public/directives/__tests__/validate_index_name.js
@@ -0,0 +1,69 @@
+
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+// Load the kibana app dependencies.
+require('ui/directives/validate_index_name');
+
+describe('Validate index name directive', function () {
+  var $compile, $rootScope;
+  var html = '<input type="text" ng-model="indexName" validate-index-name />';
+
+  beforeEach(ngMock.module('kibana'));
+
+  beforeEach(ngMock.inject(function (_$compile_, _$rootScope_) {
+    $compile = _$compile_;
+    $rootScope = _$rootScope_;
+  }));
+
+  function checkPattern(input) {
+    $rootScope.indexName = input;
+    var element = $compile(html)($rootScope);
+    $rootScope.$digest();
+    return element;
+  }
+
+  var badPatterns = [
+    null,
+    undefined,
+    '',
+    '.',
+    '..',
+    'foo\\bar',
+    'foo/bar',
+    'foo?bar',
+    'foo"bar',
+    'foo<bar',
+    'foo>bar',
+    'foo|bar',
+    'foo bar',
+    'foo,bar',
+  ];
+
+  var goodPatterns = [
+    '...',
+    'foo',
+    'foo.bar',
+    'foo*',
+    'foo.bar*',
+    'foo.*',
+    '[foo-]YYYY-MM-DD',
+  ];
+
+  badPatterns.forEach(function (pattern) {
+    it('should not accept index pattern: ' + pattern, function () {
+      var element = checkPattern(pattern);
+      expect(element.hasClass('ng-invalid')).to.be(true);
+      expect(element.hasClass('ng-valid')).to.not.be(true);
+    });
+  });
+
+  goodPatterns.forEach(function (pattern) {
+    it('should accept index pattern: ' + pattern, function () {
+      var element = checkPattern(pattern);
+      expect(element.hasClass('ng-invalid')).to.not.be(true);
+      expect(element.hasClass('ng-valid')).to.be(true);
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/directives/__tests__/validate_ip.js b/src/ui/public/directives/__tests__/validate_ip.js
new file mode 100644
index 0000000000000..13f9804492602
--- /dev/null
+++ b/src/ui/public/directives/__tests__/validate_ip.js
@@ -0,0 +1,78 @@
+
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+require('ui/directives/validate_ip');
+
+describe('Validate IP directive', function () {
+  var $compile, $rootScope;
+  var html = '<input type="text" ng-model="value" validate-ip />';
+
+  beforeEach(ngMock.module('kibana'));
+
+  beforeEach(ngMock.inject(function (_$compile_, _$rootScope_) {
+    $compile = _$compile_;
+    $rootScope = _$rootScope_;
+  }));
+
+  it('should allow empty input', function () {
+    var element = $compile(html)($rootScope);
+
+    $rootScope.value = '';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+
+    $rootScope.value = null;
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+
+    $rootScope.value = undefined;
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+  });
+
+  it('should allow valid IP addresses', function () {
+    var element = $compile(html)($rootScope);
+
+    $rootScope.value = '0.0.0.0';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+
+    $rootScope.value = '0.0.0.1';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+
+    $rootScope.value = '126.45.211.34';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+
+    $rootScope.value = '255.255.255.255';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-valid')).to.be.ok();
+  });
+
+  it('should disallow invalid IP addresses', function () {
+    var element = $compile(html)($rootScope);
+
+    $rootScope.value = 'hello, world';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-invalid')).to.be.ok();
+
+    $rootScope.value = '0.0.0';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-invalid')).to.be.ok();
+
+    $rootScope.value = '256.0.0.0';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-invalid')).to.be.ok();
+
+    $rootScope.value = '-1.0.0.0';
+    $rootScope.$digest();
+    expect(element.hasClass('ng-invalid')).to.be.ok();
+
+    $rootScope.value = Number.MAX_VALUE;
+    $rootScope.$digest();
+    expect(element.hasClass('ng-invalid')).to.be.ok();
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/directives/__tests__/validate_json.js b/src/ui/public/directives/__tests__/validate_json.js
new file mode 100644
index 0000000000000..16e5358952029
--- /dev/null
+++ b/src/ui/public/directives/__tests__/validate_json.js
@@ -0,0 +1,89 @@
+
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+// Load the kibana app dependencies.
+require('ui/directives/validate_json');
+
+var $parentScope;
+var $elemScope;
+var $elem;
+var mockScope = '';
+
+var input = {
+  valid: '{ "test": "json input" }',
+  invalid: 'strings are not json'
+};
+
+var markup = {
+  textarea: '<textarea ng-model="mockModel" validate-json></textarea>',
+  input: '<input type="text" ng-model="mockModel" validate-json>'
+};
+
+var init = function (type) {
+  // Load the application
+  ngMock.module('kibana');
+  type = type || 'input';
+  var elMarkup = markup[type];
+
+  // Create the scope
+  ngMock.inject(function ($injector, $rootScope, $compile) {
+    // Give us a scope
+    $parentScope = $rootScope;
+    $parentScope.mockModel = mockScope;
+
+    $elem = angular.element(elMarkup);
+    $compile($elem)($parentScope);
+    $elemScope = $elem.isolateScope();
+  });
+};
+
+describe('validate-json directive', function () {
+  var checkValid = function (input, className) {
+    $parentScope.mockModel = input;
+    $elem.scope().$digest();
+    expect($elem.hasClass(className)).to.be(true);
+  };
+
+  describe('initialization', function () {
+    beforeEach(function () {
+      init();
+    });
+
+    it('should use the model', function () {
+      expect($elemScope).to.have.property('ngModel');
+    });
+
+  });
+
+  Object.keys(markup).forEach(function (inputType) {
+    describe(inputType, function () {
+      beforeEach(function () {
+        init(inputType);
+      });
+
+      it('should be an input', function () {
+        expect($elem.get(0).tagName).to.be(inputType.toUpperCase());
+      });
+
+      it('should set valid state', function () {
+        checkValid(input.valid, 'ng-valid');
+      });
+
+      it('should be valid when empty', function () {
+        checkValid('', 'ng-valid');
+      });
+
+      it('should set invalid state', function () {
+        checkValid(input.invalid, 'ng-invalid');
+      });
+
+      it('should update validity on changes', function () {
+        checkValid(input.valid, 'ng-valid');
+        checkValid(input.invalid, 'ng-invalid');
+        checkValid(input.valid, 'ng-valid');
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/directives/__tests__/validate_query.js b/src/ui/public/directives/__tests__/validate_query.js
new file mode 100644
index 0000000000000..2ba00321d40b1
--- /dev/null
+++ b/src/ui/public/directives/__tests__/validate_query.js
@@ -0,0 +1,241 @@
+
+var angular = require('angular');
+var sinon = require('auto-release-sinon');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+// Load the kibana app dependencies.
+require('ui/validate_query');
+
+var $rootScope;
+var $timeout;
+var $compile;
+var Promise;
+var Private;
+var config;
+var debounceDelay = 300;
+var $elemScope;
+var $elem;
+
+var cycleIndex = 0;
+var mockValidateQuery;
+var markup = '<input ng-model="mockModel" validate-query="mockQueryInput" input-focus type="text">';
+var fromUser;
+var toUser = require('ui/validate_query/lib/to_user');
+
+
+var validEsResponse = function () {
+  return Promise.resolve({ valid: true });
+};
+
+var invalidEsResponse = function () {
+  return Promise.reject({ body: { error: 'mock invalid query' } });
+};
+
+var checkClass = function (className) {
+  expect($elem.hasClass(className)).to.be(true);
+};
+
+var init = function () {
+  // Load the application
+  ngMock.module('kibana');
+
+  ngMock.module('kibana', function ($provide) {
+    $provide.service('es', function () {
+      return { indices: { validateQuery: function () {} } };
+    });
+
+    // Super simple config stub
+    $provide.service('config', function () {
+      var keys = {};
+      return {
+        get: function (key) { return keys[key]; },
+        set: function (key, value) { keys[key] = value; }
+      };
+    });
+
+    $provide.constant('kbnIndex', 'test-index');
+  });
+
+  // Create the scope
+  ngMock.inject(function ($injector, _$rootScope_, _$compile_, _$timeout_, _Promise_, _Private_, _config_) {
+    $timeout = _$timeout_;
+    $compile = _$compile_;
+    Promise = _Promise_;
+    Private = _Private_;
+    config = _config_;
+
+    // Give us a scope
+    $rootScope = _$rootScope_;
+
+    var es = $injector.get('es');
+    mockValidateQuery = sinon.stub(es.indices, 'validateQuery');
+  });
+};
+
+var compile = function () {
+  $rootScope.mockModel = 'cycle' + cycleIndex++;
+  $rootScope.mockQueryInput = undefined;
+
+  $elem = angular.element(markup);
+  $compile($elem)($rootScope);
+  $elemScope = $elem.isolateScope();
+  $rootScope.$digest();
+};
+
+describe('validate-query directive', function () {
+  describe('initialization', function () {
+    beforeEach(function () {
+      init();
+      mockValidateQuery.returns(validEsResponse());
+      compile();
+    });
+
+    it('should use the model', function () {
+      expect($elemScope).to.have.property('ngModel');
+    });
+
+    it('should call validate with changes', function () {
+      // once for init
+      expect(mockValidateQuery.callCount).to.be(1);
+
+      $rootScope.mockModel = 'different input';
+      $rootScope.$digest();
+      // once on change (leading edge)
+      expect(mockValidateQuery.callCount).to.be(2);
+      $timeout.flush();
+      // once on change (trailing edge)
+      expect(mockValidateQuery.callCount).to.be(3);
+    });
+  });
+
+  describe('valid querystring', function () {
+    var mockValidateReturns;
+
+    beforeEach(function () {
+      init();
+      mockValidateQuery.returns(validEsResponse());
+      compile();
+    });
+
+    it('should set valid state', function () {
+      // give angular time to set up the directive
+      checkClass('ng-valid-query-input');
+      checkClass('ng-valid');
+    });
+  });
+
+  describe('invalid querystring', function () {
+    var mockValidateReturns;
+
+    beforeEach(function () {
+      init();
+      mockValidateQuery.returns(invalidEsResponse());
+      compile();
+    });
+
+    it('should set invalid state', function () {
+      checkClass('ng-invalid');
+    });
+  });
+
+  describe('changing input', function () {
+    it('should change validity based on response', function () {
+      init();
+      mockValidateQuery.onCall(0).returns(validEsResponse());
+      compile();
+      $rootScope.$digest();
+      checkClass('ng-valid');
+
+      // leading and trailing edges
+      mockValidateQuery.onCall(1).returns(invalidEsResponse());
+      mockValidateQuery.onCall(2).returns(invalidEsResponse());
+      $rootScope.mockModel = 'invalid:';
+      // trigger model change, which fires watcher
+      $rootScope.$digest();
+      // leading edge
+      $timeout.flush(); // trailing edge
+      checkClass('ng-invalid');
+
+      // leading and trailing edges
+      mockValidateQuery.onCall(3).returns(validEsResponse());
+      mockValidateQuery.onCall(4).returns(validEsResponse());
+      $rootScope.mockModel = 'valid';
+      // trigger model change, which fires watcher
+      $rootScope.$digest();
+      // leading edge
+      $timeout.flush(); // trailing edge
+      checkClass('ng-valid');
+    });
+  });
+
+  describe('user input parser', function () {
+
+    beforeEach(function () {
+      fromUser = Private(require('ui/validate_query/lib/from_user'));
+      config.set('query:queryString:options', {});
+    });
+
+    it('should return the input if passed an object', function () {
+      expect(fromUser({foo: 'bar'})).to.eql({foo: 'bar'});
+    });
+
+    it('unless the object is empty, that implies a *', function () {
+      expect(fromUser({})).to.eql({query_string: {query: '*'}});
+    });
+
+    it('should treat an empty string as a *', function () {
+      expect(fromUser('')).to.eql({query_string: {query: '*'}});
+    });
+
+    it('should merge in the query string options', function () {
+      config.set('query:queryString:options', {analyze_wildcard: true});
+      expect(fromUser('foo')).to.eql({query_string: {query: 'foo', analyze_wildcard: true}});
+      expect(fromUser('')).to.eql({query_string: {query: '*', analyze_wildcard: true}});
+    });
+
+
+    it('should treat input that does not start with { as a query string', function () {
+      expect(fromUser('foo')).to.eql({query_string: {query: 'foo'}});
+      expect(fromUser('400')).to.eql({query_string: {query: '400'}});
+      expect(fromUser('true')).to.eql({query_string: {query: 'true'}});
+    });
+
+    it('should parse valid JSON', function () {
+      expect(fromUser('{}')).to.eql({});
+      expect(fromUser('{a:b}')).to.eql({query_string: {query: '{a:b}'}});
+    });
+  });
+
+  describe('model presentation formatter', function () {
+    it('should present undefined as empty string', function () {
+      var notDefined;
+      expect(toUser(notDefined)).to.be('');
+    });
+
+    it('should present null as empty string', function () {
+      expect(toUser(null)).to.be('');
+    });
+
+    it('should present objects as strings', function () {
+      expect(toUser({foo: 'bar'})).to.be('{"foo":"bar"}');
+    });
+
+    it('should present query_string queries as strings', function () {
+      expect(toUser({ query_string: { query: 'lucene query string' } })).to.be('lucene query string');
+    });
+
+    it('should present query_string queries without a query as an empty string', function () {
+      expect(toUser({ query_string: {} })).to.be('');
+    });
+
+    it('should present string as strings', function () {
+      expect(toUser('foo')).to.be('foo');
+    });
+
+    it('should present numbers as strings', function () {
+      expect(toUser(400)).to.be('400');
+    });
+  });
+
+});
\ No newline at end of file
diff --git a/src/ui/public/directives/auto_select_if_only_one.js b/src/ui/public/directives/auto_select_if_only_one.js
new file mode 100644
index 0000000000000..6bf640ae3c0ba
--- /dev/null
+++ b/src/ui/public/directives/auto_select_if_only_one.js
@@ -0,0 +1,19 @@
+define(function (require) {
+  var module = require('ui/modules').get('kibana');
+
+  module.directive('autoSelectIfOnlyOne', function ($parse) {
+    return {
+      restrict: 'A',
+      require: 'ngModel',
+      link: function (scope, element, attributes, ngModelCtrl) {
+        attributes.$observe('autoSelectIfOnlyOne', function (result) {
+          var options = $parse(result)(scope);
+          if (options && options.length === 1) {
+            ngModelCtrl.$setViewValue(options[0]);
+            ngModelCtrl.$render();
+          }
+        });
+      }
+    };
+  });
+});
\ No newline at end of file
diff --git a/src/kibana/directives/click_focus.js b/src/ui/public/directives/click_focus.js
similarity index 91%
rename from src/kibana/directives/click_focus.js
rename to src/ui/public/directives/click_focus.js
index 35cdec4f1c26a..71d897f659c71 100644
--- a/src/kibana/directives/click_focus.js
+++ b/src/ui/public/directives/click_focus.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
   var _ = require('lodash');
   var $ = require('jquery');
 
diff --git a/src/ui/public/directives/config.js b/src/ui/public/directives/config.js
new file mode 100644
index 0000000000000..edbf1f13ed5b5
--- /dev/null
+++ b/src/ui/public/directives/config.js
@@ -0,0 +1,82 @@
+define(function (require) {
+  var _ = require('lodash');
+  var ConfigTemplate = require('ui/ConfigTemplate');
+  var angular = require('angular');
+  var module = require('ui/modules').get('kibana');
+
+  require('ui/directives/input_focus');
+
+  /**
+   * config directive
+   *
+   * Creates a full width horizonal config section, usually under a nav/subnav.
+   * ```
+   * <config config-template="configTemplate" config-object="configurable"></config>
+   * ```
+   */
+
+  module.directive('config', function ($compile) {
+    return {
+      restrict: 'E',
+      scope: {
+        configTemplate: '=',
+        configClose: '=',
+        configSubmit: '=',
+        configObject: '='
+      },
+      link: function ($scope, element, attr) {
+        var tmpScope = $scope.$new();
+
+        $scope.$watch('configObject', function (newVal) {
+          $scope[attr.configObject] = $scope.configObject;
+        });
+
+        var wrapTmpl = function (tmpl) {
+          if ($scope.configSubmit) {
+            return '<form role="form" class="container-fluid" ng-submit="configSubmit()">' + tmpl + '</form>';
+          } else {
+            return '<div class="container-fluid">' + tmpl + '</div>';
+          }
+        };
+
+        var render = function (newTemplate, oldTemplate) {
+          var tmpl = $scope.configTemplate;
+          if (tmpl instanceof ConfigTemplate) {
+            tmpl = tmpl.toString();
+          }
+
+          tmpScope.$destroy();
+          tmpScope = $scope.$new();
+
+          var html = '';
+          if (tmpl) {
+            html = $compile('' +
+              '<div class="config" ng-show="configTemplate">' +
+                wrapTmpl(tmpl) +
+              '  <div class="config-close remove" ng-click="close()">' +
+              '    <i class="fa fa-chevron-up"></i>' +
+              '  </div>' +
+              '</div>' +
+              ''
+            )(tmpScope);
+          }
+
+          element.html(html);
+        };
+
+        $scope.$watch('configSubmit', render);
+        $scope.$watch('configTemplate.current || configTemplate', render);
+
+
+        $scope.close = function () {
+          if (_.isFunction($scope.configClose)) $scope.configClose();
+          if ($scope.configTemplate instanceof ConfigTemplate) {
+            $scope.configTemplate.current = null;
+          } else {
+            $scope.configTemplate = null;
+          }
+        };
+      }
+    };
+  });
+});
diff --git a/src/kibana/directives/confirm_click.js b/src/ui/public/directives/confirm_click.js
similarity index 96%
rename from src/kibana/directives/confirm_click.js
rename to src/ui/public/directives/confirm_click.js
index 545935b593ae5..61612a9869f50 100644
--- a/src/kibana/directives/confirm_click.js
+++ b/src/ui/public/directives/confirm_click.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  require('modules')
+  require('ui/modules')
     .get('kibana')
     .directive('confirmClick', function () {
       return {
diff --git a/src/ui/public/directives/css_truncate.js b/src/ui/public/directives/css_truncate.js
new file mode 100644
index 0000000000000..645b134a6c3e4
--- /dev/null
+++ b/src/ui/public/directives/css_truncate.js
@@ -0,0 +1,48 @@
+define(function (require) {
+  var module = require('ui/modules').get('kibana');
+  var $ = require('jquery');
+  var _ = require('lodash');
+
+  module.directive('cssTruncate', function ($timeout) {
+    return {
+      restrict: 'A',
+      scope: {},
+      link: function ($scope, $elem, attrs) {
+
+        $elem.css({
+          overflow: 'hidden',
+          'white-space': 'nowrap',
+          'text-overflow': 'ellipsis',
+          'word-break': 'break-all',
+        });
+
+        if (attrs.cssTruncateExpandable != null) {
+          $scope.$watch(
+            function () { return $elem.html(); },
+            function () {
+              if ($elem[0].offsetWidth < $elem[0].scrollWidth) {
+                $elem.css({'cursor': 'pointer'});
+                $elem.bind('click', function () {
+                  $scope.toggle();
+                });
+              }
+            }
+          );
+        }
+
+        $scope.toggle = function () {
+          if ($elem.css('white-space') !== 'normal') {
+            $elem.css({'white-space': 'normal'});
+          } else {
+            $elem.css({'white-space': 'nowrap'});
+          }
+        };
+
+        $scope.$on('$destroy', function () {
+          $elem.unbind('click');
+          $elem.unbind('mouseenter');
+        });
+      }
+    };
+  });
+});
\ No newline at end of file
diff --git a/src/kibana/directives/field_name.js b/src/ui/public/directives/field_name.js
similarity index 95%
rename from src/kibana/directives/field_name.js
rename to src/ui/public/directives/field_name.js
index 51ef43afe43b5..fe5636f441ff7 100644
--- a/src/kibana/directives/field_name.js
+++ b/src/ui/public/directives/field_name.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
-  require('filters/short_dots');
+  var module = require('ui/modules').get('kibana');
+  require('ui/filters/short_dots');
 
   module.directive('fieldName', function ($compile, $rootScope, $filter) {
     return {
diff --git a/src/kibana/directives/file_upload.js b/src/ui/public/directives/file_upload.js
similarity index 94%
rename from src/kibana/directives/file_upload.js
rename to src/ui/public/directives/file_upload.js
index 4c281fb2c35e5..c9cb4a9f669bc 100644
--- a/src/kibana/directives/file_upload.js
+++ b/src/ui/public/directives/file_upload.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
   var $ = require('jquery');
 
   module.directive('fileUpload', function ($parse) {
diff --git a/src/ui/public/directives/inequality.js b/src/ui/public/directives/inequality.js
new file mode 100644
index 0000000000000..68e83ed378d05
--- /dev/null
+++ b/src/ui/public/directives/inequality.js
@@ -0,0 +1,40 @@
+define(function (require) {
+
+  function makeDirectiveDef(id, compare) {
+    return function ($parse) {
+      return {
+        require: 'ngModel',
+        link: function ($scope, $el, $attr, ngModel) {
+          var getBound = function () { return $parse($attr[id])(); };
+          var defaultVal = {
+            'greaterThan': -Infinity,
+            'lessThan': Infinity
+          }[id];
+
+          ngModel.$parsers.push(validate);
+          ngModel.$formatters.push(validate);
+
+          $scope.$watch(getBound, function () {
+            validate(ngModel.$viewValue);
+          });
+
+          function validate(val) {
+            var bound = !isNaN(getBound()) ? +getBound() : defaultVal;
+            var valid = !isNaN(bound) && !isNaN(val) && compare(val, bound);
+            ngModel.$setValidity(id, valid);
+            return val;
+          }
+        }
+      };
+    };
+  }
+
+  require('ui/modules')
+    .get('kibana')
+    .directive('greaterThan', makeDirectiveDef('greaterThan', function (a, b) {
+      return a > b;
+    }))
+    .directive('lessThan', makeDirectiveDef('lessThan', function (a, b) {
+      return a < b;
+    }));
+});
diff --git a/src/kibana/directives/infinite_scroll.js b/src/ui/public/directives/infinite_scroll.js
similarity index 95%
rename from src/kibana/directives/infinite_scroll.js
rename to src/ui/public/directives/infinite_scroll.js
index 91ddf83ea8fbb..f144c8993a5b3 100644
--- a/src/kibana/directives/infinite_scroll.js
+++ b/src/ui/public/directives/infinite_scroll.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
   var $ = require('jquery');
 
   module.directive('kbnInfiniteScroll', function () {
diff --git a/src/kibana/directives/info.js b/src/ui/public/directives/info.js
similarity index 81%
rename from src/kibana/directives/info.js
rename to src/ui/public/directives/info.js
index 36fae2fdfec4e..a9a69f8a1482d 100644
--- a/src/kibana/directives/info.js
+++ b/src/ui/public/directives/info.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var html = require('text!partials/info.html');
+  var html = require('ui/partials/info.html');
 
-  require('modules')
+  require('ui/modules')
     .get('kibana')
     .directive('kbnInfo', function () {
       return {
@@ -16,4 +16,4 @@ define(function (require) {
         }
       };
     });
-});
\ No newline at end of file
+});
diff --git a/src/kibana/directives/input_datetime.js b/src/ui/public/directives/input_datetime.js
similarity index 94%
rename from src/kibana/directives/input_datetime.js
rename to src/ui/public/directives/input_datetime.js
index bd17b0bd96f23..ba89875287b1f 100644
--- a/src/kibana/directives/input_datetime.js
+++ b/src/ui/public/directives/input_datetime.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
   var $ = require('jquery');
   var _ = require('lodash');
   var moment = require('moment');
diff --git a/src/ui/public/directives/input_focus.js b/src/ui/public/directives/input_focus.js
new file mode 100644
index 0000000000000..99cf9dd5d0854
--- /dev/null
+++ b/src/ui/public/directives/input_focus.js
@@ -0,0 +1,15 @@
+define(function (require) {
+  var module = require('ui/modules').get('kibana');
+
+  module.directive('inputFocus', function ($timeout) {
+    return {
+      restrict: 'A',
+      link: function ($scope, $elem, attrs) {
+        $timeout(function () {
+          $elem.focus();
+          if (attrs.inputFocus === 'select') $elem.select();
+        });
+      }
+    };
+  });
+});
diff --git a/src/ui/public/directives/input_whole_number.js b/src/ui/public/directives/input_whole_number.js
new file mode 100644
index 0000000000000..e462bc2cc2ebf
--- /dev/null
+++ b/src/ui/public/directives/input_whole_number.js
@@ -0,0 +1,19 @@
+define(function (require) {
+  var module = require('ui/modules').get('kibana');
+
+  module.directive('inputWholeNumber', function () {
+    return {
+      restrict: 'A',
+      require: 'ngModel',
+      link: function ($scope, $elem, attrs, ngModel) {
+        ngModel.$parsers.push(checkWholeNumber);
+        ngModel.$formatters.push(checkWholeNumber);
+
+        function checkWholeNumber(value) {
+          ngModel.$setValidity('whole', value % 1 === 0);
+          return value;
+        }
+      }
+    };
+  });
+});
\ No newline at end of file
diff --git a/src/kibana/directives/paginate.js b/src/ui/public/directives/paginate.js
similarity index 98%
rename from src/kibana/directives/paginate.js
rename to src/ui/public/directives/paginate.js
index d0a1e8ce2be77..0430a2ad5e03d 100644
--- a/src/kibana/directives/paginate.js
+++ b/src/ui/public/directives/paginate.js
@@ -3,7 +3,7 @@ define(function (require) {
 
   var PER_PAGE_DEFAULT = 10;
 
-  require('modules').get('kibana')
+  require('ui/modules').get('kibana')
   .directive('paginate', function ($parse, $compile) {
     return {
       restrict: 'E',
@@ -190,9 +190,9 @@ define(function (require) {
     // this directive is automatically added by paginate if not found within it's $el
     return {
       restrict: 'E',
-      template: require('text!partials/paginate_controls.html')
+      template: require('ui/partials/paginate_controls.html')
     };
   });
 
 
-});
\ No newline at end of file
+});
diff --git a/src/kibana/directives/pretty_duration.js b/src/ui/public/directives/pretty_duration.js
similarity index 90%
rename from src/kibana/directives/pretty_duration.js
rename to src/ui/public/directives/pretty_duration.js
index 60c321bf89b3d..25bc195a4fa3c 100644
--- a/src/kibana/directives/pretty_duration.js
+++ b/src/ui/public/directives/pretty_duration.js
@@ -1,11 +1,11 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
   var _ = require('lodash');
-  var datemath = require('utils/datemath');
+  var dateMath = require('ui/utils/dateMath');
   var moment = require('moment');
 
-  require('components/timepicker/quick_ranges');
-  require('components/timepicker/time_units');
+  require('ui/timepicker/quick_ranges');
+  require('ui/timepicker/time_units');
 
   module.directive('prettyDuration', function (config, quickRanges, timeUnits) {
     return {
@@ -57,7 +57,7 @@ define(function (require) {
               if ($scope[time] === 'now') {
                 display[time] = 'now';
               } else {
-                var tryParse = datemath.parse($scope[time], time === 'to' ? true : false);
+                var tryParse = dateMath.parse($scope[time], time === 'to' ? true : false);
                 display[time] = moment.isMoment(tryParse) ? '~ ' + tryParse.fromNow() : $scope[time];
               }
             }
@@ -72,4 +72,4 @@ define(function (require) {
     };
   });
 
-});
\ No newline at end of file
+});
diff --git a/src/kibana/directives/rows.js b/src/ui/public/directives/rows.js
similarity index 94%
rename from src/kibana/directives/rows.js
rename to src/ui/public/directives/rows.js
index 098b293b8b012..dc29d33389083 100644
--- a/src/kibana/directives/rows.js
+++ b/src/ui/public/directives/rows.js
@@ -1,11 +1,11 @@
 define(function (require) {
   var $ = require('jquery');
   var _ = require('lodash');
-  var module = require('modules').get('kibana');
-  var AggConfigResult = require('components/vis/AggConfigResult');
+  var module = require('ui/modules').get('kibana');
+  var AggConfigResult = require('ui/Vis/AggConfigResult');
 
   module.directive('kbnRows', function ($compile, $rootScope, getAppState, Private) {
-    var filterBarClickHandler = Private(require('components/filter_bar/filter_bar_click_handler'));
+    var filterBarClickHandler = Private(require('ui/filter_bar/filter_bar_click_handler'));
     return {
       restrict: 'A',
       link: function ($scope, $el, attr) {
diff --git a/src/kibana/directives/saved_object_finder.js b/src/ui/public/directives/saved_object_finder.js
similarity index 97%
rename from src/kibana/directives/saved_object_finder.js
rename to src/ui/public/directives/saved_object_finder.js
index 13815492bc821..21d498f9db44f 100644
--- a/src/kibana/directives/saved_object_finder.js
+++ b/src/ui/public/directives/saved_object_finder.js
@@ -1,8 +1,8 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
   var _ = require('lodash');
-  var rison = require('utils/rison');
-  var keymap = require('utils/key_map');
+  var rison = require('ui/utils/rison');
+  var keymap = require('ui/utils/key_map');
 
   module.directive('savedObjectFinder', function (savedSearches, savedVisualizations, savedDashboards, $location, kbnUrl) {
 
@@ -37,7 +37,7 @@ define(function (require) {
         // optional on-choose attr, sets the userOnChoose in our scope
         userOnChoose: '=?onChoose'
       },
-      template: require('text!partials/saved_object_finder.html'),
+      template: require('ui/partials/saved_object_finder.html'),
       controllerAs: 'finder',
       controller: function ($scope, $element, $timeout) {
         var self = this;
@@ -277,4 +277,4 @@ define(function (require) {
       }
     };
   });
-});
\ No newline at end of file
+});
diff --git a/src/ui/public/directives/spinner.js b/src/ui/public/directives/spinner.js
new file mode 100644
index 0000000000000..b57a900e80590
--- /dev/null
+++ b/src/ui/public/directives/spinner.js
@@ -0,0 +1,12 @@
+define(function (require) {
+  var html = '<div class="bounce1"></div> <div class="bounce2"></div> <div class="bounce3"></div>';
+  var module = require('ui/modules').get('kibana');
+
+  module.directive('spinner', function () {
+    return {
+      restrict: 'C',
+      template: html
+    };
+  });
+
+});
\ No newline at end of file
diff --git a/src/kibana/directives/truncated.js b/src/ui/public/directives/truncated.js
similarity index 95%
rename from src/kibana/directives/truncated.js
rename to src/ui/public/directives/truncated.js
index 280f00d522b37..67e2c9cb3cfba 100644
--- a/src/kibana/directives/truncated.js
+++ b/src/ui/public/directives/truncated.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
   var $ = require('jquery');
 
   module.directive('kbnTruncated', function ($compile) {
diff --git a/src/ui/public/directives/validate_cidr_mask.js b/src/ui/public/directives/validate_cidr_mask.js
new file mode 100644
index 0000000000000..960cc653938fd
--- /dev/null
+++ b/src/ui/public/directives/validate_cidr_mask.js
@@ -0,0 +1,33 @@
+define(function (require) {
+  var _ = require('lodash');
+  var CidrMask = require('ui/utils/CidrMask');
+
+  require('ui/modules').get('kibana').directive('validateCidrMask', function () {
+    return {
+      restrict: 'A',
+      require: 'ngModel',
+      scope: {
+        'ngModel': '='
+      },
+      link: function ($scope, elem, attr, ngModel) {
+        ngModel.$parsers.unshift(validateCidrMask);
+        ngModel.$formatters.unshift(validateCidrMask);
+
+        function validateCidrMask(mask) {
+          if (mask == null || mask === '') {
+            ngModel.$setValidity('cidrMaskInput', true);
+            return null;
+          }
+
+          try {
+            mask = new CidrMask(mask);
+            ngModel.$setValidity('cidrMaskInput', true);
+            return mask.toString();
+          } catch (e) {
+            ngModel.$setValidity('cidrMaskInput', false);
+          }
+        }
+      }
+    };
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/directives/validate_date_math.js b/src/ui/public/directives/validate_date_math.js
new file mode 100644
index 0000000000000..9ab572b59d60b
--- /dev/null
+++ b/src/ui/public/directives/validate_date_math.js
@@ -0,0 +1,29 @@
+define(function (require) {
+  var _ = require('lodash');
+  var dateMath = require('ui/utils/dateMath');
+
+  require('ui/modules').get('kibana').directive('validateDateMath', function () {
+    return {
+      restrict: 'A',
+      require: 'ngModel',
+      scope: {
+        'ngModel': '='
+      },
+      link: function ($scope, elem, attr, ngModel) {
+        ngModel.$parsers.unshift(validateDateMath);
+        ngModel.$formatters.unshift(validateDateMath);
+
+        function validateDateMath(input) {
+          if (input == null || input === '') {
+            ngModel.$setValidity('validDateMath', true);
+            return null;
+          }
+
+          var moment = dateMath.parse(input);
+          ngModel.$setValidity('validDateMath', moment != null && moment.isValid());
+          return input;
+        }
+      }
+    };
+  });
+});
diff --git a/src/ui/public/directives/validate_index_name.js b/src/ui/public/directives/validate_index_name.js
new file mode 100644
index 0000000000000..6f5248a7c4c68
--- /dev/null
+++ b/src/ui/public/directives/validate_index_name.js
@@ -0,0 +1,41 @@
+// See https://github.com/elastic/elasticsearch/issues/6736
+define(function (require) {
+  var _ = require('lodash');
+
+  require('ui/modules')
+    .get('kibana')
+    .directive('validateIndexName', function () {
+      return {
+        restrict: 'A',
+        require: 'ngModel',
+        scope: {
+          'ngModel': '='
+        },
+        link: function ($scope, elem, attr, ngModel) {
+          var illegalCharacters = ['\\', '/', '?', '"', '<', '>', '|', ' ', ','];
+          var isValid = function (input) {
+            if (input == null || input === '' || input === '.' || input === '..') return false;
+
+            var match = _.find(illegalCharacters, function (character) {
+              return input.indexOf(character) >= 0;
+            });
+            return !match;
+          };
+
+          // From User
+          ngModel.$parsers.unshift(function (value) {
+            var valid = isValid(value);
+            ngModel.$setValidity('indexNameInput', valid);
+            return valid ? value : undefined;
+          });
+
+          // To user
+          ngModel.$formatters.unshift(function (value) {
+            ngModel.$setValidity('indexNameInput', isValid(value));
+            return value;
+          });
+
+        }
+      };
+    });
+});
diff --git a/src/ui/public/directives/validate_ip.js b/src/ui/public/directives/validate_ip.js
new file mode 100644
index 0000000000000..6306adaa54ae7
--- /dev/null
+++ b/src/ui/public/directives/validate_ip.js
@@ -0,0 +1,38 @@
+define(function (require) {
+  var _ = require('lodash');
+  var Ipv4Address = require('ui/utils/Ipv4Address');
+
+  require('ui/modules')
+    .get('kibana')
+    .directive('validateIp', function () {
+      return {
+        restrict: 'A',
+        require: 'ngModel',
+        scope: {
+          'ngModel': '=',
+        },
+        link: function ($scope, elem, attr, ngModel) {
+          function validateIp(ipAddress) {
+            if (ipAddress == null || ipAddress === '') {
+              ngModel.$setValidity('ipInput', true);
+              return null;
+            }
+
+            try {
+              ipAddress = new Ipv4Address(ipAddress);
+              ngModel.$setValidity('ipInput', true);
+              return ipAddress.toString();
+            } catch (e) {
+              ngModel.$setValidity('ipInput', false);
+            }
+          }
+
+          // From User
+          ngModel.$parsers.unshift(validateIp);
+
+          // To user
+          ngModel.$formatters.unshift(validateIp);
+        }
+      };
+    });
+});
diff --git a/src/ui/public/directives/validate_json.js b/src/ui/public/directives/validate_json.js
new file mode 100644
index 0000000000000..7c429745e4500
--- /dev/null
+++ b/src/ui/public/directives/validate_json.js
@@ -0,0 +1,48 @@
+define(function (require) {
+  var _ = require('lodash');
+  var $ = require('jquery');
+
+  var module = require('ui/modules').get('kibana');
+
+  module.directive('validateJson', function ($compile) {
+    return {
+      restrict: 'A',
+      require: 'ngModel',
+      scope: {
+        'ngModel': '=',
+        'queryInput': '=?',
+      },
+      link: function ($scope, $elem, attr, ngModel) {
+        $scope.$watch('ngModel', validator);
+
+        function validator(newValue, oldValue) {
+          if (!newValue || newValue.length === 0) {
+            setValid();
+            return;
+          }
+
+          // We actually need a proper object in all JSON inputs
+          newValue = (newValue || '').trim();
+          if (newValue[0] === '{' || '[') {
+            try {
+              JSON.parse(newValue);
+              setValid();
+            } catch (e) {
+              setInvalid();
+            }
+          } else {
+            setInvalid();
+          }
+        }
+
+        function setValid() {
+          ngModel.$setValidity('jsonInput', true);
+        }
+
+        function setInvalid() {
+          ngModel.$setValidity('jsonInput', false);
+        }
+      }
+    };
+  });
+});
diff --git a/src/ui/public/doc_table/__tests__/doc_table.js b/src/ui/public/doc_table/__tests__/doc_table.js
new file mode 100644
index 0000000000000..5786221f85fc5
--- /dev/null
+++ b/src/ui/public/doc_table/__tests__/doc_table.js
@@ -0,0 +1,113 @@
+
+var angular = require('angular');
+var expect = require('expect.js');
+var $ = require('jquery');
+var _ = require('lodash');
+var sinon = require('auto-release-sinon');
+var searchResponse = require('fixtures/search_response');
+var ngMock = require('ngMock');
+
+// Load the kibana app dependencies.
+require('ui/private');
+require('ui/doc_table');
+
+
+var $parentScope, $scope, $timeout, searchSource;
+
+var init = function ($elem, props) {
+  ngMock.inject(function ($rootScope, $compile, _$timeout_) {
+    $timeout = _$timeout_;
+    $parentScope = $rootScope;
+    _.assign($parentScope, props);
+
+    $compile($elem)($parentScope);
+
+    // I think the prereq requires this?
+    $timeout(function () {
+      $elem.scope().$digest();
+    }, 0);
+
+    $scope = $elem.isolateScope();
+
+  });
+};
+
+var destroy = function () {
+  $scope.$destroy();
+  $parentScope.$destroy();
+};
+
+describe('docTable', function () {
+  var $elem;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(function () {
+    $elem = angular.element('<doc-table search-source="searchSource" columns="columns" sorting="sorting"></doc-table>');
+    ngMock.inject(function (Private) {
+      searchSource = Private(require('fixtures/stubbed_search_source'));
+    });
+    init($elem, {
+      searchSource: searchSource,
+      columns: [],
+      sorting: ['@timestamp', 'desc']
+    });
+    $scope.$digest();
+
+  });
+
+  afterEach(function () {
+    destroy();
+  });
+
+  it('should compile', function () {
+    expect($elem.text()).to.not.be.empty();
+  });
+
+  it('should set the indexPattern to that of the searchSource', function () {
+    expect($scope.indexPattern).to.be(searchSource.get('index'));
+  });
+
+  it('should set size and sort on the searchSource', function () {
+    expect($scope.searchSource.sort.called).to.be(true);
+    expect($scope.searchSource.size.called).to.be(true);
+  });
+
+  it('should have an addRows function that increases the row count', function () {
+    expect($scope.addRows).to.be.a(Function);
+    searchSource.crankResults();
+    $scope.$digest();
+    expect($scope.limit).to.be(50);
+    $scope.addRows();
+    expect($scope.limit).to.be(100);
+  });
+
+  it('should reset the row limit when results are received', function () {
+    $scope.limit = 100;
+    expect($scope.limit).to.be(100);
+    searchSource.crankResults();
+    $scope.$digest();
+    expect($scope.limit).to.be(50);
+  });
+
+  it('should put the hits array on scope', function () {
+    expect($scope.hits).to.be(undefined);
+    searchSource.crankResults();
+    $scope.$digest();
+    expect($scope.hits).to.be.an(Array);
+  });
+
+  it('should destroy the searchSource when the scope is destroyed', function () {
+    expect(searchSource.destroy.called).to.be(false);
+    $scope.$destroy();
+    expect(searchSource.destroy.called).to.be(true);
+  });
+
+  it('should have a header and a table element', function () {
+    searchSource.crankResults();
+    $scope.$digest();
+
+    expect($elem.find('thead').length).to.be(1);
+    expect($elem.find('table').length).to.be(1);
+  });
+
+});
\ No newline at end of file
diff --git a/src/ui/public/doc_table/__tests__/lib/get_sort.js b/src/ui/public/doc_table/__tests__/lib/get_sort.js
new file mode 100644
index 0000000000000..de33968753486
--- /dev/null
+++ b/src/ui/public/doc_table/__tests__/lib/get_sort.js
@@ -0,0 +1,59 @@
+
+var getSort = require('ui/doc_table/lib/get_sort');
+var defaultSort = {time: 'desc'};
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+var indexPattern;
+
+describe('docTable', function () {
+  beforeEach(ngMock.module('kibana'));
+
+  beforeEach(ngMock.inject(function (Private, _$rootScope_, Promise) {
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+  }));
+
+  describe('getSort function', function () {
+    it('should be a function', function () {
+      expect(getSort).to.be.a(Function);
+    });
+
+    it('should return an object if passed a 2 item array', function () {
+      expect(getSort(['bytes', 'desc'], indexPattern)).to.eql({bytes: 'desc'});
+
+      delete indexPattern.timeFieldName;
+      expect(getSort(['bytes', 'desc'], indexPattern)).to.eql({bytes: 'desc'});
+    });
+
+    it('should sort by the default when passed an unsortable field', function () {
+      expect(getSort(['_id', 'asc'], indexPattern)).to.eql(defaultSort);
+      expect(getSort(['lol_nope', 'asc'], indexPattern)).to.eql(defaultSort);
+
+      delete indexPattern.timeFieldName;
+      expect(getSort(['_id', 'asc'], indexPattern)).to.eql({_score: 'desc'});
+    });
+
+    it('should sort in reverse chrono order otherwise on time based patterns', function () {
+      expect(getSort([], indexPattern)).to.eql(defaultSort);
+      expect(getSort(['foo'], indexPattern)).to.eql(defaultSort);
+      expect(getSort({foo: 'bar'}, indexPattern)).to.eql(defaultSort);
+    });
+
+    it('should sort by score on non-time patterns', function () {
+      delete indexPattern.timeFieldName;
+
+      expect(getSort([], indexPattern)).to.eql({_score: 'desc'});
+      expect(getSort(['foo'], indexPattern)).to.eql({_score: 'desc'});
+      expect(getSort({foo: 'bar'}, indexPattern)).to.eql({_score: 'desc'});
+    });
+  });
+
+  describe('getSort.array function', function () {
+    it('should have an array method', function () {
+      expect(getSort.array).to.be.a(Function);
+    });
+
+    it('should return an array for sortable fields', function () {
+      expect(getSort.array(['bytes', 'desc'], indexPattern)).to.eql([ 'bytes', 'desc' ]);
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/doc_table/__tests__/lib/rows_headers.js b/src/ui/public/doc_table/__tests__/lib/rows_headers.js
new file mode 100644
index 0000000000000..e31c73cf51a50
--- /dev/null
+++ b/src/ui/public/doc_table/__tests__/lib/rows_headers.js
@@ -0,0 +1,507 @@
+var angular = require('angular');
+var $ = require('jquery');
+var _ = require('lodash');
+var sinon = require('auto-release-sinon');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+var getFakeRow = require('fixtures/fake_row');
+
+describe('Doc Table', function () {
+  require('plugins/kibana/discover/index');
+
+  var $parentScope, $scope, config;
+
+  // Stub out a minimal mapping of 4 fields
+  var mapping;
+
+  beforeEach(ngMock.module('kibana', 'apps/discover'));
+  beforeEach(ngMock.inject(function (_config_, $rootScope, Private) {
+    config = _config_;
+    $parentScope = $rootScope;
+    $parentScope.indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    mapping = $parentScope.indexPattern.fields.byName;
+  }));
+
+  // Sets up the directive, take an element, and a list of properties to attach to the parent scope.
+  var init = function ($elem, props) {
+    ngMock.inject(function ($compile) {
+      _.assign($parentScope, props);
+      $compile($elem)($parentScope);
+      $elem.scope().$digest();
+      $scope = $elem.isolateScope();
+    });
+  };
+
+  var destroy = function () {
+    $scope.$destroy();
+    $parentScope.$destroy();
+  };
+
+  // For testing column removing/adding for the header and the rows
+  //
+  var columnTests = function (elemType, parentElem) {
+
+    it('should create a time column if the timefield is defined', function (done) {
+      var childElems = parentElem.find(elemType);
+      expect(childElems.length).to.be(2);
+      done();
+    });
+
+    it('should be able to add and remove columns', function (done) {
+      var childElems;
+      // Should include a column for toggling and the time column by default
+      $parentScope.columns = ['bytes'];
+      parentElem.scope().$digest();
+      childElems = parentElem.find(elemType);
+      expect(childElems.length).to.be(3);
+      expect($(childElems[2]).text()).to.contain('bytes');
+
+      $parentScope.columns = ['bytes', 'request_body'];
+      parentElem.scope().$digest();
+      childElems = parentElem.find(elemType);
+      expect(childElems.length).to.be(4);
+      expect($(childElems[3]).text()).to.contain('request_body');
+
+      $parentScope.columns = ['request_body'];
+      parentElem.scope().$digest();
+      childElems = parentElem.find(elemType);
+      expect(childElems.length).to.be(3);
+      expect($(childElems[2]).text()).to.contain('request_body');
+      done();
+    });
+
+    it('should create only the toggle column if there is no timeField', function (done) {
+      delete parentElem.scope().indexPattern.timeFieldName;
+      parentElem.scope().$digest();
+
+      var childElems = parentElem.find(elemType);
+      expect(childElems.length).to.be(1);
+      done();
+    });
+
+  };
+
+
+  describe('kbnTableHeader', function () {
+
+    var $elem = angular.element(
+      '<thead kbn-table-header columns="columns" index-pattern="indexPattern" sort="sort"></thead>'
+    );
+
+    beforeEach(function () {
+      init($elem, {
+        columns: [],
+        sorting: [],
+      });
+    });
+    afterEach(function () {
+      destroy();
+    });
+
+    describe('adding and removing columns', function () {
+      columnTests('th', $elem);
+    });
+
+
+    describe('sorting', function () {
+      it('should have a sort function that sets the elements of the sort array', function (done) {
+        expect($scope.sort).to.be.a(Function);
+        done();
+      });
+
+      it('should have a headClasser function that determines the css classes of the sort icons', function (done) {
+        expect($scope.headerClass).to.be.a(Function);
+        done();
+      });
+
+      it('should sort asc by default, then by desc if already sorting', function (done) {
+        var fields = ['bytes', '@timestamp'];
+
+        // Should not be sorted at first
+        expect($scope.sorting).to.eql(undefined);
+        expect($scope.headerClass(fields[0])).to.contain('fa-sort-up');
+
+        $scope.sort(fields[0]);
+        expect($scope.sorting).to.eql([fields[0], 'asc']);
+        expect($scope.headerClass(fields[0])).to.contain('fa-sort-up');
+
+        $scope.sort(fields[0]);
+        expect($scope.sorting).to.eql([fields[0], 'desc']);
+        expect($scope.headerClass(fields[0])).to.contain('fa-sort-down');
+
+        $scope.sort(fields[0]);
+        expect($scope.sorting).to.eql([fields[0], 'asc']);
+        expect($scope.headerClass(fields[0])).to.contain('fa-sort-up');
+
+        $scope.sort(fields[1]);
+        expect($scope.sorting).to.eql([fields[1], 'asc']);
+        expect($scope.headerClass(fields[1])).to.contain('fa-sort-up');
+
+        // Should show the default sort for any other fields[0]
+        expect($scope.headerClass(fields[0])).to.contain('fa-sort-up');
+
+        done();
+      });
+
+      it('should NOT sort unindexed fields', function (done) {
+        $scope.sort('request_body');
+        expect($scope.sorting).to.be(undefined);
+        done();
+      });
+
+      it('should NOT sort geo_point fields', function (done) {
+        $scope.sort('point');
+        expect($scope.sorting).to.be(undefined);
+        done();
+      });
+    });
+
+    describe('moving columns', function () {
+      beforeEach(function () {
+        $parentScope.columns = ['bytes', 'request_body', '@timestamp', 'point'];
+        $elem.scope().$digest();
+      });
+
+      it('should move columns to the right', function () {
+
+        $scope.moveRight('bytes');
+        expect($scope.columns[1]).to.be('bytes');
+
+        $scope.moveRight('bytes');
+        expect($scope.columns[2]).to.be('bytes');
+      });
+
+      it('shouldnt move the last column to the right', function () {
+        expect($scope.columns[3]).to.be('point');
+
+        $scope.moveRight('point');
+        expect($scope.columns[3]).to.be('point');
+      });
+
+      it('should move columns to the left', function () {
+        $scope.moveLeft('@timestamp');
+        expect($scope.columns[1]).to.be('@timestamp');
+
+        $scope.moveLeft('request_body');
+        expect($scope.columns[1]).to.be('request_body');
+      });
+
+      it('shouldnt move the first column to the left', function () {
+        expect($scope.columns[0]).to.be('bytes');
+
+        $scope.moveLeft('bytes');
+        expect($scope.columns[0]).to.be('bytes');
+      });
+    });
+  });
+
+  describe('kbnTableRow', function () {
+    var $elem = angular.element(
+      '<tr kbn-table-row="row" ' +
+      'columns="columns" ' +
+      'sorting="sorting"' +
+      'filter="filter"' +
+      'index-pattern="indexPattern"' +
+      '></tr>'
+    );
+
+    beforeEach(function () {
+
+      init($elem, {
+        row: getFakeRow(0, mapping),
+        columns: [],
+        sorting: [],
+        filter: sinon.spy(),
+        maxLength: 50,
+      });
+
+      // Ignore the metaFields (_id, _type, etc) since we don't have a mapping for them
+      sinon.stub(config, 'get').withArgs('metaFields').returns([]);
+
+    });
+    afterEach(function () {
+      destroy();
+    });
+
+    describe('adding and removing columns', function () {
+      columnTests('td', $elem);
+    });
+
+    describe('details row', function () {
+      it('should be an empty tr by default', function () {
+        expect($elem.next().is('tr')).to.be(true);
+        expect($elem.next().text()).to.be('');
+      });
+
+      it('should expand the detail row when the toggle arrow is clicked', function () {
+        $elem.children(':first-child').click();
+        $scope.$digest();
+        expect($elem.next().text()).to.not.be('');
+      });
+
+      describe('expanded', function () {
+        var $details;
+        beforeEach(function () {
+          // Open the row
+          $scope.toggleRow();
+          $scope.$digest();
+          $details = $elem.next();
+        });
+        afterEach(function () {
+          // Close the row
+          $scope.toggleRow();
+          $scope.$digest();
+        });
+
+        it('should be a tr with something in it', function () {
+          expect($details.is('tr')).to.be(true);
+          expect($details.text()).to.not.be.empty();
+        });
+
+      });
+
+    });
+  });
+
+  describe('kbnTableRow meta', function () {
+
+    var $elem = angular.element(
+        '<tr kbn-table-row="row" ' +
+        'columns="columns" ' +
+        'sorting="sorting"' +
+        'filtering="filtering"' +
+        'index-pattern="indexPattern"' +
+        '></tr>'
+    );
+    var $details;
+
+    beforeEach(function () {
+      var row = getFakeRow(0, mapping);
+      mapping._id = {indexed: true, type: 'string'};
+      row._source._id = 'foo';
+
+      init($elem, {
+        row: row,
+        columns: [],
+        sorting: [],
+        filtering: sinon.spy(),
+        maxLength: 50,
+      });
+
+      sinon.stub(config, 'get').withArgs('metaFields').returns(['_id']);
+
+      // Open the row
+      $scope.toggleRow();
+      $scope.$digest();
+      $details = $elem.next();
+    });
+
+    afterEach(function () {
+      delete mapping._id;
+      destroy();
+    });
+
+    it('should render even when the row source contains a field with the same name as a meta field', function () {
+      expect($details.find('tr').length).to.be(_.keys($parentScope.indexPattern.flattenHit($scope.row)).length);
+    });
+  });
+
+  describe('row diffing', function () {
+    var $row;
+    var $scope;
+    var $root;
+    var $before;
+
+    beforeEach(ngMock.inject(function ($rootScope, $compile, Private) {
+      $root = $rootScope;
+      $root.row = getFakeRow(0, mapping);
+      $root.columns = ['_source'];
+      $root.sorting = [];
+      $root.filtering = sinon.spy();
+      $root.maxLength = 50;
+      $root.mapping = mapping;
+      $root.indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+
+      $row = $('<tr>')
+      .attr({
+        'kbn-table-row': 'row',
+        'columns': 'columns',
+        'sorting': 'sortin',
+        'filtering': 'filtering',
+        'index-pattern': 'indexPattern',
+      });
+
+      $scope = $root.$new();
+      $compile($row)($scope);
+      $root.$apply();
+
+      $before = $row.find('td');
+      expect($before).to.have.length(3);
+      expect($before.eq(0).text().trim()).to.be('');
+      expect($before.eq(1).text().trim()).to.match(/^time_formatted/);
+    }));
+
+    afterEach(function () {
+      $row.remove();
+    });
+
+    it('handles a new column', function () {
+      $root.columns.push('bytes');
+      $root.$apply();
+
+      var $after = $row.find('td');
+      expect($after).to.have.length(4);
+      expect($after[0]).to.be($before[0]);
+      expect($after[1]).to.be($before[1]);
+      expect($after[2]).to.be($before[2]);
+      expect($after.eq(3).text().trim()).to.match(/^bytes_formatted/);
+    });
+
+    it('handles two new columns at once', function () {
+      $root.columns.push('bytes');
+      $root.columns.push('request_body');
+      $root.$apply();
+
+      var $after = $row.find('td');
+      expect($after).to.have.length(5);
+      expect($after[0]).to.be($before[0]);
+      expect($after[1]).to.be($before[1]);
+      expect($after[2]).to.be($before[2]);
+      expect($after.eq(3).text().trim()).to.match(/^bytes_formatted/);
+      expect($after.eq(4).text().trim()).to.match(/^request_body_formatted/);
+    });
+
+    it('handles three new columns in odd places', function () {
+      $root.columns = [
+        '@timestamp',
+        'bytes',
+        '_source',
+        'request_body'
+      ];
+      $root.$apply();
+
+      var $after = $row.find('td');
+      expect($after).to.have.length(6);
+      expect($after[0]).to.be($before[0]);
+      expect($after[1]).to.be($before[1]);
+      expect($after.eq(2).text().trim()).to.match(/^@timestamp_formatted/);
+      expect($after.eq(3).text().trim()).to.match(/^bytes_formatted/);
+      expect($after[4]).to.be($before[2]);
+      expect($after.eq(5).text().trim()).to.match(/^request_body_formatted/);
+    });
+
+
+    it('handles a removed column', function () {
+      _.pull($root.columns, '_source');
+      $root.$apply();
+
+      var $after = $row.find('td');
+      expect($after).to.have.length(2);
+      expect($after[0]).to.be($before[0]);
+      expect($after[1]).to.be($before[1]);
+    });
+
+    it('handles two removed columns', function () {
+      // first add a column
+      $root.columns.push('@timestamp');
+      $root.$apply();
+
+      var $mid = $row.find('td');
+      expect($mid).to.have.length(4);
+
+      $root.columns.pop();
+      $root.columns.pop();
+      $root.$apply();
+
+      var $after = $row.find('td');
+      expect($after).to.have.length(2);
+      expect($after[0]).to.be($before[0]);
+      expect($after[1]).to.be($before[1]);
+    });
+
+    it('handles three removed random columns', function () {
+      // first add two column
+      $root.columns.push('@timestamp', 'bytes');
+      $root.$apply();
+
+      var $mid = $row.find('td');
+      expect($mid).to.have.length(5);
+
+      $root.columns[0] = false; // _source
+      $root.columns[2] = false; // bytes
+      $root.columns = $root.columns.filter(Boolean);
+      $root.$apply();
+
+      var $after = $row.find('td');
+      expect($after).to.have.length(3);
+      expect($after[0]).to.be($before[0]);
+      expect($after[1]).to.be($before[1]);
+      expect($after.eq(2).text().trim()).to.match(/^@timestamp_formatted/);
+    });
+
+    it('handles two columns with the same content', function () {
+      $root.row.$$_partialFormatted.request_body = $root.row.$$_partialFormatted.bytes;
+      $root.columns.length = 0;
+      $root.columns.push('bytes');
+      $root.columns.push('request_body');
+      $root.$apply();
+
+      var $after = $row.find('td');
+      expect($after).to.have.length(4);
+      expect($after.eq(2).text().trim()).to.match(/^bytes_formatted/);
+      expect($after.eq(3).text().trim()).to.match(/^bytes_formatted/);
+    });
+
+    it('handles two columns swapping position', function () {
+      $root.columns.push('bytes');
+      $root.$apply();
+
+      var $mid = $row.find('td');
+      expect($mid).to.have.length(4);
+
+      $root.columns.reverse();
+      $root.$apply();
+
+      var $after = $row.find('td');
+      expect($after).to.have.length(4);
+      expect($after[0]).to.be($before[0]);
+      expect($after[1]).to.be($before[1]);
+      expect($after[2]).to.be($mid[3]);
+      expect($after[3]).to.be($mid[2]);
+    });
+
+    it('handles four columns all reversing position', function () {
+      $root.columns.push('bytes', 'response', '@timestamp');
+      $root.$apply();
+
+      var $mid = $row.find('td');
+      expect($mid).to.have.length(6);
+
+      $root.columns.reverse();
+      $root.$apply();
+
+      var $after = $row.find('td');
+      expect($after).to.have.length(6);
+      expect($after[0]).to.be($before[0]);
+      expect($after[1]).to.be($before[1]);
+      expect($after[2]).to.be($mid[5]);
+      expect($after[3]).to.be($mid[4]);
+      expect($after[4]).to.be($mid[3]);
+      expect($after[5]).to.be($mid[2]);
+    });
+
+    it('handles multiple columns with the same name', function () {
+      $root.columns.push('bytes', 'bytes', 'bytes');
+      $root.$apply();
+
+      var $after = $row.find('td');
+      expect($after).to.have.length(6);
+      expect($after[0]).to.be($before[0]);
+      expect($after[1]).to.be($before[1]);
+      expect($after[2]).to.be($before[2]);
+      expect($after.eq(3).text().trim()).to.match(/^bytes_formatted/);
+      expect($after.eq(4).text().trim()).to.match(/^bytes_formatted/);
+      expect($after.eq(5).text().trim()).to.match(/^bytes_formatted/);
+    });
+  });
+});
diff --git a/src/kibana/components/doc_table/components/table_header.html b/src/ui/public/doc_table/components/table_header.html
similarity index 100%
rename from src/kibana/components/doc_table/components/table_header.html
rename to src/ui/public/doc_table/components/table_header.html
diff --git a/src/kibana/components/doc_table/components/table_header.js b/src/ui/public/doc_table/components/table_header.js
similarity index 92%
rename from src/kibana/components/doc_table/components/table_header.js
rename to src/ui/public/doc_table/components/table_header.js
index 6141b34f8daed..9f6de699c32c5 100644
--- a/src/kibana/components/doc_table/components/table_header.js
+++ b/src/ui/public/doc_table/components/table_header.js
@@ -1,11 +1,11 @@
 define(function (require) {
   var _ = require('lodash');
-  var module = require('modules').get('app/discover');
+  var module = require('ui/modules').get('app/discover');
 
-  require('filters/short_dots');
+  require('ui/filters/short_dots');
 
   module.directive('kbnTableHeader', function (shortDotsFilter) {
-    var headerHtml = require('text!components/doc_table/components/table_header.html');
+    var headerHtml = require('ui/doc_table/components/table_header.html');
     return {
       restrict: 'A',
       scope: {
diff --git a/src/kibana/components/doc_table/components/table_row.js b/src/ui/public/doc_table/components/table_row.js
similarity index 86%
rename from src/kibana/components/doc_table/components/table_row.js
rename to src/ui/public/doc_table/components/table_row.js
index 15952844b0038..a3acb0f33e922 100644
--- a/src/kibana/components/doc_table/components/table_row.js
+++ b/src/ui/public/doc_table/components/table_row.js
@@ -1,14 +1,14 @@
 define(function (require) {
   var _ = require('lodash');
   var $ = require('jquery');
-  var addWordBreaks = require('utils/add_word_breaks');
-  var module = require('modules').get('app/discover');
+  var addWordBreaks = require('ui/utils/add_word_breaks');
+  var module = require('ui/modules').get('app/discover');
 
-  require('components/highlight/highlight');
-  require('components/highlight/highlight_tags');
-  require('components/doc_viewer/doc_viewer');
-  require('filters/trust_as_html');
-  require('filters/short_dots');
+  require('ui/highlight');
+  require('ui/highlight/highlight_tags');
+  require('ui/doc_viewer');
+  require('ui/filters/trust_as_html');
+  require('ui/filters/short_dots');
 
 
   // guesstimate at the minimum number of chars wide cells in the table should be
@@ -23,11 +23,11 @@ define(function (require) {
    * ```
    */
   module.directive('kbnTableRow', function ($compile) {
-    var noWhiteSpace = require('utils/no_white_space');
-    var openRowHtml = require('text!components/doc_table/components/table_row/open.html');
-    var detailsHtml = require('text!components/doc_table/components/table_row/details.html');
-    var cellTemplate = _.template(noWhiteSpace(require('text!components/doc_table/components/table_row/cell.html')));
-    var truncateByHeightTemplate = _.template(noWhiteSpace(require('text!partials/truncate_by_height.html')));
+    var noWhiteSpace = require('ui/utils/no_white_space');
+    var openRowHtml = require('ui/doc_table/components/table_row/open.html');
+    var detailsHtml = require('ui/doc_table/components/table_row/details.html');
+    var cellTemplate = _.template(noWhiteSpace(require('ui/doc_table/components/table_row/cell.html')));
+    var truncateByHeightTemplate = _.template(noWhiteSpace(require('ui/partials/truncate_by_height.html')));
 
     return {
       restrict: 'A',
diff --git a/src/kibana/components/doc_table/components/table_row/cell.html b/src/ui/public/doc_table/components/table_row/cell.html
similarity index 100%
rename from src/kibana/components/doc_table/components/table_row/cell.html
rename to src/ui/public/doc_table/components/table_row/cell.html
diff --git a/src/kibana/components/doc_table/components/table_row/details.html b/src/ui/public/doc_table/components/table_row/details.html
similarity index 100%
rename from src/kibana/components/doc_table/components/table_row/details.html
rename to src/ui/public/doc_table/components/table_row/details.html
diff --git a/src/kibana/components/doc_table/components/table_row/open.html b/src/ui/public/doc_table/components/table_row/open.html
similarity index 100%
rename from src/kibana/components/doc_table/components/table_row/open.html
rename to src/ui/public/doc_table/components/table_row/open.html
diff --git a/src/kibana/components/doc_table/doc_table.html b/src/ui/public/doc_table/doc_table.html
similarity index 100%
rename from src/kibana/components/doc_table/doc_table.html
rename to src/ui/public/doc_table/doc_table.html
diff --git a/src/ui/public/doc_table/doc_table.js b/src/ui/public/doc_table/doc_table.js
new file mode 100644
index 0000000000000..4bebced3c9743
--- /dev/null
+++ b/src/ui/public/doc_table/doc_table.js
@@ -0,0 +1,115 @@
+define(function (require) {
+  var _ = require('lodash');
+
+  var html = require('ui/doc_table/doc_table.html');
+  var getSort = require('ui/doc_table/lib/get_sort');
+
+  require('ui/doc_table/doc_table.less');
+  require('ui/directives/truncated');
+  require('ui/directives/infinite_scroll');
+  require('ui/doc_table/components/table_header');
+  require('ui/doc_table/components/table_row');
+
+  require('ui/modules').get('kibana')
+  .directive('docTable', function (config, Notifier, getAppState) {
+    return {
+      restrict: 'E',
+      template: html,
+      scope: {
+        sorting: '=',
+        columns: '=',
+        hits: '=?', // You really want either hits & indexPattern, OR searchSource
+        indexPattern: '=?',
+        searchSource: '=?',
+        infiniteScroll: '=?',
+        filter: '=?',
+      },
+      link: function ($scope) {
+        var notify = new Notifier();
+        $scope.limit = 50;
+        $scope.persist = {
+          sorting: $scope.sorting,
+          columns: $scope.columns
+        };
+
+        var prereq = (function () {
+          var fns = [];
+
+          return function register(fn) {
+            fns.push(fn);
+
+            return function () {
+              fn.apply(this, arguments);
+
+              if (fns.length) {
+                _.pull(fns, fn);
+                if (!fns.length) {
+                  $scope.$root.$broadcast('ready:vis');
+                }
+              }
+            };
+          };
+        }());
+
+        $scope.addRows = function () {
+          $scope.limit += 50;
+        };
+
+        // This exists to fix the problem of an empty initial column list not playing nice with watchCollection.
+        $scope.$watch('columns', function (columns) {
+          if (columns.length !== 0) return;
+
+          var $state = getAppState();
+          $scope.columns.push('_source');
+          if ($state) $state.replace();
+        });
+
+        $scope.$watchCollection('columns', function (columns, oldColumns) {
+          if (oldColumns.length === 1 && oldColumns[0] === '_source' && $scope.columns.length > 1) {
+            _.pull($scope.columns, '_source');
+          }
+
+          if ($scope.columns.length === 0) $scope.columns.push('_source');
+        });
+
+
+        $scope.$watch('searchSource', prereq(function (searchSource) {
+          if (!$scope.searchSource) return;
+
+          $scope.indexPattern = $scope.searchSource.get('index');
+
+          $scope.searchSource.size(config.get('discover:sampleSize'));
+          $scope.searchSource.sort(getSort($scope.sorting, $scope.indexPattern));
+
+          // Set the watcher after initialization
+          $scope.$watchCollection('sorting', function (newSort, oldSort) {
+            // Don't react if sort values didn't really change
+            if (newSort === oldSort) return;
+            $scope.searchSource.sort(getSort(newSort, $scope.indexPattern));
+            $scope.searchSource.fetchQueued();
+          });
+
+          $scope.$on('$destroy', function () {
+            if ($scope.searchSource) $scope.searchSource.destroy();
+          });
+
+          // TODO: we need to have some way to clean up result requests
+          $scope.searchSource.onResults().then(function onResults(resp) {
+            // Reset infinite scroll limit
+            $scope.limit = 50;
+
+            // Abort if something changed
+            if ($scope.searchSource !== $scope.searchSource) return;
+
+            $scope.hits = resp.hits.hits;
+
+            return $scope.searchSource.onResults().then(onResults);
+          }).catch(notify.fatal);
+
+          $scope.searchSource.onError(notify.error).catch(notify.fatal);
+        }));
+
+      }
+    };
+  });
+});
diff --git a/src/ui/public/doc_table/doc_table.less b/src/ui/public/doc_table/doc_table.less
new file mode 100644
index 0000000000000..7a69d0d84a7fd
--- /dev/null
+++ b/src/ui/public/doc_table/doc_table.less
@@ -0,0 +1,24 @@
+@import (reference) "~ui/styles/variables";
+
+doc-table {
+  overflow: auto;
+  margin: 5px;
+  flex: 1 1 100%;
+
+  .discover-table-datafield {
+    white-space: pre-wrap;
+  }
+
+  .loading {
+    opacity: @loading-opacity;
+  }
+
+  .spinner {
+    position: absolute;
+    top: 40%;
+    left: 0;
+    right: 0;
+    z-index: 20;
+    opacity: @loading-opacity;
+  }
+}
diff --git a/src/kibana/components/doc_table/lib/get_sort.js b/src/ui/public/doc_table/lib/get_sort.js
similarity index 100%
rename from src/kibana/components/doc_table/lib/get_sort.js
rename to src/ui/public/doc_table/lib/get_sort.js
diff --git a/src/ui/public/doc_title/__tests__/doc_title.js b/src/ui/public/doc_title/__tests__/doc_title.js
new file mode 100644
index 0000000000000..e24ae006d7aaa
--- /dev/null
+++ b/src/ui/public/doc_title/__tests__/doc_title.js
@@ -0,0 +1,96 @@
+
+describe('docTitle Service', function () {
+  var _ = require('lodash');
+  var sinon = require('auto-release-sinon');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+  var initialDocTitle;
+  var MAIN_TITLE = 'Kibana 4';
+
+  var docTitle;
+  var $rootScope;
+
+  beforeEach(function () {
+    initialDocTitle = document.title;
+    document.title = MAIN_TITLE;
+  });
+  afterEach(function () {
+    document.title = initialDocTitle;
+  });
+
+  beforeEach(ngMock.module('kibana', function ($provide) {
+    $provide.decorator('docTitle', decorateWithSpy('update'));
+    $provide.decorator('$rootScope', decorateWithSpy('$on'));
+  }));
+
+  beforeEach(ngMock.inject(function ($injector, Private) {
+    if (_.random(0, 1)) {
+      docTitle = $injector.get('docTitle');
+    } else {
+      docTitle = Private(require('ui/doc_title'));
+    }
+
+    $rootScope = $injector.get('$rootScope');
+  }));
+
+  describe('setup', function () {
+    it('resets the title when a route change begins', function () {
+      var spy = $rootScope.$on;
+
+      var found = spy.args.some(function (args) {
+        return args[0] === '$routeChangeStart' && args[1] === docTitle.reset;
+      });
+
+      if (!found) {
+        throw new Error('$rootScope.$on not called');
+      }
+    });
+  });
+
+  describe('#reset', function () {
+    it('clears the internal state, next update() will write the default', function () {
+      docTitle.change('some title');
+      docTitle.update();
+      expect(document.title).to.be('some title - ' + MAIN_TITLE);
+
+      docTitle.reset();
+      docTitle.update();
+      expect(document.title).to.be(MAIN_TITLE);
+    });
+  });
+
+  describe('#change', function () {
+    var getActiveTabStub;
+
+    beforeEach(function () {
+      getActiveTabStub = sinon.stub(require('ui/chrome'), 'getActiveTab');
+    });
+
+    it('writes the first param to as the first part of the doc name', function () {
+      expect(document.title).to.be(MAIN_TITLE);
+      docTitle.change('some secondary title');
+      expect(document.title).to.be('some secondary title - ' + MAIN_TITLE);
+    });
+
+    it('includes the title of the active tab if available', function () {
+      expect(document.title).to.be(MAIN_TITLE);
+      getActiveTabStub.returns({ title: 'fancy pants' });
+      docTitle.change('some secondary title');
+      expect(document.title).to.be('some secondary title - fancy pants - ' + MAIN_TITLE);
+    });
+
+    it('will write just the first param if the second param is true', function () {
+      expect(document.title).to.be(MAIN_TITLE);
+      docTitle.change('entire name', true);
+      expect(document.title).to.be('entire name');
+    });
+  });
+
+  function decorateWithSpy(prop) {
+    return function ($delegate) {
+      sinon.spy($delegate, prop);
+      return $delegate;
+    };
+  }
+
+});
diff --git a/src/ui/public/doc_title/doc_title.js b/src/ui/public/doc_title/doc_title.js
new file mode 100644
index 0000000000000..85e118f90d660
--- /dev/null
+++ b/src/ui/public/doc_title/doc_title.js
@@ -0,0 +1,50 @@
+define(function (require) {
+  var _ = require('lodash');
+  var chrome = require('ui/chrome');
+
+  require('ui/modules').get('kibana')
+  .run(function ($rootScope, docTitle) {
+    // always bind to the route events
+    $rootScope.$on('$routeChangeStart', docTitle.reset);
+    $rootScope.$on('$routeChangeError', docTitle.update);
+    $rootScope.$on('$routeChangeSuccess', docTitle.update);
+    $rootScope.$watch(_.bindKey(chrome, 'getActiveTabTitle'), docTitle.update);
+  })
+  .service('docTitle', function ($rootScope) {
+    var baseTitle = document.title;
+    var self = this;
+
+    var lastChange;
+
+    function render() {
+      lastChange = lastChange || [];
+
+      var parts = [lastChange[0]];
+      var activeTabTitle = chrome.getActiveTabTitle();
+
+      if (activeTabTitle) parts.push(activeTabTitle);
+
+      if (!lastChange[1]) parts.push(baseTitle);
+
+      return _(parts).flattenDeep().compact().join(' - ');
+    }
+
+    self.change = function (title, complete) {
+      lastChange = [title, complete];
+      self.update();
+    };
+
+    self.reset = function () {
+      lastChange = null;
+    };
+
+    self.update = function () {
+      document.title = render();
+    };
+  });
+
+  // return a "private module" so that it can be used both ways
+  return function DoctitleProvider(docTitle) {
+    return docTitle;
+  };
+});
diff --git a/src/ui/public/doc_viewer/__tests__/doc_viewer.js b/src/ui/public/doc_viewer/__tests__/doc_viewer.js
new file mode 100644
index 0000000000000..9d71e7471f92f
--- /dev/null
+++ b/src/ui/public/doc_viewer/__tests__/doc_viewer.js
@@ -0,0 +1,152 @@
+
+var angular = require('angular');
+var $ = require('jquery');
+var _ = require('lodash');
+var sinon = require('auto-release-sinon');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+var hit = {
+  '_index': 'logstash-2014.09.09',
+  '_type': 'apache',
+  '_id': '61',
+  '_score': 1,
+  '_source': {
+    'extension': 'html',
+    'bytes': 100,
+    'area': [{lat: 7, lon: 7}],
+    'noMapping': 'hasNoMapping',
+    'objectArray': [{foo: true}, {bar: false}],
+    '_underscore': 1
+  }
+};
+
+// Load the kibana app dependencies.
+require('ui/private');
+require('ui/doc_viewer');
+
+
+var $parentScope, $scope, indexPattern, flattened;
+
+var init = function ($elem, props) {
+  ngMock.inject(function ($rootScope, $compile) {
+    $parentScope = $rootScope;
+    _.assign($parentScope, props);
+    $compile($elem)($parentScope);
+    $elem.scope().$digest();
+    $scope = $elem.isolateScope();
+  });
+};
+
+var destroy = function () {
+  $scope.$destroy();
+  $parentScope.$destroy();
+};
+
+describe('docViewer', function () {
+  var $elem;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(function () {
+    $elem = angular.element('<doc-viewer index-pattern="indexPattern" hit="hit" filter="filter"></doc-viewer>');
+    ngMock.inject(function (Private) {
+      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+      flattened = indexPattern.flattenHit(hit);
+    });
+    init($elem, {
+      indexPattern: indexPattern,
+      hit: hit,
+      filter: sinon.spy()
+    });
+  });
+
+  afterEach(function () {
+    destroy();
+  });
+
+  describe('Table mode', function () {
+    it('should have a row for each field', function () {
+      var rows = $elem.find('tr');
+      expect($elem.find('tr').length).to.be(_.keys(flattened).length);
+    });
+
+    it('should have the field name in the first column', function () {
+      _.each(_.keys(flattened), function (field) {
+        expect($elem.find('td[title="' + field + '"]').length).to.be(1);
+      });
+    });
+
+    it('should have the a value for each field', function () {
+      _.each(_.keys(flattened), function (field) {
+        var cellValue = $elem.find('td[title="' + field + '"]').siblings().find('.doc-viewer-value').text();
+
+        // This sucks, but testing the filter chain is too hairy ATM
+        expect(cellValue.length).to.be.greaterThan(0);
+      });
+    });
+
+
+    describe('filtering', function () {
+      it('should apply a filter when clicking filterable fields', function () {
+        var cell = $elem.find('td[title="bytes"]').next();
+
+        cell.find('.fa-search-plus').first().click();
+        expect($scope.filter.calledOnce).to.be(true);
+        cell.find('.fa-search-minus').first().click();
+        expect($scope.filter.calledTwice).to.be(true);
+      });
+
+      it('should NOT apply a filter when clicking non-filterable fields', function () {
+        var cell = $elem.find('td[title="area"]').next();
+
+        cell.find('.fa-search-plus').first().click();
+        expect($scope.filter.calledOnce).to.be(false);
+        cell.find('.fa-search-minus').first().click();
+        expect($scope.filter.calledTwice).to.be(false);
+      });
+    });
+
+    describe('warnings', function () {
+      it('displays a warning about field name starting with underscore', function () {
+        var cells = $elem.find('td[title="_underscore"]').siblings();
+        expect(cells.find('.doc-viewer-underscore').length).to.be(1);
+        expect(cells.find('.doc-viewer-no-mapping').length).to.be(0);
+        expect(cells.find('.doc-viewer-object-array').length).to.be(0);
+      });
+
+      it('displays a warning about missing mappings', function () {
+        var cells = $elem.find('td[title="noMapping"]').siblings();
+        expect(cells.find('.doc-viewer-underscore').length).to.be(0);
+        expect(cells.find('.doc-viewer-no-mapping').length).to.be(1);
+        expect(cells.find('.doc-viewer-object-array').length).to.be(0);
+      });
+
+      it('displays a warning about objects in arrays', function () {
+        var cells = $elem.find('td[title="objectArray"]').siblings();
+        expect(cells.find('.doc-viewer-underscore').length).to.be(0);
+        expect(cells.find('.doc-viewer-no-mapping').length).to.be(0);
+        expect(cells.find('.doc-viewer-object-array').length).to.be(1);
+      });
+    });
+
+  });
+
+  describe('JSON mode', function () {
+    it('has pretty JSON', function () {
+      expect($scope.hitJson).to.equal(angular.toJson(hit, true));
+    });
+
+    it('should have a global ACE object', function () {
+      expect(window.ace).to.be.a(Object);
+    });
+
+    it('should have one ACE div', function () {
+      expect($elem.find('div[id="json-ace"]').length).to.be(1);
+    });
+
+    it('should contain the same code as hitJson', function () {
+      var editor = window.ace.edit($elem.find('div[id="json-ace"]')[0]);
+      var code = editor.getSession().getValue();
+      expect(code).to.equal($scope.hitJson);
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/kibana/components/doc_viewer/doc_viewer.html b/src/ui/public/doc_viewer/doc_viewer.html
similarity index 100%
rename from src/kibana/components/doc_viewer/doc_viewer.html
rename to src/ui/public/doc_viewer/doc_viewer.html
diff --git a/src/ui/public/doc_viewer/doc_viewer.js b/src/ui/public/doc_viewer/doc_viewer.js
new file mode 100644
index 0000000000000..8d49f98b788bc
--- /dev/null
+++ b/src/ui/public/doc_viewer/doc_viewer.js
@@ -0,0 +1,41 @@
+define(function (require) {
+  var _ = require('lodash');
+  var angular = require('angular');
+  require('ace');
+
+  var html = require('ui/doc_viewer/doc_viewer.html');
+  require('ui/doc_viewer/doc_viewer.less');
+
+  require('ui/modules').get('kibana')
+  .directive('docViewer', function (config, Private) {
+    return {
+      restrict: 'E',
+      template: html,
+      scope: {
+        hit: '=',
+        indexPattern: '=',
+        filter: '=?',
+        columns: '=?'
+      },
+      link: function ($scope, $el, attr) {
+        // If a field isn't in the mapping, use this
+        $scope.mode = 'table';
+        $scope.mapping = $scope.indexPattern.fields.byName;
+        $scope.flattened = $scope.indexPattern.flattenHit($scope.hit);
+        $scope.hitJson = angular.toJson($scope.hit, true);
+        $scope.formatted = $scope.indexPattern.formatHit($scope.hit);
+        $scope.fields = _.keys($scope.flattened).sort();
+
+        $scope.toggleColumn = function (fieldName) {
+          _.toggleInOut($scope.columns, fieldName);
+        };
+
+        $scope.showArrayInObjectsWarning = function (row, field) {
+          var value = $scope.flattened[field];
+          return _.isArray(value) && typeof value[0] === 'object';
+        };
+
+      }
+    };
+  });
+});
diff --git a/src/ui/public/doc_viewer/doc_viewer.less b/src/ui/public/doc_viewer/doc_viewer.less
new file mode 100644
index 0000000000000..afe973c229a26
--- /dev/null
+++ b/src/ui/public/doc_viewer/doc_viewer.less
@@ -0,0 +1,23 @@
+@import (reference) "~ui/styles/variables";
+
+doc-viewer .doc-viewer {
+
+  &-buttons, &-field {
+    white-space: nowrap;
+  }
+
+  &-value, pre {
+    display: inline-block;
+    word-break: break-all;
+    word-wrap: break-word;
+    white-space: pre-wrap;
+  }
+
+  td, pre {
+    font-family: "Lucida Console", Monaco, monospace;
+  }
+
+  &-content {
+    margin-top: @padding-base-vertical;
+  }
+}
diff --git a/src/kibana/components/elastic_textarea.js b/src/ui/public/elastic_textarea.js
similarity index 93%
rename from src/kibana/components/elastic_textarea.js
rename to src/ui/public/elastic_textarea.js
index b9c9af570d44b..8ae6372b09c2e 100644
--- a/src/kibana/components/elastic_textarea.js
+++ b/src/ui/public/elastic_textarea.js
@@ -3,7 +3,7 @@ define(function (require) {
   var NL_RE = /\n/g;
   var events = 'keydown keypress keyup change';
 
-  require('modules').get('kibana')
+  require('ui/modules').get('kibana')
   .directive('elasticTextarea', function () {
     return {
       restrict: 'A',
diff --git a/src/ui/public/errors.js b/src/ui/public/errors.js
new file mode 100644
index 0000000000000..2666c60022b68
--- /dev/null
+++ b/src/ui/public/errors.js
@@ -0,0 +1,268 @@
+define(function (require) {
+  var _ = require('lodash');
+  var angular = require('angular');
+
+  var canStack = (function () {
+    var err = new Error();
+    return !!err.stack;
+  }());
+
+  var errors = {};
+
+  // abstract error class
+  function KbnError(msg, constructor) {
+    this.message = msg;
+
+    Error.call(this, this.message);
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, constructor || KbnError);
+    } else if (canStack) {
+      this.stack = (new Error()).stack;
+    } else {
+      this.stack = '';
+    }
+  }
+  errors.KbnError = KbnError;
+  _.class(KbnError).inherits(Error);
+
+  /**
+   * HastyRefresh error class
+   * @param {String} [msg] - An error message that will probably end up in a log.
+   */
+  errors.HastyRefresh = function HastyRefresh() {
+    KbnError.call(this,
+      'Courier attempted to start a query before the previous had finished.',
+      errors.HastyRefresh);
+  };
+  _.class(errors.HastyRefresh).inherits(KbnError);
+
+  /**
+   * SearchTimeout error class
+   */
+  errors.SearchTimeout = function SearchTimeout() {
+    KbnError.call(this,
+      'All or part of your request has timed out. The data shown may be incomplete.',
+      errors.SearchTimeout);
+  };
+  _.class(errors.SearchTimeout).inherits(KbnError);
+
+  /**
+   * Request Failure - When an entire mutli request fails
+   * @param {Error} err - the Error that came back
+   * @param {Object} resp - optional HTTP response
+   */
+  errors.RequestFailure = function RequestFailure(err, resp) {
+    err = err || false;
+
+    KbnError.call(this,
+      'Request to Elasticsearch failed: ' + angular.toJson(resp || err.message),
+      errors.RequestFailure);
+
+    this.origError = err;
+    this.resp = resp;
+  };
+  _.class(errors.RequestFailure).inherits(KbnError);
+
+  /**
+   * FetchFailure Error - when there is an error getting a doc or search within
+   *  a multi-response response body
+   * @param {String} [msg] - An error message that will probably end up in a log.
+   */
+  errors.FetchFailure = function FetchFailure(resp) {
+    KbnError.call(this,
+      'Failed to get the doc: ' + angular.toJson(resp),
+      errors.FetchFailure);
+
+    this.resp = resp;
+  };
+  _.class(errors.FetchFailure).inherits(KbnError);
+
+  /**
+   * ShardFailure Error - when one or more shards fail
+   * @param {String} [msg] - An error message that will probably end up in a log.
+   */
+  errors.ShardFailure = function ShardFailure(resp) {
+    KbnError.call(this, resp._shards.failed + ' of ' + resp._shards.total + ' shards failed.',
+      errors.ShardFailure);
+
+    this.resp = resp;
+  };
+  _.class(errors.ShardFailure).inherits(KbnError);
+
+
+  /**
+   * A doc was re-indexed but it was out of date.
+   * @param {Object} resp - The response from es (one of the multi-response responses).
+   */
+  errors.VersionConflict = function VersionConflict(resp) {
+    KbnError.call(this,
+      'Failed to store document changes do to a version conflict.',
+      errors.VersionConflict);
+
+    this.resp = resp;
+  };
+  _.class(errors.VersionConflict).inherits(KbnError);
+
+
+  /**
+   * there was a conflict storing a doc
+   * @param {String} field - the fields which contains the conflict
+   */
+  errors.MappingConflict = function MappingConflict(field) {
+    KbnError.call(this,
+      'Field "' + field + '" is defined with at least two different types in indices matching the pattern',
+      errors.MappingConflict);
+  };
+  _.class(errors.MappingConflict).inherits(KbnError);
+
+  /**
+   * a field mapping was using a restricted fields name
+   * @param {String} field - the fields which contains the conflict
+   */
+  errors.RestrictedMapping = function RestrictedMapping(field, index) {
+    var msg = field + ' is a restricted field name';
+    if (index) msg += ', found it while attempting to fetch mapping for index pattern: ' + index;
+
+    KbnError.call(this, msg, errors.RestrictedMapping);
+  };
+  _.class(errors.RestrictedMapping).inherits(KbnError);
+
+  /**
+   * a non-critical cache write to elasticseach failed
+   */
+  errors.CacheWriteFailure = function CacheWriteFailure() {
+    KbnError.call(this,
+      'A Elasticsearch cache write has failed.',
+      errors.CacheWriteFailure);
+  };
+  _.class(errors.CacheWriteFailure).inherits(KbnError);
+
+  /**
+   * when a field mapping is requested for an unknown field
+   * @param {String} name - the field name
+   */
+  errors.FieldNotFoundInCache = function FieldNotFoundInCache(name) {
+    KbnError.call(this,
+      'The ' + name + ' field was not found in the cached mappings',
+      errors.FieldNotFoundInCache);
+  };
+  _.class(errors.FieldNotFoundInCache).inherits(KbnError);
+
+  /**
+   * when a mapping already exists for a field the user is attempting to add
+   * @param {String} name - the field name
+   */
+  errors.DuplicateField = function DuplicateField(name) {
+    KbnError.call(this,
+      'The "' + name + '" field already exists in this mapping',
+      errors.DuplicateField);
+  };
+  _.class(errors.DuplicateField).inherits(KbnError);
+
+  /**
+   * A saved object was not found
+   * @param {String} field - the fields which contains the conflict
+   */
+  errors.SavedObjectNotFound = function SavedObjectNotFound(type, id) {
+    this.savedObjectType = type;
+    this.savedObjectId = id;
+    var idMsg = id ? ' (id: ' + id + ')' : '';
+    KbnError.call(this,
+      'Could not locate that ' + type + idMsg,
+      errors.SavedObjectNotFound);
+  };
+  _.class(errors.SavedObjectNotFound).inherits(KbnError);
+
+  /**
+   * Tried to call a method that relies on SearchSource having an indexPattern assigned
+   */
+  errors.IndexPatternMissingIndices = function IndexPatternMissingIndices(type) {
+    KbnError.call(this,
+      'IndexPattern\'s configured pattern does not match any indices',
+      errors.IndexPatternMissingIndices);
+  };
+  _.class(errors.IndexPatternMissingIndices).inherits(KbnError);
+
+  /**
+   * Tried to call a method that relies on SearchSource having an indexPattern assigned
+   */
+  errors.NoDefinedIndexPatterns = function NoDefinedIndexPatterns(type) {
+    KbnError.call(this,
+      'Define at least one index pattern to continue',
+      errors.NoDefinedIndexPatterns);
+  };
+  _.class(errors.NoDefinedIndexPatterns).inherits(KbnError);
+
+
+  /**
+   * Tried to load a route besides settings/indices but you don't have a default index pattern!
+   */
+  errors.NoDefaultIndexPattern = function NoDefaultIndexPattern(type) {
+    KbnError.call(this,
+      'Please specify a default index pattern',
+      errors.NoDefaultIndexPattern);
+  };
+  _.class(errors.NoDefaultIndexPattern).inherits(KbnError);
+
+
+  /**
+   * used by the vislib, when the container is too small
+   * @param {String} message - the message to provide with the error
+   */
+  errors.ContainerTooSmall = function ContainerTooSmall() {
+    KbnError.call(this,
+    'This container is too small to render the visualization',
+    errors.ContainerTooSmall);
+  };
+  _.class(errors.ContainerTooSmall).inherits(KbnError);
+
+  /**
+   * error thrown when user tries to render an chart with less
+   * than the required number of data points
+   * @param {String} message - the message to provide with the error
+   */
+  errors.NotEnoughData = function NotEnoughData(message) {
+    KbnError.call(this, message, errors.NotEnoughData);
+  };
+  _.class(errors.NotEnoughData).inherits(KbnError);
+
+  /**
+   * error thrown when no results are returned from an elasticsearch query
+   */
+  errors.NoResults = function NoResults() {
+    KbnError.call(this,
+    'No results found',
+    errors.NoResults);
+  };
+  _.class(errors.NoResults).inherits(KbnError);
+
+  /**
+   * error thrown when no results are returned from an elasticsearch query
+   */
+  errors.PieContainsAllZeros = function PieContainsAllZeros() {
+    KbnError.call(this,
+      'No results displayed because all values equal 0',
+      errors.PieContainsAllZeros);
+  };
+  _.class(errors.PieContainsAllZeros).inherits(KbnError);
+
+  /**
+   * error thrown when no results are returned from an elasticsearch query
+   */
+  errors.InvalidLogScaleValues = function InvalidLogScaleValues() {
+    KbnError.call(this,
+      'Values less than 1 cannot be displayed on a log scale',
+      errors.InvalidLogScaleValues);
+  };
+  _.class(errors.InvalidLogScaleValues).inherits(KbnError);
+
+  /** error thrown when wiggle chart is selected for non linear data */
+  errors.InvalidWiggleSelection = function InvalidWiggleSelection() {
+    KbnError.call(this,
+      'In wiggle mode the area chart requires ordered values on the x-axis. Try using a Histogram or Date Histogram aggregation.',
+      errors.InvalidWiggleSelection);
+  };
+  _.class(errors.InvalidWiggleSelection).inherits(KbnError);
+
+  return errors;
+});
diff --git a/src/kibana/services/es.js b/src/ui/public/es.js
similarity index 87%
rename from src/kibana/services/es.js
rename to src/ui/public/es.js
index 9773c4c00ef16..724aa2a435413 100644
--- a/src/kibana/services/es.js
+++ b/src/ui/public/es.js
@@ -1,15 +1,15 @@
 define(function (require) {
-  require('elasticsearch');
+  require('elasticsearch-browser/elasticsearch.angular.js');
   var _ = require('lodash');
 
   var es; // share the client amoungst all apps
-  require('modules')
+  require('ui/modules')
     .get('kibana', ['elasticsearch', 'kibana/config'])
-    .service('es', function (esFactory, configFile, $q) {
+    .service('es', function (esFactory, esUrl, $q) {
       if (es) return es;
 
       es = esFactory({
-        host: configFile.elasticsearch,
+        host: esUrl,
         log: 'info',
         requestTimeout: 0,
         apiVersion: '1.4',
diff --git a/src/ui/public/events.js b/src/ui/public/events.js
new file mode 100644
index 0000000000000..dd2cbeca29125
--- /dev/null
+++ b/src/ui/public/events.js
@@ -0,0 +1,105 @@
+define(function (require) {
+  var _ = require('lodash');
+
+  return function EventsProvider(Private, Promise, Notifier) {
+    var SimpleEmitter = require('ui/utils/SimpleEmitter');
+    var notify = new Notifier({ location: 'EventEmitter' });
+
+    _.class(Events).inherits(SimpleEmitter);
+    function Events() {
+      Events.Super.call(this);
+      this._listeners = {};
+      this._emitChain = Promise.resolve();
+    }
+
+    /**
+     * Listens for events
+     * @param {string} name - The name of the event
+     * @param {function} handler - The function to call when the event is triggered
+     * @returns {undefined}
+     */
+    Events.prototype.on = function (name, handler) {
+      if (!_.isArray(this._listeners[name])) {
+        this._listeners[name] = [];
+      }
+
+      var listener = {
+        handler: handler
+      };
+      this._listeners[name].push(listener);
+
+      (function rebuildDefer() {
+        listener.defer = Promise.defer();
+        listener.resolved = listener.defer.promise.then(function (args) {
+          rebuildDefer();
+
+          // we ignore the completion of handlers, just watch for unhandled errors
+          Promise.resolve(handler.apply(handler, args)).catch(notify.fatal);
+        });
+      }());
+
+      return this;
+    };
+
+    /**
+     * Removes an event listener
+     * @param {string} [name] - The name of the event
+     * @param {function} [handler] - The handler to remove
+     * @return {undefined}
+     */
+    Events.prototype.off = function (name, handler) {
+      if (!name && !handler) {
+        return this._listeners = {};
+      }
+
+      // exit early if there is not an event that matches
+      if (!this._listeners[name]) return;
+
+      // If no hander remove all the events
+      if (!handler) {
+        delete this._listeners[name];
+      } else {
+        this._listeners[name] = _.filter(this._listeners[name], function (listener) {
+          return handler !== listener.handler;
+        });
+      }
+
+      return this;
+    };
+
+    /**
+     * Emits the event to all listeners
+     *
+     * @param {string} name - The name of the event.
+     * @param {any} [value] - The value that will be passed to all event handlers.
+     * @returns {Promise}
+     */
+    Events.prototype.emit = function (name) {
+      var self = this;
+      var args = _.rest(arguments);
+
+      if (!self._listeners[name]) {
+        return self._emitChain;
+      }
+
+      return Promise.map(self._listeners[name], function (listener) {
+        return self._emitChain = self._emitChain.then(function () {
+          listener.defer.resolve(args);
+          return listener.resolved;
+        });
+      });
+    };
+
+    /**
+     * Get a list of the handler functions for a specific event
+     *
+     * @param  {string} name
+     * @return {array[function]}
+     */
+    Events.prototype.listeners = function (name) {
+      return _.pluck(this._listeners[name], 'handler');
+    };
+
+    return Events;
+  };
+});
diff --git a/src/ui/public/factories/__tests__/base_object.js b/src/ui/public/factories/__tests__/base_object.js
new file mode 100644
index 0000000000000..90829e31de907
--- /dev/null
+++ b/src/ui/public/factories/__tests__/base_object.js
@@ -0,0 +1,47 @@
+var angular = require('angular');
+var _ = require('lodash');
+var sinon = require('sinon');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+require('ui/private');
+
+describe('Base Object', function () {
+  var $rootScope;
+  var BaseObject;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (_$rootScope_, Private) {
+    $rootScope = _$rootScope_;
+    BaseObject = require('ui/utils/BaseObject');
+  }));
+
+  it('should take an inital set of values', function () {
+    var baseObject = new BaseObject({ message: 'test' });
+    expect(baseObject).to.have.property('message', 'test');
+  });
+
+  it('should serialize _attributes to RISON', function () {
+    var baseObject = new BaseObject();
+    baseObject.message = 'Testing... 1234';
+    var rison = baseObject.toRISON();
+    expect(rison).to.equal('(message:\'Testing... 1234\')');
+  });
+
+  it('should not serialize $$attributes to RISON', function () {
+    var baseObject = new BaseObject();
+    baseObject.$$attributes = { foo: 'bar' };
+    baseObject.message = 'Testing... 1234';
+    var rison = baseObject.toRISON();
+    expect(rison).to.equal('(message:\'Testing... 1234\')');
+  });
+
+  it('should serialize _attributes for JSON', function () {
+    var baseObject = new BaseObject();
+    baseObject.message = 'Testing... 1234';
+    baseObject._private = 'foo';
+    baseObject.$private = 'stuff';
+    var json = JSON.stringify(baseObject);
+    expect(json).to.equal('{"message":"Testing... 1234"}');
+  });
+
+});
diff --git a/src/ui/public/factories/__tests__/events.js b/src/ui/public/factories/__tests__/events.js
new file mode 100644
index 0000000000000..d0f6e773a43f9
--- /dev/null
+++ b/src/ui/public/factories/__tests__/events.js
@@ -0,0 +1,228 @@
+
+var angular = require('angular');
+var _ = require('lodash');
+var sinon = require('auto-release-sinon');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+require('ui/private');
+
+describe('Events', function () {
+  require('testUtils/noDigestPromises').activateForSuite();
+
+  var $rootScope;
+  var Events;
+  var Notifier;
+  var Promise;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function ($injector, Private) {
+    $rootScope = $injector.get('$rootScope');
+    Notifier = $injector.get('Notifier');
+    Promise = $injector.get('Promise');
+    Events = Private(require('ui/events'));
+  }));
+
+  it('should handle on events', function () {
+    var obj = new Events();
+    var prom = obj.on('test', function (message) {
+      expect(message).to.equal('Hello World');
+    });
+
+    obj.emit('test', 'Hello World');
+
+    return prom;
+  });
+
+  it('should work with inherited objects', function () {
+    _.class(MyEventedObject).inherits(Events);
+    function MyEventedObject() {
+      MyEventedObject.Super.call(this);
+    }
+    var obj = new MyEventedObject();
+
+    var prom = obj.on('test', function (message) {
+      expect(message).to.equal('Hello World');
+    });
+
+    obj.emit('test', 'Hello World');
+
+    return prom;
+  });
+
+  it('should clear events when off is called', function () {
+    var obj = new Events();
+    obj.on('test', _.noop);
+    expect(obj._listeners).to.have.property('test');
+    expect(obj._listeners.test).to.have.length(1);
+    obj.off();
+    expect(obj._listeners).to.not.have.property('test');
+  });
+
+  it('should clear a specific handler when off is called for an event', function () {
+    var obj = new Events();
+    var handler1 = sinon.stub();
+    var handler2 = sinon.stub();
+    obj.on('test', handler1);
+    obj.on('test', handler2);
+    expect(obj._listeners).to.have.property('test');
+    obj.off('test', handler1);
+
+    return obj.emit('test', 'Hello World')
+    .then(function () {
+      sinon.assert.calledOnce(handler2);
+      sinon.assert.notCalled(handler1);
+    });
+  });
+
+  it('should clear a all handlers when off is called for an event', function () {
+    var obj = new Events();
+    var handler1 = sinon.stub();
+    obj.on('test', handler1);
+    expect(obj._listeners).to.have.property('test');
+    obj.off('test');
+    expect(obj._listeners).to.not.have.property('test');
+
+    return obj.emit('test', 'Hello World')
+    .then(function () {
+      sinon.assert.notCalled(handler1);
+    });
+  });
+
+  it('should handle mulitple identical emits in the same tick', function () {
+    var obj = new Events();
+    var handler1 = sinon.stub();
+
+    obj.on('test', handler1);
+    var emits = [
+      obj.emit('test', 'one'),
+      obj.emit('test', 'two'),
+      obj.emit('test', 'three')
+    ];
+
+    return Promise
+    .all(emits)
+    .then(function () {
+      expect(handler1.callCount).to.be(emits.length);
+      expect(handler1.getCall(0).calledWith('one')).to.be(true);
+      expect(handler1.getCall(1).calledWith('two')).to.be(true);
+      expect(handler1.getCall(2).calledWith('three')).to.be(true);
+    });
+  });
+
+  it('should handle emits from the handler', function () {
+    var obj = new Events();
+    var secondEmit = Promise.defer();
+    var handler1 = sinon.spy(function () {
+      if (handler1.calledTwice) {
+        return;
+      }
+      obj.emit('test').then(_.bindKey(secondEmit, 'resolve'));
+    });
+
+    obj.on('test', handler1);
+
+    return Promise
+    .all([
+      obj.emit('test'),
+      secondEmit.promise
+    ])
+    .then(function () {
+      expect(handler1.callCount).to.be(2);
+    });
+  });
+
+  it('should only emit to handlers registered before emit is called', function () {
+    var obj = new Events();
+    var handler1 = sinon.stub();
+    var handler2 = sinon.stub();
+
+    obj.on('test', handler1);
+    var emits = [
+      obj.emit('test', 'one'),
+      obj.emit('test', 'two'),
+      obj.emit('test', 'three')
+    ];
+
+
+    return Promise.all(emits).then(function () {
+      expect(handler1.callCount).to.be(emits.length);
+
+      obj.on('test', handler2);
+
+      var emits2 = [
+        obj.emit('test', 'four'),
+        obj.emit('test', 'five'),
+        obj.emit('test', 'six')
+      ];
+
+      return Promise.all(emits2)
+      .then(function () {
+        expect(handler1.callCount).to.be(emits.length + emits2.length);
+        expect(handler2.callCount).to.be(emits2.length);
+      });
+    });
+  });
+
+  it('should pass multiple arguments from the emitter', function () {
+    var obj = new Events();
+    var handler = sinon.stub();
+    var payload = [
+      'one',
+      { hello: 'tests' },
+      null
+    ];
+
+    obj.on('test', handler);
+
+    return obj.emit('test', payload[0], payload[1], payload[2])
+    .then(function () {
+      expect(handler.callCount).to.be(1);
+      expect(handler.calledWithExactly(payload[0], payload[1], payload[2])).to.be(true);
+    });
+  });
+
+  it('should preserve the scope of the handler', function () {
+    var obj = new Events();
+    var expected = 'some value';
+    var testValue;
+
+    function handler(arg1, arg2) {
+      testValue = this.getVal();
+    }
+    handler.getVal = _.constant(expected);
+
+    obj.on('test', handler);
+    return obj.emit('test')
+    .then(function () {
+      expect(testValue).to.equal(expected);
+    });
+  });
+
+  it('should always emit in the same order', function () {
+    var handler = sinon.stub();
+
+    var obj = new Events();
+    obj.on('block', _.partial(handler, 'block'));
+    obj.on('last', _.partial(handler, 'last'));
+
+    return Promise
+    .all([
+      obj.emit('block'),
+      obj.emit('block'),
+      obj.emit('block'),
+      obj.emit('block'),
+      obj.emit('block'),
+      obj.emit('block'),
+      obj.emit('block'),
+      obj.emit('block'),
+      obj.emit('block'),
+      obj.emit('last')
+    ])
+    .then(function () {
+      expect(handler.callCount).to.be(10);
+      handler.args.forEach(function (args, i) {
+        expect(args[0]).to.be(i < 9 ? 'block' : 'last');
+      });
+    });
+  });
+});
diff --git a/src/kibana/components/fancy_forms/kbn_form.js b/src/ui/public/fancy_forms/KbnFormController.js
similarity index 100%
rename from src/kibana/components/fancy_forms/kbn_form.js
rename to src/ui/public/fancy_forms/KbnFormController.js
diff --git a/src/kibana/components/fancy_forms/kbn_model.js b/src/ui/public/fancy_forms/KbnModelController.js
similarity index 100%
rename from src/kibana/components/fancy_forms/kbn_model.js
rename to src/ui/public/fancy_forms/KbnModelController.js
diff --git a/src/ui/public/fancy_forms/__tests__/fancy_forms.js b/src/ui/public/fancy_forms/__tests__/fancy_forms.js
new file mode 100644
index 0000000000000..d631e2439b9c2
--- /dev/null
+++ b/src/ui/public/fancy_forms/__tests__/fancy_forms.js
@@ -0,0 +1,103 @@
+
+var $ = require('jquery');
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+
+describe('fancy forms', function () {
+  var $el;
+  var $scope;
+  var $compile;
+  var $rootScope;
+  var ngForm;
+  var ngModel;
+
+  function generateEl() {
+    return $('<form>').html(
+      $('<input ng-model="val" required>')
+    );
+  }
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function ($injector) {
+    $rootScope = $injector.get('$rootScope');
+    $compile = $injector.get('$compile');
+
+    $scope = $rootScope.$new();
+    $el = generateEl();
+
+    $compile($el)($scope);
+    $scope.$apply();
+
+    ngForm = $el.controller('form');
+    ngModel = $el.find('input').controller('ngModel');
+  }));
+
+  describe('ngFormController', function () {
+    it('counts errors', function () {
+      expect(ngForm.errorCount()).to.be(1);
+    });
+
+    it('clears errors', function () {
+      $scope.val = 'someting';
+      $scope.$apply();
+      expect(ngForm.errorCount()).to.be(0);
+    });
+
+    it('describes 0 errors', function () {
+      $scope.val = 'someting';
+      $scope.$apply();
+      expect(ngForm.describeErrors()).to.be('0 Errors');
+    });
+
+    it('describes 0 error when the model is invalid but untouched', function () {
+      $scope.$apply();
+      expect(ngForm.describeErrors()).to.be('0 Errors');
+    });
+
+    it('describes 1 error when the model is touched', function () {
+      $el.find('input').blur();
+      $scope.$apply();
+      expect(ngForm.describeErrors()).to.be('1 Error');
+    });
+  });
+
+  describe('ngModelController', function () {
+    it('gives access to the ngFormController', function () {
+      expect(ngModel.$getForm()).to.be(ngForm);
+    });
+
+    it('allows setting the model dirty', function () {
+      expect($el.find('input.ng-dirty')).to.have.length(0);
+      ngModel.$setDirty();
+      expect($el.find('input.ng-dirty')).to.have.length(1);
+    });
+
+    it('sets the model dirty when it moves from valid to invalid', function () {
+      // clear out the old scope/el
+      $scope.$destroy();
+      $el = generateEl();
+      $scope = $rootScope.$new();
+
+      // start with a valid value
+      $scope.val = 'something';
+      $compile($el)($scope);
+      $rootScope.$apply();
+
+      // ensure that the field is valid and pristinve
+      var $valid = $el.find('input.ng-valid');
+      expect($valid).to.have.length(1);
+      expect($valid.hasClass('ng-pristine')).to.be(true);
+      expect($valid.hasClass('ng-dirty')).to.be(false);
+
+      // remove the value without actually setting the view model
+      $scope.val = null;
+      $rootScope.$apply();
+
+      // ensure that the field is now invalid and dirty
+      var $invalid = $el.find('input.ng-invalid');
+      expect($invalid).to.have.length(1);
+      expect($valid.hasClass('ng-pristine')).to.be(false);
+      expect($valid.hasClass('ng-dirty')).to.be(true);
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/fancy_forms/fancy_forms.js b/src/ui/public/fancy_forms/fancy_forms.js
new file mode 100644
index 0000000000000..29978c4eb37d2
--- /dev/null
+++ b/src/ui/public/fancy_forms/fancy_forms.js
@@ -0,0 +1,45 @@
+define(function (require) {
+  var _ = require('lodash');
+  var $ = require('jquery');
+
+  var KbnFormController = require('ui/fancy_forms/KbnFormController');
+  var KbnModelController = require('ui/fancy_forms/KbnModelController');
+
+  require('ui/modules')
+  .get('kibana')
+  .config(function ($provide) {
+    function decorateDirectiveController(DecorativeController) {
+      return function ($delegate, $injector) {
+        // directive providers are arrays
+        $delegate.forEach(function (directive) {
+          // get metadata about all init fns
+          var chain = [directive.controller, DecorativeController].map(function (fn) {
+            var deps = $injector.annotate(fn);
+            return { deps: deps, fn: _.isArray(fn) ? _.last(fn) : fn };
+          });
+
+          // replace the controller with one that will setup the actual controller
+          directive.controller = function stub() {
+            var allDeps = _.toArray(arguments);
+            return chain.reduce(function (controller, link, i) {
+              var deps = allDeps.splice(0, link.deps.length);
+              return link.fn.apply(controller, deps) || controller;
+            }, this);
+          };
+
+          // set the deps of our new controller to be the merged deps of every fn
+          directive.controller.$inject = chain.reduce(function (deps, link) {
+            return deps.concat(link.deps);
+          }, []);
+        });
+
+        return $delegate;
+      };
+    }
+
+
+    $provide.decorator('formDirective', decorateDirectiveController(KbnFormController));
+    $provide.decorator('ngFormDirective', decorateDirectiveController(KbnFormController));
+    $provide.decorator('ngModelDirective', decorateDirectiveController(KbnModelController));
+  });
+});
diff --git a/src/ui/public/field_editor/__tests__/field_editor.js b/src/ui/public/field_editor/__tests__/field_editor.js
new file mode 100644
index 0000000000000..9232322466fcf
--- /dev/null
+++ b/src/ui/public/field_editor/__tests__/field_editor.js
@@ -0,0 +1,130 @@
+
+describe('FieldEditor directive', function () {
+  var $ = require('jquery');
+  var ngMock = require('ngMock');
+  var expect = require('expect.js');
+
+  var Field;
+  var StringFormat;
+  var $rootScope;
+
+  var compile;
+  var $scope;
+  var $el;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function ($compile, $injector, Private) {
+    $rootScope = $injector.get('$rootScope');
+    Field = Private(require('ui/index_patterns/_field'));
+    StringFormat = Private(require('ui/registry/field_formats')).getType('string');
+
+    $rootScope.indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    // set the field format for this field
+    $rootScope.indexPattern.fieldFormatMap.time = new StringFormat({ foo: 1, bar: 2 });
+    $rootScope.indexPattern._indexFields();
+    $rootScope.field = $rootScope.indexPattern.fields.byName.time;
+
+    compile = function () {
+      $el = $compile($('<field-editor field="field" index-pattern="indexPattern">'))($rootScope);
+      $scope = $el.data('$isolateScope');
+    };
+  }));
+
+  describe('$scope', function () {
+    it('is isolated', function () {
+      compile();
+      expect($scope.parent == null).to.be.ok();
+      expect($scope).to.not.be($rootScope);
+    });
+
+    it('exposes $scope.editor, a controller for the editor', function () {
+      compile();
+      var editor = $scope.editor;
+      expect(editor).to.be.an('object');
+    });
+  });
+
+  describe('$scope.editor', function () {
+    var editor;
+
+    beforeEach(function () {
+      compile();
+      editor = $scope.editor;
+    });
+
+    it('exposes editor.indexPattern', function () {
+      expect(editor.indexPattern).to.be($rootScope.indexPattern);
+    });
+
+    it('exposes editor.field', function () {
+      expect(editor.field).to.be.an('object');
+    });
+
+    describe('editor.field', function () {
+      var field;
+      var actual;
+
+      beforeEach(function () {
+        field = editor.field;
+        actual = $rootScope.field;
+      });
+
+      it('looks like the field from the index pattern, but isn\'t', function () {
+        expect(field).to.not.be(actual);
+        expect(field).to.not.be.a(Field);
+        expect(field.name).to.be(actual.name);
+        expect(field.type).to.be(actual.type);
+        expect(field.scripted).to.be(actual.scripted);
+        expect(field.script).to.be(actual.script);
+      });
+
+      it('reflects changes to the index patterns field', function () {
+        var a = {};
+        var b = {};
+
+        actual.script = a;
+        expect(field.script).to.be(a);
+
+        actual.script = b;
+        expect(field.script).to.be(b);
+      });
+
+      it('is fully mutable, unlike the index patterns field', function () {
+        var origName = actual.name;
+        actual.name = 'john';
+        expect(actual.name).to.not.be('john');
+        expect(actual.name).to.be(origName);
+
+        expect(field.name).to.be(origName);
+        field.name = 'john';
+        expect(field.name).to.be('john');
+        expect(actual.name).to.be(origName);
+      });
+    });
+
+    it('exposes editor.formatParams', function () {
+      expect(editor).to.have.property('formatParams');
+      expect(editor.field.format.params()).to.eql(editor.formatParams);
+    });
+
+    describe('editor.formatParams', function () {
+      it('initializes with all of the formats current params', function () {
+        // rebuild the editor
+        compile();
+        editor = $scope.editor;
+
+        expect(editor.formatParams).to.have.property('foo', 1);
+        expect(editor.formatParams).to.have.property('bar', 2);
+      });
+
+      it('updates the fields format when changed', function () {
+        $rootScope.$apply(); // initial apply in order to pick up change
+        editor.formatParams.foo = 200;
+        $rootScope.$apply();
+        expect(editor.field.format.param('foo')).to.be(200);
+      });
+
+    });
+  });
+
+});
\ No newline at end of file
diff --git a/src/kibana/components/field_editor/field_editor.html b/src/ui/public/field_editor/field_editor.html
similarity index 100%
rename from src/kibana/components/field_editor/field_editor.html
rename to src/ui/public/field_editor/field_editor.html
diff --git a/src/ui/public/field_editor/field_editor.js b/src/ui/public/field_editor/field_editor.js
new file mode 100644
index 0000000000000..415e4b2b10edf
--- /dev/null
+++ b/src/ui/public/field_editor/field_editor.js
@@ -0,0 +1,141 @@
+define(function (require) {
+
+  require('ui/field_format_editor');
+
+  require('ui/modules')
+  .get('kibana')
+  .directive('fieldEditor', function (Private, $sce) {
+    var _ = require('lodash');
+    var fieldFormats = Private(require('ui/registry/field_formats'));
+    var Field = Private(require('ui/index_patterns/_field'));
+    var scriptingInfo = $sce.trustAsHtml(require('ui/field_editor/scripting_info.html'));
+    var scriptingWarning = $sce.trustAsHtml(require('ui/field_editor/scripting_warning.html'));
+
+    return {
+      restrict: 'E',
+      template: require('ui/field_editor/field_editor.html'),
+      scope: {
+        getIndexPattern: '&indexPattern',
+        getField: '&field'
+      },
+      controllerAs: 'editor',
+      controller: function ($scope, Notifier, kbnUrl) {
+        var self = this;
+        var notify = new Notifier({ location: 'Field Editor' });
+
+        self.scriptingInfo = scriptingInfo;
+        self.scriptingWarning = scriptingWarning;
+
+        self.indexPattern = $scope.getIndexPattern();
+        self.field = shadowCopy($scope.getField());
+        self.formatParams = self.field.format.params();
+
+        // only init on first create
+        self.creating = !self.indexPattern.fields.byName[self.field.name];
+        self.selectedFormatId = _.get(self.indexPattern, ['fieldFormatMap', self.field.name, 'type', 'id']);
+        self.defFormatType = initDefaultFormat();
+        self.fieldFormatTypes = [self.defFormatType].concat(fieldFormats.byFieldType[self.field.type] || []);
+
+        self.cancel = redirectAway;
+        self.save = function () {
+          var indexPattern = self.indexPattern;
+          var fields = indexPattern.fields;
+          var field = self.field.toActualField();
+
+          fields.remove({ name: field.name });
+          fields.push(field);
+
+          if (!self.selectedFormatId) {
+            delete indexPattern.fieldFormatMap[field.name];
+          } else {
+            indexPattern.fieldFormatMap[field.name] = self.field.format;
+          }
+
+          return indexPattern.save()
+          .then(function () {
+            notify.info('Saved Field "' + self.field.name + '"');
+            redirectAway();
+          });
+        };
+
+        self.delete = function () {
+          var indexPattern = self.indexPattern;
+          var field = self.field;
+
+          indexPattern.fields.remove({ name: field.name });
+          return indexPattern.save()
+          .then(function () {
+            notify.info('Deleted Field "' + field.name + '"');
+            redirectAway();
+          });
+        };
+
+        $scope.$watch('editor.selectedFormatId', function (cur, prev) {
+          var format = self.field.format;
+          var changedFormat = cur !== prev;
+          var missingFormat = cur && (!format || format.type.id !== cur);
+
+          if (!changedFormat || !missingFormat) return;
+
+          // reset to the defaults, but make sure it's an object
+          self.formatParams = _.assign({}, getFieldFormatType().paramDefaults);
+        });
+
+        $scope.$watch('editor.formatParams', function () {
+          var FieldFormat = getFieldFormatType();
+          self.field.format = new FieldFormat(self.formatParams);
+        }, true);
+
+        // copy the defined properties of the field to a plain object
+        // which is mutable, and capture the changed seperately.
+        function shadowCopy(field) {
+          var changes = {};
+          var shadowProps = {
+            toActualField: {
+              // bring the shadow copy out of the shadows
+              value: function toActualField() {
+                return new Field(self.indexPattern, _.defaults({}, changes, field.$$spec));
+              }
+            }
+          };
+
+          Object.getOwnPropertyNames(field).forEach(function (prop) {
+            var desc = Object.getOwnPropertyDescriptor(field, prop);
+            shadowProps[prop] = {
+              enumerable: desc.enumerable,
+              get: function () {
+                return _.has(changes, prop) ? changes[prop] : field[prop];
+              },
+              set: function (v) {
+                changes[prop] = v;
+              }
+            };
+          });
+
+          return Object.create(null, shadowProps);
+        }
+
+        function redirectAway() {
+          kbnUrl.changeToRoute(self.indexPattern, self.field.scripted ? 'scriptedFields' : 'indexedFields');
+        }
+
+        function getFieldFormatType() {
+          if (self.selectedFormatId) return fieldFormats.getType(self.selectedFormatId);
+          else return fieldFormats.getDefaultType(self.field.type);
+        }
+
+        function initDefaultFormat() {
+          var def = Object.create(fieldFormats.getDefaultType(self.field.type));
+
+          // explicitly set to undefined to prevent inheritting the prototypes id
+          def.id = undefined;
+          def.resolvedTitle = def.title;
+          def.title = '- default - ';
+
+          return def;
+        }
+      }
+    };
+  });
+
+});
diff --git a/src/kibana/components/field_editor/scripting_info.html b/src/ui/public/field_editor/scripting_info.html
similarity index 100%
rename from src/kibana/components/field_editor/scripting_info.html
rename to src/ui/public/field_editor/scripting_info.html
diff --git a/src/kibana/components/field_editor/scripting_warning.html b/src/ui/public/field_editor/scripting_warning.html
similarity index 100%
rename from src/kibana/components/field_editor/scripting_warning.html
rename to src/ui/public/field_editor/scripting_warning.html
diff --git a/src/kibana/components/field_format_editor/field_format_editor.js b/src/ui/public/field_format_editor/field_format_editor.js
similarity index 99%
rename from src/kibana/components/field_format_editor/field_format_editor.js
rename to src/ui/public/field_format_editor/field_format_editor.js
index e73520fa0d128..88e7fc4ad65cd 100644
--- a/src/kibana/components/field_format_editor/field_format_editor.js
+++ b/src/ui/public/field_format_editor/field_format_editor.js
@@ -2,7 +2,7 @@ define(function (require) {
   var _ = require('lodash');
   var $ = require('jquery');
 
-  require('modules')
+  require('ui/modules')
   .get('app/settings')
   .directive('fieldFormatEditor', function (Private, $compile) {
     return {
diff --git a/src/kibana/components/field_format_editor/numeral/numeral.html b/src/ui/public/field_format_editor/numeral/numeral.html
similarity index 100%
rename from src/kibana/components/field_format_editor/numeral/numeral.html
rename to src/ui/public/field_format_editor/numeral/numeral.html
diff --git a/src/ui/public/field_format_editor/numeral/numeral.js b/src/ui/public/field_format_editor/numeral/numeral.js
new file mode 100644
index 0000000000000..1146680b253aa
--- /dev/null
+++ b/src/ui/public/field_format_editor/numeral/numeral.js
@@ -0,0 +1,12 @@
+define(function (require) {
+  require('ui/field_format_editor/pattern/pattern');
+
+  require('ui/modules')
+  .get('kibana')
+  .directive('fieldEditorNumeral', function () {
+    return {
+      restrict: 'E',
+      template: require('ui/field_format_editor/numeral/numeral.html')
+    };
+  });
+});
diff --git a/src/kibana/components/field_format_editor/pattern/pattern.html b/src/ui/public/field_format_editor/pattern/pattern.html
similarity index 100%
rename from src/kibana/components/field_format_editor/pattern/pattern.html
rename to src/ui/public/field_format_editor/pattern/pattern.html
diff --git a/src/kibana/components/field_format_editor/pattern/pattern.js b/src/ui/public/field_format_editor/pattern/pattern.js
similarity index 79%
rename from src/kibana/components/field_format_editor/pattern/pattern.js
rename to src/ui/public/field_format_editor/pattern/pattern.js
index a30aedb37c1fb..cbe7d9b730494 100644
--- a/src/kibana/components/field_format_editor/pattern/pattern.js
+++ b/src/ui/public/field_format_editor/pattern/pattern.js
@@ -1,12 +1,12 @@
 define(function (require) {
-  require('components/field_format_editor/samples/samples');
+  require('ui/field_format_editor/samples/samples');
 
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .directive('fieldFormatEditorPattern', function () {
     return {
       restrict: 'E',
-      template: require('text!components/field_format_editor/pattern/pattern.html'),
+      template: require('ui/field_format_editor/pattern/pattern.html'),
       require: ['ngModel', '^fieldEditor'],
       scope: true,
       link: function ($scope, $el, attrs, cntrls) {
diff --git a/src/kibana/components/field_format_editor/samples/samples.html b/src/ui/public/field_format_editor/samples/samples.html
similarity index 100%
rename from src/kibana/components/field_format_editor/samples/samples.html
rename to src/ui/public/field_format_editor/samples/samples.html
diff --git a/src/kibana/components/field_format_editor/samples/samples.js b/src/ui/public/field_format_editor/samples/samples.js
similarity index 91%
rename from src/kibana/components/field_format_editor/samples/samples.js
rename to src/ui/public/field_format_editor/samples/samples.js
index cdc2227423c25..08f6293a446e9 100644
--- a/src/kibana/components/field_format_editor/samples/samples.js
+++ b/src/ui/public/field_format_editor/samples/samples.js
@@ -1,12 +1,12 @@
 define(function (require) {
   var _ = require('lodash');
 
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .directive('fieldFormatEditorSamples', function ($sce, Promise) {
     return {
       restrict: 'E',
-      template: require('text!components/field_format_editor/samples/samples.html'),
+      template: require('ui/field_format_editor/samples/samples.html'),
       require: ['?^ngModel', '^fieldEditor'],
       scope: true,
       link: function ($scope, $el, attrs, cntrls) {
diff --git a/src/ui/public/filter_bar/__tests__/_addFilters.js b/src/ui/public/filter_bar/__tests__/_addFilters.js
new file mode 100644
index 0000000000000..463ed410eb701
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/_addFilters.js
@@ -0,0 +1,149 @@
+describe('add filters', function () {
+  var _ = require('lodash');
+  var sinon = require('auto-release-sinon');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+  var MockState = require('fixtures/mock_state');
+  var storeNames = {
+    app: 'appState',
+    global: 'globalState'
+  };
+  var filters;
+  var queryFilter;
+  var $rootScope, appState, globalState;
+
+  beforeEach(ngMock.module(
+    'kibana',
+    'kibana/courier',
+    'kibana/global_state',
+    function ($provide) {
+      $provide.service('courier', require('fixtures/mock_courier'));
+
+      appState = new MockState({ filters: [] });
+      $provide.service('getAppState', function () {
+        return function () { return appState; };
+      });
+
+      globalState = new MockState({ filters: [] });
+      $provide.service('globalState', function () {
+        return globalState;
+      });
+    }
+  ));
+
+  beforeEach(ngMock.inject(function (_$rootScope_, Private) {
+    $rootScope = _$rootScope_;
+    queryFilter = Private(require('ui/filter_bar/query_filter'));
+  }));
+
+  beforeEach(function () {
+    filters = [
+      {
+        query: { match: { extension: { query: 'jpg', type: 'phrase' } } },
+        meta: { index: 'logstash-*', negate: false, disabled: false }
+      },
+      {
+        query: { match: { '@tags': { query: 'info', type: 'phrase' } } },
+        meta: { index: 'logstash-*', negate: false, disabled: false }
+      },
+      {
+        query: { match: { '_type': { query: 'nginx', type: 'phrase' } } },
+        meta: { index: 'logstash-*', negate: false, disabled: false }
+      }
+    ];
+  });
+
+  describe('adding filters', function () {
+    it('should add filters to appState', function () {
+      $rootScope.$digest();
+
+      queryFilter.addFilters(filters);
+      $rootScope.$digest();
+
+      expect(appState.filters.length).to.be(3);
+      expect(globalState.filters.length).to.be(0);
+    });
+
+    it('should add filters to globalState', function () {
+      $rootScope.$digest();
+
+      queryFilter.addFilters(filters, true);
+      $rootScope.$digest();
+
+      expect(appState.filters.length).to.be(0);
+      expect(globalState.filters.length).to.be(3);
+    });
+
+    it('should accept a single filter', function () {
+      $rootScope.$digest();
+
+      queryFilter.addFilters(filters[0]);
+      $rootScope.$digest();
+
+      expect(appState.filters.length).to.be(1);
+      expect(globalState.filters.length).to.be(0);
+    });
+
+    it('should fire the update and fetch events', function () {
+      var emitSpy = sinon.spy(queryFilter, 'emit');
+
+      // set up the watchers, add new filters, and crank the digest loop
+      $rootScope.$digest();
+      queryFilter.addFilters(filters);
+      $rootScope.$digest();
+
+      // updates should trigger state saves
+      expect(appState.save.callCount).to.be(1);
+      expect(globalState.save.callCount).to.be(1);
+
+      // this time, events should be emitted
+      expect(emitSpy.callCount).to.be(2);
+      expect(emitSpy.firstCall.args[0]).to.be('update');
+      expect(emitSpy.secondCall.args[0]).to.be('fetch');
+
+    });
+  });
+
+  describe('filter reconciliation', function () {
+    it('should de-dupe appState filters being added', function () {
+      var newFilter = _.cloneDeep(filters[1]);
+      appState.filters = filters;
+      $rootScope.$digest();
+      expect(appState.filters.length).to.be(3);
+
+      queryFilter.addFilters(newFilter);
+      $rootScope.$digest();
+      expect(appState.filters.length).to.be(3);
+    });
+
+    it('should de-dupe globalState filters being added', function () {
+      var newFilter = _.cloneDeep(filters[1]);
+      globalState.filters = filters;
+      $rootScope.$digest();
+      expect(globalState.filters.length).to.be(3);
+
+      queryFilter.addFilters(newFilter, true);
+      $rootScope.$digest();
+      expect(globalState.filters.length).to.be(3);
+    });
+
+    it('should mutate global filters on appState filter changes', function () {
+      var idx = 1;
+      globalState.filters = filters;
+      $rootScope.$digest();
+
+      var appFilter = _.cloneDeep(filters[idx]);
+      appFilter.meta.negate = true;
+      queryFilter.addFilters(appFilter);
+      $rootScope.$digest();
+
+      var res = queryFilter.getFilters();
+      expect(res).to.have.length(3);
+      _.each(res, function (filter, i) {
+        expect(filter.$state.store).to.be('globalState');
+        // make sure global filter actually mutated
+        expect(filter.meta.negate).to.be(i === idx);
+      });
+    });
+  });
+});
diff --git a/src/ui/public/filter_bar/__tests__/_getFilters.js b/src/ui/public/filter_bar/__tests__/_getFilters.js
new file mode 100644
index 0000000000000..764e13f6694e9
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/_getFilters.js
@@ -0,0 +1,156 @@
+describe('get filters', function () {
+  var _ = require('lodash');
+  var ngMock = require('ngMock');
+  var expect = require('expect.js');
+  var MockState = require('fixtures/mock_state');
+  var storeNames = {
+    app: 'appState',
+    global: 'globalState'
+  };
+  var queryFilter;
+  var $rootScope, appState, globalState;
+
+  beforeEach(ngMock.module(
+    'kibana',
+    'kibana/global_state',
+    function ($provide) {
+      appState = new MockState({ filters: [] });
+      $provide.service('getAppState', function () {
+        return function () { return appState; };
+      });
+
+      globalState = new MockState({ filters: [] });
+      $provide.service('globalState', function () {
+        return globalState;
+      });
+    }
+  ));
+
+  beforeEach(ngMock.inject(function (_$rootScope_, Private) {
+    $rootScope = _$rootScope_;
+    queryFilter = Private(require('ui/filter_bar/query_filter'));
+  }));
+
+  describe('getFilters method', function () {
+    var filters;
+
+    beforeEach(function () {
+      filters = [
+        { query: { match: { extension: { query: 'jpg', type: 'phrase' } } } },
+        { query: { match: { '@tags': { query: 'info', type: 'phrase' } } } }
+      ];
+    });
+
+    it('should return app and global filters', function () {
+      appState.filters = [filters[0]];
+      globalState.filters = [filters[1]];
+
+      // global filters should be listed first
+      var res = queryFilter.getFilters();
+      expect(res[0]).to.eql(filters[1]);
+      expect(res[1]).to.eql(filters[0]);
+
+      // should return updated version of filters
+      var newFilter = { query: { match: { '_type': { query: 'nginx', type: 'phrase' } } } };
+      appState.filters.push(newFilter);
+
+      res = queryFilter.getFilters();
+      expect(res).to.contain(newFilter);
+    });
+
+    it('should append the state store', function () {
+      appState.filters = [filters[0]];
+      globalState.filters = [filters[1]];
+
+      var res = queryFilter.getFilters();
+      expect(res[0].$state.store).to.be(storeNames.global);
+      expect(res[1].$state.store).to.be(storeNames.app);
+    });
+
+    it('should return filters from specific states', function () {
+      var states = [
+        [ globalState, queryFilter.getGlobalFilters ],
+        [ appState, queryFilter.getAppFilters ],
+      ];
+
+      _.each(states, function (state) {
+        state[0].filters = filters;
+        var res = state[1]();
+        expect(res.length).to.be(state[0].filters.length);
+      });
+    });
+  });
+
+  describe('filter reconciliation', function () {
+    var filters;
+
+    beforeEach(function () {
+      filters = [
+        {
+          query: { match: { extension: { query: 'jpg', type: 'phrase' } } },
+          meta: { negate: false, disabled: false }
+        },
+        {
+          query: { match: { '@tags': { query: 'info', type: 'phrase' } } },
+          meta: { negate: false, disabled: false }
+        },
+        {
+          query: { match: { '_type': { query: 'nginx', type: 'phrase' } } },
+          meta: { negate: false, disabled: false }
+        }
+      ];
+    });
+
+    it('should skip appState filters that match globalState filters', function () {
+      globalState.filters = filters;
+      var appFilter = _.cloneDeep(filters[1]);
+      appState.filters.push(appFilter);
+
+      // global filters should be listed first
+      var res = queryFilter.getFilters();
+      expect(res).to.have.length(3);
+      _.each(res, function (filter) {
+        expect(filter.$state.store).to.be('globalState');
+      });
+    });
+
+    it('should append conflicting appState filters', function () {
+      globalState.filters = filters;
+      var appFilter = _.cloneDeep(filters[1]);
+      appFilter.meta.negate = true;
+      appState.filters.push(appFilter);
+
+      // global filters should be listed first
+      var res = queryFilter.getFilters();
+      expect(res).to.have.length(4);
+      expect(res.filter(function (filter) {
+        return filter.$state.store === storeNames.global;
+      }).length).to.be(3);
+      expect(res.filter(function (filter) {
+        return filter.$state.store === storeNames.app;
+      }).length).to.be(1);
+    });
+
+    it('should not affect disabled filters', function () {
+      // test adding to globalState
+      globalState.filters = _.map(filters, function (filter) {
+        var f = _.cloneDeep(filter);
+        f.meta.disabled = true;
+        return f;
+      });
+      _.each(filters, function (filter) { globalState.filters.push(filter); });
+      var res = queryFilter.getFilters();
+      expect(res).to.have.length(6);
+
+      // test adding to appState
+      globalState.filters = _.map(filters, function (filter) {
+        var f = _.cloneDeep(filter);
+        f.meta.disabled = true;
+        return f;
+      });
+      _.each(filters, function (filter) { appState.filters.push(filter); });
+      res = queryFilter.getFilters();
+      expect(res).to.have.length(6);
+    });
+  });
+});
diff --git a/src/ui/public/filter_bar/__tests__/_invertFilters.js b/src/ui/public/filter_bar/__tests__/_invertFilters.js
new file mode 100644
index 0000000000000..674df94a96e75
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/_invertFilters.js
@@ -0,0 +1,120 @@
+describe('invert filters', function () {
+  var _ = require('lodash');
+  var sinon = require('auto-release-sinon');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+  var MockState = require('fixtures/mock_state');
+  var storeNames = {
+    app: 'appState',
+    global: 'globalState'
+  };
+  var filters;
+  var queryFilter;
+  var $rootScope, appState, globalState;
+
+  beforeEach(ngMock.module(
+    'kibana',
+    'kibana/courier',
+    'kibana/global_state',
+    function ($provide) {
+      $provide.service('courier', require('fixtures/mock_courier'));
+
+      appState = new MockState({ filters: [] });
+      $provide.service('getAppState', function () {
+        return function () { return appState; };
+      });
+
+      globalState = new MockState({ filters: [] });
+      $provide.service('globalState', function () {
+        return globalState;
+      });
+    }
+  ));
+
+  beforeEach(ngMock.inject(function (_$rootScope_, Private) {
+    $rootScope = _$rootScope_;
+    queryFilter = Private(require('ui/filter_bar/query_filter'));
+
+    filters = [
+      {
+        query: { match: { extension: { query: 'jpg', type: 'phrase' } } },
+        meta: { negate: false, disabled: false }
+      },
+      {
+        query: { match: { '@tags': { query: 'info', type: 'phrase' } } },
+        meta: { negate: false, disabled: false }
+      },
+      {
+        query: { match: { '_type': { query: 'nginx', type: 'phrase' } } },
+        meta: { negate: false, disabled: false }
+      }
+    ];
+  }));
+
+  describe('inverting a filter', function () {
+    it('should swap the negate property in appState', function () {
+      _.each(filters, function (filter) {
+        expect(filter.meta.negate).to.be(false);
+        appState.filters.push(filter);
+      });
+
+      queryFilter.invertFilter(filters[1]);
+      expect(appState.filters[1].meta.negate).to.be(true);
+    });
+
+    it('should toggle the negate property in globalState', function () {
+      _.each(filters, function (filter) {
+        expect(filter.meta.negate).to.be(false);
+        globalState.filters.push(filter);
+      });
+
+      queryFilter.invertFilter(filters[1]);
+      expect(globalState.filters[1].meta.negate).to.be(true);
+    });
+
+    it('should fire the update and fetch events', function () {
+      var emitSpy = sinon.spy(queryFilter, 'emit');
+      appState.filters = filters;
+
+      // set up the watchers
+      $rootScope.$digest();
+      queryFilter.invertFilter(filters[1]);
+      // trigger the digest loop to fire the watchers
+      $rootScope.$digest();
+
+      expect(emitSpy.callCount).to.be(2);
+      expect(emitSpy.firstCall.args[0]).to.be('update');
+      expect(emitSpy.secondCall.args[0]).to.be('fetch');
+    });
+  });
+
+  describe('bulk inverting', function () {
+    beforeEach(function () {
+      appState.filters = filters;
+      globalState.filters = _.map(_.cloneDeep(filters), function (filter) {
+        filter.meta.negate = true;
+        return filter;
+      });
+    });
+
+    it('should swap the negate state for all filters', function () {
+      queryFilter.invertAll();
+      _.each(appState.filters, function (filter) {
+        expect(filter.meta.negate).to.be(true);
+      });
+      _.each(globalState.filters, function (filter) {
+        expect(filter.meta.negate).to.be(false);
+      });
+    });
+
+    it('should work without global state filters', function () {
+      // remove global filters
+      delete globalState.filters;
+
+      queryFilter.invertAll();
+      _.each(appState.filters, function (filter) {
+        expect(filter.meta.negate).to.be(true);
+      });
+    });
+  });
+});
diff --git a/src/ui/public/filter_bar/__tests__/_pinFilters.js b/src/ui/public/filter_bar/__tests__/_pinFilters.js
new file mode 100644
index 0000000000000..5511d414b824c
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/_pinFilters.js
@@ -0,0 +1,154 @@
+describe('pin filters', function () {
+  var _ = require('lodash');
+  var sinon = require('auto-release-sinon');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+  var MockState = require('fixtures/mock_state');
+  var storeNames = {
+    app: 'appState',
+    global: 'globalState'
+  };
+  var filters;
+  var queryFilter;
+  var $rootScope, appState, globalState;
+
+  beforeEach(ngMock.module(
+    'kibana',
+    'kibana/courier',
+    'kibana/global_state',
+    function ($provide) {
+      $provide.service('courier', require('fixtures/mock_courier'));
+
+      appState = new MockState({ filters: [] });
+      $provide.service('getAppState', function () {
+        return function () { return appState; };
+      });
+
+      globalState = new MockState({ filters: [] });
+      $provide.service('globalState', function () {
+        return globalState;
+      });
+    }
+  ));
+
+  beforeEach(ngMock.inject(function (_$rootScope_, Private) {
+    $rootScope = _$rootScope_;
+    queryFilter = Private(require('ui/filter_bar/query_filter'));
+
+    filters = [
+      {
+        query: { match: { extension: { query: 'gif', type: 'phrase' } } },
+        meta: { negate: false, disabled: false }
+      },
+      {
+        query: { match: { extension: { query: 'jpg', type: 'phrase' } } },
+        meta: { negate: true, disabled: false }
+      },
+      {
+        query: { match: { extension: { query: 'png', type: 'phrase' } } },
+        meta: { negate: true, disabled: true }
+      },
+      {
+        query: { match: { '@tags': { query: 'info', type: 'phrase' } } },
+        meta: { negate: false, disabled: false }
+      },
+      {
+        query: { match: { '@tags': { query: 'success', type: 'phrase' } } },
+        meta: { negate: false, disabled: false }
+      },
+      {
+        query: { match: { '@tags': { query: 'security', type: 'phrase' } } },
+        meta: { negate: true, disabled: false }
+      },
+      {
+        query: { match: { '_type': { query: 'nginx', type: 'phrase' } } },
+        meta: { negate: false, disabled: false }
+      },
+      {
+        query: { match: { '_type': { query: 'apache', type: 'phrase' } } },
+        meta: { negate: true, disabled: true }
+      }
+    ];
+  }));
+
+  describe('pin a filter', function () {
+    beforeEach(function () {
+      globalState.filters = _.filter(filters, function (filter) {
+        return !!filter.query.match._type;
+      });
+      appState.filters = _.filter(filters, function (filter) {
+        return !filter.query.match._type;
+      });
+      expect(globalState.filters).to.have.length(2);
+      expect(appState.filters).to.have.length(6);
+    });
+
+    it('should move filter from appState to globalState', function () {
+      var filter = appState.filters[1];
+
+      queryFilter.pinFilter(filter);
+      expect(globalState.filters).to.contain(filter);
+      expect(globalState.filters).to.have.length(3);
+      expect(appState.filters).to.have.length(5);
+    });
+
+    it('should move filter from globalState to appState', function () {
+      var filter = globalState.filters[1];
+
+      queryFilter.pinFilter(filter);
+      expect(appState.filters).to.contain(filter);
+      expect(globalState.filters).to.have.length(1);
+      expect(appState.filters).to.have.length(7);
+    });
+
+
+    it('should only fire the update event', function () {
+      var emitSpy = sinon.spy(queryFilter, 'emit');
+      var filter = appState.filters[1];
+      $rootScope.$digest();
+
+      queryFilter.pinFilter(filter);
+      $rootScope.$digest();
+
+      expect(emitSpy.callCount).to.be(1);
+      expect(emitSpy.firstCall.args[0]).to.be('update');
+    });
+  });
+
+  describe('bulk pinning', function () {
+    beforeEach(function () {
+      globalState.filters = _.filter(filters, function (filter) {
+        return !!filter.query.match.extension;
+      });
+      appState.filters = _.filter(filters, function (filter) {
+        return !filter.query.match.extension;
+      });
+      expect(globalState.filters).to.have.length(3);
+      expect(appState.filters).to.have.length(5);
+    });
+
+    it('should swap the filters in both states', function () {
+      var appSample = _.sample(appState.filters);
+      var globalSample = _.sample(globalState.filters);
+
+      queryFilter.pinAll();
+      expect(globalState.filters).to.have.length(5);
+      expect(appState.filters).to.have.length(3);
+
+      expect(globalState.filters).to.contain(appSample);
+      expect(appState.filters).to.contain(globalSample);
+    });
+
+    it('should move all filters to globalState', function () {
+      queryFilter.pinAll(true);
+      expect(globalState.filters).to.have.length(8);
+      expect(appState.filters).to.have.length(0);
+    });
+
+    it('should move all filters to appState', function () {
+      queryFilter.pinAll(false);
+      expect(globalState.filters).to.have.length(0);
+      expect(appState.filters).to.have.length(8);
+    });
+  });
+});
diff --git a/src/ui/public/filter_bar/__tests__/_removeFilters.js b/src/ui/public/filter_bar/__tests__/_removeFilters.js
new file mode 100644
index 0000000000000..3fcdb7c5ea3d6
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/_removeFilters.js
@@ -0,0 +1,141 @@
+describe('remove filters', function () {
+  var _ = require('lodash');
+  var sinon = require('auto-release-sinon');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+  var MockState = require('fixtures/mock_state');
+  var storeNames = {
+    app: 'appState',
+    global: 'globalState'
+  };
+  var filters;
+  var queryFilter;
+  var $rootScope, appState, globalState;
+
+  beforeEach(ngMock.module(
+    'kibana',
+    'kibana/courier',
+    'kibana/global_state',
+    function ($provide) {
+      $provide.service('courier', require('fixtures/mock_courier'));
+
+      appState = new MockState({ filters: [] });
+      $provide.service('getAppState', function () {
+        return function () { return appState; };
+      });
+
+      globalState = new MockState({ filters: [] });
+      $provide.service('globalState', function () {
+        return globalState;
+      });
+    }
+  ));
+
+  beforeEach(ngMock.inject(function (_$rootScope_, Private) {
+    $rootScope = _$rootScope_;
+    queryFilter = Private(require('ui/filter_bar/query_filter'));
+    filters = [
+      {
+        query: { match: { extension: { query: 'jpg', type: 'phrase' } } },
+        meta: { negate: false, disabled: false }
+      },
+      {
+        query: { match: { '@tags': { query: 'info', type: 'phrase' } } },
+        meta: { negate: false, disabled: false }
+      },
+      {
+        query: { match: { '_type': { query: 'nginx', type: 'phrase' } } },
+        meta: { negate: false, disabled: false }
+      }
+    ];
+  }));
+
+  describe('removing a filter', function () {
+    it('should remove the filter from appState', function () {
+      appState.filters = filters;
+      expect(appState.filters).to.have.length(3);
+      queryFilter.removeFilter(filters[0]);
+      expect(appState.filters).to.have.length(2);
+    });
+
+    it('should remove the filter from globalState', function () {
+      globalState.filters = filters;
+      expect(globalState.filters).to.have.length(3);
+      queryFilter.removeFilter(filters[0]);
+      expect(globalState.filters).to.have.length(2);
+    });
+
+    it('should fire the update and fetch events', function () {
+      var emitSpy = sinon.spy(queryFilter, 'emit');
+      appState.filters = filters;
+      $rootScope.$digest();
+
+      queryFilter.removeFilter(filters[0]);
+      $rootScope.$digest();
+
+      expect(emitSpy.callCount).to.be(2);
+      expect(emitSpy.firstCall.args[0]).to.be('update');
+      expect(emitSpy.secondCall.args[0]).to.be('fetch');
+    });
+
+    it('should remove matching filters', function () {
+      globalState.filters.push(filters[0]);
+      globalState.filters.push(filters[1]);
+      appState.filters.push(filters[2]);
+      $rootScope.$digest();
+
+      queryFilter.removeFilter(filters[0]);
+      $rootScope.$digest();
+      expect(globalState.filters).to.have.length(1);
+      expect(appState.filters).to.have.length(1);
+    });
+
+    it('should remove matching filters by comparison', function () {
+      globalState.filters.push(filters[0]);
+      globalState.filters.push(filters[1]);
+      appState.filters.push(filters[2]);
+      $rootScope.$digest();
+
+      queryFilter.removeFilter(_.cloneDeep(filters[0]));
+      $rootScope.$digest();
+      expect(globalState.filters).to.have.length(1);
+      expect(appState.filters).to.have.length(1);
+
+      queryFilter.removeFilter(_.cloneDeep(filters[2]));
+      $rootScope.$digest();
+      expect(globalState.filters).to.have.length(1);
+      expect(appState.filters).to.have.length(0);
+    });
+
+    it('should do nothing with a non-matching filter', function () {
+      globalState.filters.push(filters[0]);
+      globalState.filters.push(filters[1]);
+      appState.filters.push(filters[2]);
+      $rootScope.$digest();
+
+      var missedFilter = _.cloneDeep(filters[0]);
+      missedFilter.meta = {
+        negate: !filters[0].meta.negate
+      };
+
+      queryFilter.removeFilter(missedFilter);
+      $rootScope.$digest();
+      expect(globalState.filters).to.have.length(2);
+      expect(appState.filters).to.have.length(1);
+    });
+  });
+
+  describe('bulk removal', function () {
+    it('should remove all the filters from both states', function () {
+      globalState.filters.push(filters[0]);
+      globalState.filters.push(filters[1]);
+      appState.filters.push(filters[2]);
+      expect(globalState.filters).to.have.length(2);
+      expect(appState.filters).to.have.length(1);
+
+      queryFilter.removeAll();
+      expect(globalState.filters).to.have.length(0);
+      expect(appState.filters).to.have.length(0);
+    });
+  });
+});
diff --git a/src/ui/public/filter_bar/__tests__/_toggleFilters.js b/src/ui/public/filter_bar/__tests__/_toggleFilters.js
new file mode 100644
index 0000000000000..ede42f555fd3d
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/_toggleFilters.js
@@ -0,0 +1,175 @@
+describe('toggle filters', function () {
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+  var sinon = require('auto-release-sinon');
+  var MockState = require('fixtures/mock_state');
+  var storeNames = {
+    app: 'appState',
+    global: 'globalState'
+  };
+  var filters;
+  var queryFilter;
+  var $rootScope, appState, globalState;
+
+  beforeEach(ngMock.module(
+    'kibana',
+    'kibana/courier',
+    'kibana/global_state',
+    function ($provide) {
+      $provide.service('courier', require('fixtures/mock_courier'));
+
+      appState = new MockState({ filters: [] });
+      $provide.service('getAppState', function () {
+        return function () { return appState; };
+      });
+
+      globalState = new MockState({ filters: [] });
+      $provide.service('globalState', function () {
+        return globalState;
+      });
+    }
+  ));
+
+  beforeEach(ngMock.inject(function (_$rootScope_, Private) {
+    $rootScope = _$rootScope_;
+    queryFilter = Private(require('ui/filter_bar/query_filter'));
+    filters = [
+      {
+        query: { match: { extension: { query: 'jpg', type: 'phrase' } } },
+        meta: { negate: false, disabled: false }
+      },
+      {
+        query: { match: { '@tags': { query: 'info', type: 'phrase' } } },
+        meta: { negate: false, disabled: false }
+      },
+      {
+        query: { match: { '_type': { query: 'nginx', type: 'phrase' } } },
+        meta: { negate: false, disabled: false }
+      }
+    ];
+  }));
+
+  describe('toggling a filter', function () {
+    it('should toggle the disabled property in appState', function () {
+      _.each(filters, function (filter) {
+        expect(filter.meta.disabled).to.be(false);
+        appState.filters.push(filter);
+      });
+
+      queryFilter.toggleFilter(filters[1]);
+      expect(appState.filters[1].meta.disabled).to.be(true);
+    });
+
+    it('should toggle the disabled property in globalState', function () {
+      _.each(filters, function (filter) {
+        expect(filter.meta.disabled).to.be(false);
+        globalState.filters.push(filter);
+      });
+
+      queryFilter.toggleFilter(filters[1]);
+      expect(globalState.filters[1].meta.disabled).to.be(true);
+    });
+
+    it('should fire the update and fetch events', function () {
+      var emitSpy = sinon.spy(queryFilter, 'emit');
+      appState.filters = filters;
+      $rootScope.$digest();
+
+      queryFilter.toggleFilter(filters[1]);
+      $rootScope.$digest();
+
+      expect(emitSpy.callCount).to.be(2);
+      expect(emitSpy.firstCall.args[0]).to.be('update');
+      expect(emitSpy.secondCall.args[0]).to.be('fetch');
+    });
+
+    it('should always enable the filter', function () {
+      appState.filters = filters.map(function (filter) {
+        filter.meta.disabled = true;
+        return filter;
+      });
+
+      expect(appState.filters[1].meta.disabled).to.be(true);
+      queryFilter.toggleFilter(filters[1], false);
+      expect(appState.filters[1].meta.disabled).to.be(false);
+      queryFilter.toggleFilter(filters[1], false);
+      expect(appState.filters[1].meta.disabled).to.be(false);
+    });
+
+    it('should always disable the filter', function () {
+      globalState.filters = filters;
+
+      expect(globalState.filters[1].meta.disabled).to.be(false);
+      queryFilter.toggleFilter(filters[1], true);
+      expect(globalState.filters[1].meta.disabled).to.be(true);
+      queryFilter.toggleFilter(filters[1], true);
+      expect(globalState.filters[1].meta.disabled).to.be(true);
+    });
+
+    it('should work without appState', function () {
+      appState = undefined;
+      globalState.filters = filters;
+
+      expect(globalState.filters[1].meta.disabled).to.be(false);
+      expect(queryFilter.getFilters()).to.have.length(3);
+      queryFilter.toggleFilter(filters[1]);
+      expect(globalState.filters[1].meta.disabled).to.be(true);
+    });
+  });
+
+  describe('bulk toggling', function () {
+    beforeEach(function () {
+      appState.filters = filters;
+      globalState.filters = _.map(_.cloneDeep(filters), function (filter) {
+        filter.meta.disabled = true;
+        return filter;
+      });
+    });
+
+    it('should swap the enabled state for all filters', function () {
+      queryFilter.toggleAll();
+      _.each(appState.filters, function (filter) {
+        expect(filter.meta.disabled).to.be(true);
+      });
+      _.each(globalState.filters, function (filter) {
+        expect(filter.meta.disabled).to.be(false);
+      });
+    });
+
+    it('should enable all filters', function () {
+      queryFilter.toggleAll(true);
+      _.each(appState.filters, function (filter) {
+        expect(filter.meta.disabled).to.be(true);
+      });
+      _.each(globalState.filters, function (filter) {
+        expect(filter.meta.disabled).to.be(true);
+      });
+    });
+
+    it('should disable all filters', function () {
+      queryFilter.toggleAll(false);
+      _.each(appState.filters, function (filter) {
+        expect(filter.meta.disabled).to.be(false);
+      });
+      _.each(globalState.filters, function (filter) {
+        expect(filter.meta.disabled).to.be(false);
+      });
+    });
+
+    it('should work without appState', function () {
+      appState = undefined;
+      globalState.filters = filters;
+
+      _.each(globalState.filters, function (filter) {
+        expect(filter.meta.disabled).to.be(false);
+      });
+
+      queryFilter.toggleAll();
+
+      _.each(globalState.filters, function (filter) {
+        expect(filter.meta.disabled).to.be(true);
+      });
+    });
+  });
+});
diff --git a/src/ui/public/filter_bar/__tests__/changeTimeFilter.js b/src/ui/public/filter_bar/__tests__/changeTimeFilter.js
new file mode 100644
index 0000000000000..027034cb2b7ed
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/changeTimeFilter.js
@@ -0,0 +1,38 @@
+
+var moment = require('moment');
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+describe('Filter Bar Directive', function () {
+  describe('changeTimeFilter()', function () {
+
+    var changeTimeFilter, timefilter;
+
+    beforeEach(ngMock.module('kibana'));
+
+    beforeEach(ngMock.inject(function (Private, _timefilter_) {
+      changeTimeFilter = Private(require('ui/filter_bar/lib/changeTimeFilter'));
+      timefilter = _timefilter_;
+    }));
+
+    it('should change the timefilter to match the range gt/lt', function () {
+      var filter = { range: { '@timestamp': { gt: 1388559600000, lt: 1388646000000 } } };
+      changeTimeFilter(filter);
+      expect(timefilter.time.mode).to.be('absolute');
+      expect(moment.isMoment(timefilter.time.to)).to.be(true);
+      expect(timefilter.time.to.isSame('2014-01-02'));
+      expect(moment.isMoment(timefilter.time.from)).to.be(true);
+      expect(timefilter.time.from.isSame('2014-01-01'));
+    });
+
+    it('should change the timefilter to match the range gte/lte', function () {
+      var filter = { range: { '@timestamp': { gte: 1388559600000, lte: 1388646000000 } } };
+      changeTimeFilter(filter);
+      expect(timefilter.time.mode).to.be('absolute');
+      expect(moment.isMoment(timefilter.time.to)).to.be(true);
+      expect(timefilter.time.to.isSame('2014-01-02'));
+      expect(moment.isMoment(timefilter.time.from)).to.be(true);
+      expect(timefilter.time.from.isSame('2014-01-01'));
+    });
+
+  });
+});
diff --git a/src/ui/public/filter_bar/__tests__/dedupFilters.js b/src/ui/public/filter_bar/__tests__/dedupFilters.js
new file mode 100644
index 0000000000000..b5a5d2ddbdeb5
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/dedupFilters.js
@@ -0,0 +1,49 @@
+
+var dedupFilters = require('ui/filter_bar/lib/dedupFilters');
+var expect = require('expect.js');
+describe('Filter Bar Directive', function () {
+  describe('dedupFilters(existing, filters)', function () {
+
+    it('should return only filters which are not in the existing', function () {
+      var existing = [
+        { range: { bytes: { from: 0, to: 1024 } } },
+        { query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
+      ];
+      var filters = [
+        { range: { bytes: { from: 1024, to: 2048 } } },
+        { query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
+      ];
+      var results = dedupFilters(existing, filters);
+      expect(results).to.contain(filters[0]);
+      expect(results).to.not.contain(filters[1]);
+    });
+
+    it('should ignore the disabed attribute when comparing ', function () {
+      var existing = [
+        { range: { bytes: { from: 0, to: 1024 } } },
+        { meta: { disabled: true }, query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
+      ];
+      var filters = [
+        { range: { bytes: { from: 1024, to: 2048 } } },
+        { query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
+      ];
+      var results = dedupFilters(existing, filters);
+      expect(results).to.contain(filters[0]);
+      expect(results).to.not.contain(filters[1]);
+    });
+
+    it('should ignore $state attribute', function () {
+      var existing = [
+        { range: { bytes: { from: 0, to: 1024 } } },
+        { $state: { store: 'appState' }, query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
+      ];
+      var filters = [
+        { range: { bytes: { from: 1024, to: 2048 } } },
+        { $state: { store: 'globalState' }, query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
+      ];
+      var results = dedupFilters(existing, filters);
+      expect(results).to.contain(filters[0]);
+      expect(results).to.not.contain(filters[1]);
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/filter_bar/__tests__/extractTimeFilter.js b/src/ui/public/filter_bar/__tests__/extractTimeFilter.js
new file mode 100644
index 0000000000000..8f7245fd3790c
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/extractTimeFilter.js
@@ -0,0 +1,48 @@
+
+describe('Filter Bar Directive', function () {
+  describe('extractTimeFilter()', function () {
+    var sinon = require('auto-release-sinon');
+    var expect = require('expect.js');
+    var ngMock = require('ngMock');
+    var extractTimeFilter;
+    var $rootScope;
+
+    beforeEach(ngMock.module(
+      'kibana',
+      'kibana/courier',
+      function ($provide) {
+        $provide.service('courier', require('fixtures/mock_courier'));
+      }
+    ));
+
+    beforeEach(ngMock.inject(function (Private, _$rootScope_, Promise) {
+      extractTimeFilter = Private(require('ui/filter_bar/lib/extractTimeFilter'));
+      $rootScope = _$rootScope_;
+    }));
+
+    it('should return the matching filter for the defualt time field', function (done) {
+      var filters = [
+        { meta: { index: 'logstash-*' }, query: { match: { _type:  { query: 'apache', type: 'phrase' } } } },
+        { meta: { index: 'logstash-*' }, range: { 'time': { gt: 1388559600000, lt: 1388646000000 } } }
+      ];
+      extractTimeFilter(filters).then(function (filter) {
+        expect(filter).to.eql(filters[1]);
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+    it('should not return the non-matching filter for the defualt time field', function (done) {
+      var filters = [
+        { meta: { index: 'logstash-*' }, query: { match: { _type:  { query: 'apache', type: 'phrase' } } } },
+        { meta: { index: 'logstash-*' }, range: { '@timestamp': { gt: 1388559600000, lt: 1388646000000 } } }
+      ];
+      extractTimeFilter(filters).then(function (filter) {
+        expect(filter).to.be(undefined);
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+  });
+});
diff --git a/src/ui/public/filter_bar/__tests__/filterAppliedAndUnwrap.js b/src/ui/public/filter_bar/__tests__/filterAppliedAndUnwrap.js
new file mode 100644
index 0000000000000..56bfefd4ec7a9
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/filterAppliedAndUnwrap.js
@@ -0,0 +1,19 @@
+
+var expect = require('expect.js');
+var filterAppliedAndUnwrap = require('ui/filter_bar/lib/filterAppliedAndUnwrap');
+describe('Filter Bar Directive', function () {
+  describe('filterAppliedAndUnwrap()', function () {
+
+    var filters = [
+      { meta: { apply: true }, exists: { field: '_type' } },
+      { meta: { apply: false }, query: { query_string: { query: 'foo:bar' } } }
+    ];
+
+    it('should filter the applied and unwrap the filter', function () {
+      var results = filterAppliedAndUnwrap(filters);
+      expect(results).to.have.length(1);
+      expect(results[0]).to.eql(filters[0]);
+    });
+
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/filter_bar/__tests__/filterOutTimeBasedFilter.js b/src/ui/public/filter_bar/__tests__/filterOutTimeBasedFilter.js
new file mode 100644
index 0000000000000..3b12ef06d9d44
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/filterOutTimeBasedFilter.js
@@ -0,0 +1,38 @@
+
+describe('Filter Bar Directive', function () {
+  describe('filterOutTimeBasedFilter()', function () {
+
+    var expect = require('expect.js');
+    var ngMock = require('ngMock');
+    var sinon = require('auto-release-sinon');
+    var filterOutTimeBasedFilter;
+    var $rootScope;
+
+    beforeEach(ngMock.module(
+      'kibana',
+      'kibana/courier',
+      function ($provide) {
+        $provide.service('courier', require('fixtures/mock_courier'));
+      }
+    ));
+
+    beforeEach(ngMock.inject(function (Private, _$rootScope_, Promise) {
+      filterOutTimeBasedFilter = Private(require('ui/filter_bar/lib/filterOutTimeBasedFilter'));
+      $rootScope = _$rootScope_;
+    }));
+
+    it('should return the matching filter for the defualt time field', function (done) {
+      var filters = [
+        { meta: { index: 'logstash-*' }, query: { match: { _type:  { query: 'apache', type: 'phrase' } } } },
+        { meta: { index: 'logstash-*' }, range: { 'time': { gt: 1388559600000, lt: 1388646000000 } } }
+      ];
+      filterOutTimeBasedFilter(filters).then(function (results) {
+        expect(results).to.have.length(1);
+        expect(results).to.not.contain(filters[1]);
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+  });
+});
diff --git a/src/ui/public/filter_bar/__tests__/filter_bar.js b/src/ui/public/filter_bar/__tests__/filter_bar.js
new file mode 100644
index 0000000000000..a372d1bcc3ac3
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/filter_bar.js
@@ -0,0 +1,81 @@
+
+var angular = require('angular');
+var _ = require('lodash');
+var $ = require('jquery');
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+
+require('ui/filter_bar');
+var MockState = require('fixtures/mock_state');
+
+describe('Filter Bar Directive', function () {
+  var $rootScope, $compile, $timeout, Promise;
+  var appState, queryFilter, mapFilter, $el;
+  // require('testUtils/noDigestPromises').activateForSuite();
+
+  beforeEach(ngMock.module('kibana/global_state', function ($provide) {
+    $provide.service('getAppState', _.constant(_.constant(
+      appState = new MockState({ filters: [] })
+    )));
+  }));
+
+  beforeEach(function () {
+    // load the application
+    ngMock.module('kibana');
+
+    ngMock.module('kibana/courier', function ($provide) {
+      $provide.service('courier', require('fixtures/mock_courier'));
+    });
+
+    ngMock.inject(function (Private, $injector, _$rootScope_, _$compile_, _$timeout_) {
+      $rootScope = _$rootScope_;
+      $compile = _$compile_;
+      $timeout = _$timeout_;
+      Promise = $injector.get('Promise');
+      mapFilter = Private(require('ui/filter_bar/lib/mapFilter'));
+
+      var queryFilter = Private(require('ui/filter_bar/query_filter'));
+      queryFilter.getFilters = function () {
+        return appState.filters;
+      };
+    });
+  });
+
+  describe('Element rendering', function () {
+    beforeEach(function (done) {
+      var filters = [
+        { meta: { index: 'logstash-*' }, query: { match: { '_type': { query: 'apache' } } } },
+        { meta: { index: 'logstash-*' }, query: { match: { '_type': { query: 'nginx' } } } },
+        { meta: { index: 'logstash-*' }, exists: { field: '@timestamp' } },
+        { meta: { index: 'logstash-*' }, missing: { field: 'host' }, disabled: true },
+      ];
+
+      Promise.map(filters, mapFilter).then(function (filters) {
+        appState.filters = filters;
+        $el = $compile('<filter-bar></filter-bar>')($rootScope);
+      });
+
+      var off = $rootScope.$on('filterbar:updated', function () {
+        off();
+        // force a nextTick so it continues *after* the $digest loop completes
+        setTimeout(done, 0);
+      });
+
+      // kick off the digest loop
+      $rootScope.$digest();
+    });
+
+    it('should render all the filters in state', function () {
+      var filters = $el.find('.filter');
+      expect(filters).to.have.length(4);
+      expect($(filters[0]).find('span')[0].innerHTML).to.equal('_type:');
+      expect($(filters[0]).find('span')[1].innerHTML).to.equal('"apache"');
+      expect($(filters[1]).find('span')[0].innerHTML).to.equal('_type:');
+      expect($(filters[1]).find('span')[1].innerHTML).to.equal('"nginx"');
+      expect($(filters[2]).find('span')[0].innerHTML).to.equal('exists:');
+      expect($(filters[2]).find('span')[1].innerHTML).to.equal('"@timestamp"');
+      expect($(filters[3]).find('span')[0].innerHTML).to.equal('missing:');
+      expect($(filters[3]).find('span')[1].innerHTML).to.equal('"host"');
+    });
+  });
+});
diff --git a/src/ui/public/filter_bar/__tests__/generateMappingChain.js b/src/ui/public/filter_bar/__tests__/generateMappingChain.js
new file mode 100644
index 0000000000000..bddc531055f4f
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/generateMappingChain.js
@@ -0,0 +1,112 @@
+
+var generateMappingChain = require('ui/filter_bar/lib/generateMappingChain');
+var sinon = require('auto-release-sinon');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+describe('Filter Bar Directive', function () {
+  describe('generateMappingChain()', function () {
+
+    var generateMappingChain, $rootScope, Promise;
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private, _$rootScope_, _Promise_) {
+      $rootScope = _$rootScope_;
+      Promise    = _Promise_;
+      generateMappingChain = Private(require('ui/filter_bar/lib/generateMappingChain'));
+    }));
+
+
+    it('should create a chaning function which calls the next function if the promise is rejected', function (done) {
+      var filter = {};
+      var mapping = sinon.stub();
+      mapping.returns(Promise.reject(filter));
+      var mappingChainFn = generateMappingChain(mapping);
+      var next = sinon.stub();
+      next.returns(Promise.resolve('good'));
+      var chain = mappingChainFn(next);
+      chain(filter).then(function (result) {
+        expect(result).to.be('good');
+        sinon.assert.calledOnce(next);
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+    it('should create a chaning function which DOES NOT call the next function if the result is resolved', function (done) {
+      var mapping = sinon.stub();
+      mapping.returns(Promise.resolve('good'));
+      var mappingChainFn = generateMappingChain(mapping);
+      var next = sinon.stub();
+      next.returns(Promise.resolve('bad'));
+      var chain = mappingChainFn(next);
+      chain({}).then(function (result) {
+        expect(result).to.be('good');
+        sinon.assert.notCalled(next);
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+    it('should resolve result for the mapping function', function (done) {
+      var mapping = sinon.stub();
+      mapping.returns(Promise.resolve({ key: 'test', value: 'example' }));
+      var mappingChainFn = generateMappingChain(mapping);
+      var next = sinon.stub();
+      var chain = mappingChainFn(next);
+      chain({}).then(function (result) {
+        sinon.assert.notCalled(next);
+        expect(result).to.eql({ key: 'test', value: 'example' });
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+    it('should call the mapping function with the argument to the chain', function (done) {
+      var mapping = sinon.stub();
+      mapping.returns(Promise.resolve({ key: 'test', value: 'example' }));
+      var mappingChainFn = generateMappingChain(mapping);
+      var next = sinon.stub();
+      var chain = mappingChainFn(next);
+      chain({ test: 'example' }).then(function (result) {
+        sinon.assert.calledOnce(mapping);
+        expect(mapping.args[0][0]).to.eql({ test: 'example' });
+        sinon.assert.notCalled(next);
+        expect(result).to.eql({ key: 'test', value: 'example' });
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+    it('should resolve result for the next function', function (done) {
+      var filter = {};
+      var mapping = sinon.stub();
+      mapping.returns(Promise.reject(filter));
+      var mappingChainFn = generateMappingChain(mapping);
+      var next = sinon.stub();
+      next.returns(Promise.resolve({ key: 'test', value: 'example' }));
+      var chain = mappingChainFn(next);
+      chain(filter).then(function (result) {
+        sinon.assert.calledOnce(mapping);
+        sinon.assert.calledOnce(next);
+        expect(result).to.eql({ key: 'test', value: 'example' });
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+    it('should reject with an error if no functions match', function (done) {
+      var filter = {};
+      var mapping = sinon.stub();
+      mapping.returns(Promise.reject(filter));
+      var mappingChainFn = generateMappingChain(mapping);
+      var chain = mappingChainFn();
+      chain(filter).catch(function (err) {
+        expect(err).to.be.an(Error);
+        expect(err.message).to.be('No mappings have been found for filter.');
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/filter_bar/__tests__/mapAndFlattenFilters.js b/src/ui/public/filter_bar/__tests__/mapAndFlattenFilters.js
new file mode 100644
index 0000000000000..2a5a813c0fcfa
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/mapAndFlattenFilters.js
@@ -0,0 +1,57 @@
+
+describe('Filter Bar Directive', function () {
+  describe('mapAndFlattenFilters()', function () {
+    var expect = require('expect.js');
+    var ngMock = require('ngMock');
+    var sinon = require('auto-release-sinon');
+    var mapAndFlattenFilters, $rootScope;
+
+    beforeEach(ngMock.module(
+      'kibana',
+      'kibana/courier',
+      function ($provide) {
+        $provide.service('courier', require('fixtures/mock_courier'));
+      }
+    ));
+
+    beforeEach(ngMock.inject(function (Private, _$rootScope_) {
+      mapAndFlattenFilters = Private(require('ui/filter_bar/lib/mapAndFlattenFilters'));
+      $rootScope = _$rootScope_;
+    }));
+
+    var filters = [
+      null,
+      [
+        { meta: { index: 'logstash-*' }, exists: { field: '_type' } },
+        { meta: { index: 'logstash-*' }, missing: { field: '_type' } }
+      ],
+      { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } },
+      { meta: { index: 'logstash-*' }, range: { bytes: { lt: 2048, gt: 1024 } } },
+      { meta: { index: 'logstash-*' }, query: { match: { _type: { query: 'apache', type: 'phrase' } } } }
+    ];
+
+    it('should map and flatten the filters', function (done) {
+      mapAndFlattenFilters(filters).then(function (results) {
+        expect(results).to.have.length(5);
+        expect(results[0]).to.have.property('meta');
+        expect(results[1]).to.have.property('meta');
+        expect(results[2]).to.have.property('meta');
+        expect(results[3]).to.have.property('meta');
+        expect(results[4]).to.have.property('meta');
+        expect(results[0].meta).to.have.property('key', 'exists');
+        expect(results[0].meta).to.have.property('value', '_type');
+        expect(results[1].meta).to.have.property('key', 'missing');
+        expect(results[1].meta).to.have.property('value', '_type');
+        expect(results[2].meta).to.have.property('key', 'query');
+        expect(results[2].meta).to.have.property('value', 'foo:bar');
+        expect(results[3].meta).to.have.property('key', 'bytes');
+        expect(results[3].meta).to.have.property('value', '1,024 to 2,048');
+        expect(results[4].meta).to.have.property('key', '_type');
+        expect(results[4].meta).to.have.property('value', 'apache');
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+  });
+});
diff --git a/src/ui/public/filter_bar/__tests__/mapDefault.js b/src/ui/public/filter_bar/__tests__/mapDefault.js
new file mode 100644
index 0000000000000..ca6f59f3d413f
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/mapDefault.js
@@ -0,0 +1,35 @@
+
+describe('Filter Bar Directive', function () {
+  describe('mapDefault()', function () {
+
+    var expect = require('expect.js');
+    var ngMock = require('ngMock');
+    var mapDefault, $rootScope;
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private, _$rootScope_) {
+      $rootScope = _$rootScope_;
+      mapDefault = Private(require('ui/filter_bar/lib/mapDefault'));
+    }));
+
+    it('should return the key and value for matching filters', function (done) {
+      var filter = { query: { match_all: {} } };
+      mapDefault(filter).then(function (result) {
+        expect(result).to.have.property('key', 'query');
+        expect(result).to.have.property('value', '{"match_all":{}}');
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+    it('should return undefined for none matching', function (done) {
+      var filter = { range: { gt: 0, lt: 1024 } };
+      mapDefault(filter).catch(function (result) {
+        expect(result).to.be(filter);
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/filter_bar/__tests__/mapExists.js b/src/ui/public/filter_bar/__tests__/mapExists.js
new file mode 100644
index 0000000000000..942c015872bd5
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/mapExists.js
@@ -0,0 +1,34 @@
+
+describe('Filter Bar Directive', function () {
+  describe('mapExists()', function () {
+
+    var expect = require('expect.js');
+    var ngMock = require('ngMock');
+    var mapExists, $rootScope;
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private, _$rootScope_) {
+      $rootScope = _$rootScope_;
+      mapExists = Private(require('ui/filter_bar/lib/mapExists'));
+    }));
+
+    it('should return the key and value for matching filters', function (done) {
+      var filter = { exists: { field: '_type' } };
+      mapExists(filter).then(function (result) {
+        expect(result).to.have.property('key', 'exists');
+        expect(result).to.have.property('value', '_type');
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+    it('should return undefined for none matching', function (done) {
+      var filter = { query: { match: { query: 'foo' } } };
+      mapExists(filter).catch(function (result) {
+        expect(result).to.be(filter);
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/filter_bar/__tests__/mapFilter.js b/src/ui/public/filter_bar/__tests__/mapFilter.js
new file mode 100644
index 0000000000000..5037d5e7b8bd7
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/mapFilter.js
@@ -0,0 +1,87 @@
+
+describe('Filter Bar Directive', function () {
+  var sinon = require('auto-release-sinon');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+  var mapFilter, $rootScope;
+
+
+  beforeEach(ngMock.module(
+    'kibana',
+    'kibana/courier',
+    function ($provide) {
+      $provide.service('courier', require('fixtures/mock_courier'));
+    }
+  ));
+
+  beforeEach(ngMock.inject(function (_$rootScope_, Private) {
+    mapFilter = Private(require('ui/filter_bar/lib/mapFilter'));
+    $rootScope = _$rootScope_;
+  }));
+
+  describe('mapFilter()', function () {
+    it('should map query filters', function (done) {
+      var before = { meta: { index: 'logstash-*' }, query: { match: { '_type': { query: 'apache' } } } };
+      mapFilter(before).then(function (after) {
+        expect(after).to.have.property('meta');
+        expect(after.meta).to.have.property('key', '_type');
+        expect(after.meta).to.have.property('value', 'apache');
+        expect(after.meta).to.have.property('disabled', false);
+        expect(after.meta).to.have.property('negate', false);
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+    it('should map exists filters', function (done) {
+      var before = { meta: { index: 'logstash-*' }, exists: { field: '@timestamp' } };
+      mapFilter(before).then(function (after) {
+        expect(after).to.have.property('meta');
+        expect(after.meta).to.have.property('key', 'exists');
+        expect(after.meta).to.have.property('value', '@timestamp');
+        expect(after.meta).to.have.property('disabled', false);
+        expect(after.meta).to.have.property('negate', false);
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+    it('should map missing filters', function (done) {
+      var before = { meta: { index: 'logstash-*' }, missing: { field: '@timestamp' } };
+      mapFilter(before).then(function (after) {
+        expect(after).to.have.property('meta');
+        expect(after.meta).to.have.property('key', 'missing');
+        expect(after.meta).to.have.property('value', '@timestamp');
+        expect(after.meta).to.have.property('disabled', false);
+        expect(after.meta).to.have.property('negate', false);
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+    it('should map json filter', function (done) {
+      var before = { meta: { index: 'logstash-*' }, query: { match_all: {} } };
+      mapFilter(before).then(function (after) {
+        expect(after).to.have.property('meta');
+        expect(after.meta).to.have.property('key', 'query');
+        expect(after.meta).to.have.property('value', '{"match_all":{}}');
+        expect(after.meta).to.have.property('disabled', false);
+        expect(after.meta).to.have.property('negate', false);
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+    it('should finish with a catch', function (done) {
+      var before = { meta: { index: 'logstash-*' }, foo: '' };
+      mapFilter(before).catch(function (error) {
+        expect(error).to.be.an(Error);
+        expect(error.message).to.be('No mappings have been found for filter.');
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+  });
+
+});
diff --git a/src/ui/public/filter_bar/__tests__/mapFlattenAndWrapFilters.js b/src/ui/public/filter_bar/__tests__/mapFlattenAndWrapFilters.js
new file mode 100644
index 0000000000000..feb9e3a6c4d9d
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/mapFlattenAndWrapFilters.js
@@ -0,0 +1,47 @@
+
+var _ = require('lodash');
+describe('Filter Bar Directive', function () {
+  describe('mapFlattenAndWrapFilters()', function () {
+    var sinon = require('auto-release-sinon');
+    var expect = require('expect.js');
+    var ngMock = require('ngMock');
+    var mapFlattenAndWrapFilters, $rootScope;
+
+    beforeEach(ngMock.module(
+      'kibana',
+      'kibana/courier',
+      function ($provide) {
+        $provide.service('courier', require('fixtures/mock_courier'));
+      }
+    ));
+
+    beforeEach(ngMock.inject(function (Private, _$rootScope_) {
+      mapFlattenAndWrapFilters = Private(require('ui/filter_bar/lib/mapFlattenAndWrapFilters'));
+      $rootScope = _$rootScope_;
+    }));
+
+    var filters = [
+      null,
+      [
+        { meta: { index: 'logstash-*' }, exists: { field: '_type' } },
+        { meta: { index: 'logstash-*' }, missing: { field: '_type' } }
+      ],
+      { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } },
+      { meta: { index: 'logstash-*' }, range: { bytes: { lt: 2048, gt: 1024 } } },
+      { meta: { index: 'logstash-*' }, query: { match: { _type: { query: 'apache', type: 'phrase' } } } }
+    ];
+
+    it('should map, flatten and wrap filters', function (done) {
+      mapFlattenAndWrapFilters(filters).then(function (results) {
+        expect(results).to.have.length(5);
+        _.each(results, function (filter) {
+          expect(filter).to.have.property('meta');
+          expect(filter.meta).to.have.property('apply', true);
+        });
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+  });
+});
diff --git a/src/ui/public/filter_bar/__tests__/mapGeoBoundingBox.js b/src/ui/public/filter_bar/__tests__/mapGeoBoundingBox.js
new file mode 100644
index 0000000000000..873f5576d3a16
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/mapGeoBoundingBox.js
@@ -0,0 +1,60 @@
+
+describe('Filter Bar Directive', function () {
+  describe('mapGeoBoundingBox()', function () {
+    var sinon = require('auto-release-sinon');
+    var expect = require('expect.js');
+    var ngMock = require('ngMock');
+    var mapGeoBoundingBox, $rootScope;
+
+    beforeEach(ngMock.module(
+      'kibana',
+      'kibana/courier',
+      function ($provide) {
+        $provide.service('courier', require('fixtures/mock_courier'));
+      }
+    ));
+
+    beforeEach(ngMock.inject(function (Private, _$rootScope_) {
+      mapGeoBoundingBox = Private(require('ui/filter_bar/lib/mapGeoBoundingBox'));
+      $rootScope = _$rootScope_;
+    }));
+
+    it('should return the key and value for matching filters with bounds', function (done) {
+      var filter = {
+        meta: {
+          index: 'logstash-*'
+        },
+        geo_bounding_box: {
+          point: { // field name
+            top_left: {
+              lat: 5,
+              lon: 10
+            },
+            bottom_right: {
+              lat: 15,
+              lon: 20
+            }
+          }
+        }
+      };
+      mapGeoBoundingBox(filter).then(function (result) {
+        expect(result).to.have.property('key', 'point');
+        expect(result).to.have.property('value');
+        // remove html entities and non-alphanumerics to get the gist of the value
+        expect(result.value.replace(/&[a-z]+?;/g, '').replace(/[^a-z0-9]/g, '')).to.be('lat5lon10tolat15lon20');
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+    it('should return undefined for none matching', function (done) {
+      var filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
+      mapGeoBoundingBox(filter).catch(function (result) {
+        expect(result).to.be(filter);
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+  });
+});
diff --git a/src/ui/public/filter_bar/__tests__/mapMissing.js b/src/ui/public/filter_bar/__tests__/mapMissing.js
new file mode 100644
index 0000000000000..18cff5172b3f2
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/mapMissing.js
@@ -0,0 +1,35 @@
+
+var mapMissing = require('ui/filter_bar/lib/mapMissing');
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+describe('Filter Bar Directive', function () {
+  describe('mapMissing()', function () {
+
+    var mapMissing, $rootScope;
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private, _$rootScope_) {
+      $rootScope = _$rootScope_;
+      mapMissing = Private(require('ui/filter_bar/lib/mapMissing'));
+    }));
+
+    it('should return the key and value for matching filters', function (done) {
+      var filter = { missing: { field: '_type' } };
+      mapMissing(filter).then(function (result) {
+        expect(result).to.have.property('key', 'missing');
+        expect(result).to.have.property('value', '_type');
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+    it('should return undefined for none matching', function (done) {
+      var filter = { query: { match: { query: 'foo' } } };
+      mapMissing(filter).catch(function (result) {
+        expect(result).to.be(filter);
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/filter_bar/__tests__/mapQueryString.js b/src/ui/public/filter_bar/__tests__/mapQueryString.js
new file mode 100644
index 0000000000000..84d5b7f2e8447
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/mapQueryString.js
@@ -0,0 +1,33 @@
+
+describe('Filter Bar Directive', function () {
+  describe('mapQueryString()', function () {
+    var expect = require('expect.js');
+    var ngMock = require('ngMock');
+    var mapQueryString, $rootScope;
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private, _$rootScope_) {
+      $rootScope = _$rootScope_;
+      mapQueryString = Private(require('ui/filter_bar/lib/mapQueryString'));
+    }));
+
+    it('should return the key and value for matching filters', function (done) {
+      var filter = { query: { query_string: { query: 'foo:bar' } } };
+      mapQueryString(filter).then(function (result) {
+        expect(result).to.have.property('key', 'query');
+        expect(result).to.have.property('value', 'foo:bar');
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+    it('should return undefined for none matching', function (done) {
+      var filter = { query: { match: { query: 'foo' } } };
+      mapQueryString(filter).catch(function (result) {
+        expect(result).to.be(filter);
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/filter_bar/__tests__/mapRange.js b/src/ui/public/filter_bar/__tests__/mapRange.js
new file mode 100644
index 0000000000000..f8f723d764976
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/mapRange.js
@@ -0,0 +1,52 @@
+
+describe('Filter Bar Directive', function () {
+  describe('mapRange()', function () {
+    var sinon = require('auto-release-sinon');
+    var expect = require('expect.js');
+    var ngMock = require('ngMock');
+    var mapRange, $rootScope;
+
+    beforeEach(ngMock.module(
+      'kibana',
+      'kibana/courier',
+      function ($provide) {
+        $provide.service('courier', require('fixtures/mock_courier'));
+      }
+    ));
+
+    beforeEach(ngMock.inject(function (Private, _$rootScope_) {
+      mapRange = Private(require('ui/filter_bar/lib/mapRange'));
+      $rootScope = _$rootScope_;
+    }));
+
+    it('should return the key and value for matching filters with gt/lt', function (done) {
+      var filter = { meta: { index: 'logstash-*' }, range: { bytes: { lt: 2048, gt: 1024 } } };
+      mapRange(filter).then(function (result) {
+        expect(result).to.have.property('key', 'bytes');
+        expect(result).to.have.property('value', '1,024 to 2,048');
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+    it('should return the key and value for matching filters with gte/lte', function (done) {
+      var filter = { meta: { index: 'logstash-*' }, range: { bytes: { lte: 2048, gte: 1024 } } };
+      mapRange(filter).then(function (result) {
+        expect(result).to.have.property('key', 'bytes');
+        expect(result).to.have.property('value', '1,024 to 2,048');
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+    it('should return undefined for none matching', function (done) {
+      var filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
+      mapRange(filter).catch(function (result) {
+        expect(result).to.be(filter);
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+  });
+});
diff --git a/src/ui/public/filter_bar/__tests__/mapScript.js b/src/ui/public/filter_bar/__tests__/mapScript.js
new file mode 100644
index 0000000000000..46b89282b4b23
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/mapScript.js
@@ -0,0 +1,45 @@
+
+describe('Filter Bar Directive', function () {
+  describe('mapScript()', function () {
+    var sinon = require('auto-release-sinon');
+    var expect = require('expect.js');
+    var ngMock = require('ngMock');
+    var mapScript, $rootScope;
+
+    beforeEach(ngMock.module(
+      'kibana',
+      'kibana/courier',
+      function ($provide) {
+        $provide.service('courier', require('fixtures/mock_courier'));
+      }
+    ));
+
+    beforeEach(ngMock.inject(function (Private, _$rootScope_) {
+      $rootScope = _$rootScope_;
+      mapScript = Private(require('ui/filter_bar/lib/mapScript'));
+    }));
+
+    it('should return the key and value for matching filters', function (done) {
+      var filter = {
+        meta: { index: 'logstash-*', field: 'script number' },
+        script: { script: 'doc["script number"].value * 5', params: { value: 35}}
+      };
+      mapScript(filter).then(function (result) {
+        expect(result).to.have.property('key', 'script number');
+        expect(result).to.have.property('value', '35');
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+    it('should return undefined for none matching', function (done) {
+      var filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
+      mapScript(filter).catch(function (result) {
+        expect(result).to.be(filter);
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+  });
+});
diff --git a/src/ui/public/filter_bar/__tests__/mapTerms.js b/src/ui/public/filter_bar/__tests__/mapTerms.js
new file mode 100644
index 0000000000000..cbcc6170b2caf
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/mapTerms.js
@@ -0,0 +1,42 @@
+
+describe('Filter Bar Directive', function () {
+  describe('mapTerms()', function () {
+    var sinon = require('auto-release-sinon');
+    var expect = require('expect.js');
+    var ngMock = require('ngMock');
+    var mapTerms, $rootScope;
+
+    beforeEach(ngMock.module(
+      'kibana',
+      'kibana/courier',
+      function ($provide) {
+        $provide.service('courier', require('fixtures/mock_courier'));
+      }
+    ));
+
+    beforeEach(ngMock.inject(function (Private, _$rootScope_) {
+      $rootScope = _$rootScope_;
+      mapTerms = Private(require('ui/filter_bar/lib/mapTerms'));
+    }));
+
+    it('should return the key and value for matching filters', function (done) {
+      var filter = { meta: { index: 'logstash-*' }, query: { match: { _type: { query: 'apache', type: 'phrase' } } } };
+      mapTerms(filter).then(function (result) {
+        expect(result).to.have.property('key', '_type');
+        expect(result).to.have.property('value', 'apache');
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+    it('should return undefined for none matching', function (done) {
+      var filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
+      mapTerms(filter).catch(function (result) {
+        expect(result).to.be(filter);
+        done();
+      });
+      $rootScope.$apply();
+    });
+
+  });
+});
diff --git a/src/ui/public/filter_bar/__tests__/onlyDisabled.js b/src/ui/public/filter_bar/__tests__/onlyDisabled.js
new file mode 100644
index 0000000000000..d63862a361991
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/onlyDisabled.js
@@ -0,0 +1,111 @@
+
+var onlyDisabled = require('ui/filter_bar/lib/onlyDisabled');
+var expect = require('expect.js');
+describe('Filter Bar Directive', function () {
+  describe('onlyDisabled()', function () {
+
+    it('should return true if all filters are disabled', function () {
+      var filters = [
+        { meta: { disabled: true } },
+        { meta: { disabled: true } },
+        { meta: { disabled: true } }
+      ];
+      var newFilters = [{ meta: { disabled: true } }];
+      expect(onlyDisabled(newFilters, filters)).to.be(true);
+    });
+
+    it('should return false if all filters are not disabled', function () {
+      var filters = [
+        { meta: { disabled: false } },
+        { meta: { disabled: false } },
+        { meta: { disabled: false } }
+      ];
+      var newFilters = [{ meta: { disabled: false } }];
+      expect(onlyDisabled(newFilters, filters)).to.be(false);
+    });
+
+    it('should return false if only old filters are disabled', function () {
+      var filters = [
+        { meta: { disabled: true } },
+        { meta: { disabled: true } },
+        { meta: { disabled: true } }
+      ];
+      var newFilters = [{ meta: { disabled: false } }];
+      expect(onlyDisabled(newFilters, filters)).to.be(false);
+    });
+
+    it('should return false if new filters are not disabled', function () {
+      var filters = [
+        { meta: { disabled: false } },
+        { meta: { disabled: false } },
+        { meta: { disabled: false } }
+      ];
+      var newFilters = [{ meta: { disabled: true } }];
+      expect(onlyDisabled(newFilters, filters)).to.be(false);
+    });
+
+    it('should return true when all removed filters were disabled', function () {
+      var filters = [
+        { meta: { disabled: true } },
+        { meta: { disabled: true } },
+        { meta: { disabled: true } }
+      ];
+      var newFilters = [];
+      expect(onlyDisabled(newFilters, filters)).to.be(true);
+    });
+
+    it('should return false when all removed filters were not disabled', function () {
+      var filters = [
+        { meta: { disabled: false } },
+        { meta: { disabled: false } },
+        { meta: { disabled: false } }
+      ];
+      var newFilters = [];
+      expect(onlyDisabled(newFilters, filters)).to.be(false);
+    });
+
+    it('should return true if all changed filters are disabled', function () {
+      var filters = [
+        { meta: { disabled: true, negate: false } },
+        { meta: { disabled: true, negate: false } }
+      ];
+      var newFilters = [
+        { meta: { disabled: true, negate: true } },
+        { meta: { disabled: true, negate: true } }
+      ];
+      expect(onlyDisabled(newFilters, filters)).to.be(true);
+    });
+
+    it('should return false if all filters remove were not disabled', function () {
+      var filters = [
+        { meta: { disabled: false } },
+        { meta: { disabled: false } },
+        { meta: { disabled: true } }
+      ];
+      var newFilters = [{ meta: { disabled: false } }];
+      expect(onlyDisabled(newFilters, filters)).to.be(false);
+    });
+
+    it('should return false when all removed filters are not disabled', function () {
+      var filters = [
+        { meta: { disabled: true } },
+        { meta: { disabled: false } },
+        { meta: { disabled: true } }
+      ];
+      var newFilters = [];
+      expect(onlyDisabled(newFilters, filters)).to.be(false);
+    });
+
+    it('should not throw with null filters', function () {
+      var filters = [
+        null,
+        { meta: { disabled: true } }
+      ];
+      var newFilters = [];
+      expect(function () {
+        onlyDisabled(newFilters, filters);
+      }).to.not.throwError();
+    });
+
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/filter_bar/__tests__/push_filter.js b/src/ui/public/filter_bar/__tests__/push_filter.js
new file mode 100644
index 0000000000000..489464cb5e879
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/push_filter.js
@@ -0,0 +1,69 @@
+
+describe('Filter Bar pushFilter()', function () {
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var pushFilterFn;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private, $injector) {
+    pushFilterFn = Private(require('ui/filter_bar/push_filter'));
+  }));
+
+  it('is a function that returns a function', function () {
+    expect(pushFilterFn).to.be.a(Function);
+    expect(pushFilterFn({})).to.be.a(Function);
+  });
+
+  it('throws an error if passed something besides an object', function () {
+    expect(pushFilterFn).withArgs(true).to.throwError();
+  });
+
+  describe('pushFilter($state)()', function () {
+    var $state;
+    var pushFilter;
+    var filter;
+
+    beforeEach(ngMock.inject(function (Private, $injector) {
+      $state = {filters:[]};
+      pushFilter = pushFilterFn($state);
+      filter = {query: {query_string: {query: ''}}};
+    }));
+
+    it('should create the filters property it needed', function () {
+      var altState = {};
+      pushFilterFn(altState)(filter);
+      expect(altState.filters).to.be.an(Array);
+    });
+
+    it('should replace the filters property instead of modifying it', function () {
+      // If we push directly instead of using pushFilter a $watch('filters') does not trigger
+
+      var oldFilters;
+
+      oldFilters = $state.filters;
+      $state.filters.push(filter);
+      expect($state.filters).to.equal(oldFilters); // Same object
+
+      oldFilters = $state.filters;
+      pushFilter(filter);
+      expect($state.filters).to.not.equal(oldFilters); // New object!
+    });
+
+    it('should add meta data to the filter', function () {
+      pushFilter(filter, true, 'myIndex');
+      expect($state.filters[0].meta).to.be.an(Object);
+
+      expect($state.filters[0].meta.negate).to.be(true);
+      expect($state.filters[0].meta.index).to.be('myIndex');
+
+      pushFilter(filter, false, 'myIndex');
+      expect($state.filters[1].meta.negate).to.be(false);
+    });
+
+
+
+  });
+
+});
\ No newline at end of file
diff --git a/src/ui/public/filter_bar/__tests__/query_filter.js b/src/ui/public/filter_bar/__tests__/query_filter.js
new file mode 100644
index 0000000000000..22bf5d5716170
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/query_filter.js
@@ -0,0 +1,52 @@
+var _ = require('lodash');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+var queryFilter;
+var EventEmitter;
+var $rootScope;
+
+describe('Query Filter', function () {
+  describe('Module', function () {
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (_$rootScope_, Private) {
+      $rootScope = _$rootScope_;
+      queryFilter = Private(require('ui/filter_bar/query_filter'));
+      EventEmitter = Private(require('ui/events'));
+    }));
+
+    describe('module instance', function () {
+      it('should be an event emitter', function () {
+        expect(queryFilter).to.be.an(EventEmitter);
+      });
+    });
+
+    describe('module methods', function () {
+      it('should have methods for getting filters', function () {
+        expect(queryFilter.getFilters).to.be.a('function');
+        expect(queryFilter.getAppFilters).to.be.a('function');
+        expect(queryFilter.getGlobalFilters).to.be.a('function');
+      });
+
+      it('should have methods for modifying filters', function () {
+        expect(queryFilter.addFilters).to.be.a('function');
+        expect(queryFilter.toggleFilter).to.be.a('function');
+        expect(queryFilter.toggleAll).to.be.a('function');
+        expect(queryFilter.removeFilter).to.be.a('function');
+        expect(queryFilter.removeAll).to.be.a('function');
+        expect(queryFilter.invertFilter).to.be.a('function');
+        expect(queryFilter.invertAll).to.be.a('function');
+        expect(queryFilter.pinFilter).to.be.a('function');
+        expect(queryFilter.pinAll).to.be.a('function');
+      });
+    });
+  });
+
+  describe('Actions', function () {
+    require('./_getFilters');
+    require('./_addFilters');
+    require('./_removeFilters');
+    require('./_toggleFilters');
+    require('./_invertFilters');
+    require('./_pinFilters');
+  });
+});
diff --git a/src/ui/public/filter_bar/__tests__/uniqFilters.js b/src/ui/public/filter_bar/__tests__/uniqFilters.js
new file mode 100644
index 0000000000000..8a6ad769fa05e
--- /dev/null
+++ b/src/ui/public/filter_bar/__tests__/uniqFilters.js
@@ -0,0 +1,46 @@
+
+var uniqFilters = require('ui/filter_bar/lib/uniqFilters');
+var expect = require('expect.js');
+describe('Filter Bar Directive', function () {
+  describe('uniqFilter', function () {
+
+    it('should filter out dups', function () {
+      var before = [
+        { query: { _type: { match: { query: 'apache', type: 'phrase' } } } },
+        { query: { _type: { match: { query: 'apache', type: 'phrase' } } } }
+      ];
+      var results = uniqFilters(before);
+      expect(results).to.have.length(1);
+    });
+
+    it('should filter out duplicates, ignoring meta attributes', function () {
+      var before = [
+        {
+          meta: { negate: true },
+          query: { _type: { match: { query: 'apache', type: 'phrase' } } }
+        },
+        {
+          meta: { negate: false },
+          query: { _type: { match: { query: 'apache', type: 'phrase' } } }
+        }
+      ];
+      var results = uniqFilters(before);
+      expect(results).to.have.length(1);
+    });
+
+    it('should filter out duplicates, ignoring $state attributes', function () {
+      var before = [
+        {
+          $state: { store: 'appState' },
+          query: { _type: { match: { query: 'apache', type: 'phrase' } } }
+        },
+        {
+          $state: { store: 'globalState' },
+          query: { _type: { match: { query: 'apache', type: 'phrase' } } }
+        }
+      ];
+      var results = uniqFilters(before);
+      expect(results).to.have.length(1);
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/kibana/components/filter_bar/filter_bar.html b/src/ui/public/filter_bar/filter_bar.html
similarity index 100%
rename from src/kibana/components/filter_bar/filter_bar.html
rename to src/ui/public/filter_bar/filter_bar.html
diff --git a/src/ui/public/filter_bar/filter_bar.js b/src/ui/public/filter_bar/filter_bar.js
new file mode 100644
index 0000000000000..54683560970af
--- /dev/null
+++ b/src/ui/public/filter_bar/filter_bar.js
@@ -0,0 +1,113 @@
+define(function (require) {
+  var _ = require('lodash');
+  var module = require('ui/modules').get('kibana');
+  var template = require('ui/filter_bar/filter_bar.html');
+  var moment = require('moment');
+
+  module.directive('filterBar', function (Private, Promise, getAppState) {
+    var mapAndFlattenFilters = Private(require('ui/filter_bar/lib/mapAndFlattenFilters'));
+    var mapFlattenAndWrapFilters = Private(require('ui/filter_bar/lib/mapFlattenAndWrapFilters'));
+    var extractTimeFilter = Private(require('ui/filter_bar/lib/extractTimeFilter'));
+    var filterOutTimeBasedFilter = Private(require('ui/filter_bar/lib/filterOutTimeBasedFilter'));
+    var filterAppliedAndUnwrap = require('ui/filter_bar/lib/filterAppliedAndUnwrap');
+    var changeTimeFilter = Private(require('ui/filter_bar/lib/changeTimeFilter'));
+    var queryFilter = Private(require('ui/filter_bar/query_filter'));
+
+    return {
+      restrict: 'E',
+      template: template,
+      scope: {},
+      link: function ($scope, $el, attrs) {
+        // bind query filter actions to the scope
+        [
+          'addFilters',
+          'toggleFilter',
+          'toggleAll',
+          'pinFilter',
+          'pinAll',
+          'invertFilter',
+          'invertAll',
+          'removeFilter',
+          'removeAll'
+        ].forEach(function (method) {
+          $scope[method] = queryFilter[method];
+        });
+
+        $scope.state = getAppState();
+
+        $scope.applyFilters = function (filters) {
+          // add new filters
+          $scope.addFilters(filterAppliedAndUnwrap(filters));
+          $scope.newFilters = [];
+
+          // change time filter
+          if ($scope.changeTimeFilter && $scope.changeTimeFilter.meta && $scope.changeTimeFilter.meta.apply) {
+            changeTimeFilter($scope.changeTimeFilter);
+          }
+        };
+
+        $scope.clearFilterBar = function () {
+          $scope.newFilters = [];
+          $scope.changeTimeFilter = null;
+        };
+
+        // update the scope filter list on filter changes
+        $scope.$listen(queryFilter, 'update', function () {
+          updateFilters();
+        });
+
+        // when appState changes, update scope's state
+        $scope.$watch(getAppState, function (appState) {
+          $scope.state = appState;
+        });
+
+        $scope.$watch('state.$newFilters', function (filters) {
+          if (!filters) return;
+
+          // If filters is not undefined and the length is greater than
+          // one we need to set the newFilters attribute and allow the
+          // users to decide what they want to apply.
+          if (filters.length > 1) {
+            return mapFlattenAndWrapFilters(filters)
+            .then(function (results) {
+              extractTimeFilter(results).then(function (filter) {
+                $scope.changeTimeFilter = filter;
+              });
+              return results;
+            })
+            .then(filterOutTimeBasedFilter)
+            .then(function (results) {
+              $scope.newFilters = results;
+            });
+          }
+
+          // Just add single filters to the state.
+          if (filters.length === 1) {
+            Promise.resolve(filters).then(function (filters) {
+              extractTimeFilter(filters)
+              .then(function (timeFilter) {
+                if (timeFilter) changeTimeFilter(timeFilter);
+              });
+              return filters;
+            })
+            .then(filterOutTimeBasedFilter)
+            .then($scope.addFilters);
+          }
+        });
+
+        function updateFilters() {
+          var filters = queryFilter.getFilters();
+          mapAndFlattenFilters(filters).then(function (results) {
+            // used to display the current filters in the state
+            $scope.filters = _.sortBy(results, function (filter) {
+              return !filter.meta.pinned;
+            });
+            $scope.$emit('filterbar:updated');
+          });
+        }
+
+        updateFilters();
+      }
+    };
+  });
+});
diff --git a/src/kibana/components/filter_bar/filter_bar.less b/src/ui/public/filter_bar/filter_bar.less
similarity index 95%
rename from src/kibana/components/filter_bar/filter_bar.less
rename to src/ui/public/filter_bar/filter_bar.less
index 079c5d7fb6077..275c281e21834 100644
--- a/src/kibana/components/filter_bar/filter_bar.less
+++ b/src/ui/public/filter_bar/filter_bar.less
@@ -1,6 +1,4 @@
-@import (reference) "../../styles/_bootstrap.less";
-@import (reference) "../../styles/theme/_theme.less";
-@import (reference) "lesshat.less";
+@import (reference) "~ui/styles/variables";
 
 filter-bar .confirm {
   padding: 8px 10px 4px;
diff --git a/src/kibana/components/filter_bar/filter_bar_click_handler.js b/src/ui/public/filter_bar/filter_bar_click_handler.js
similarity index 100%
rename from src/kibana/components/filter_bar/filter_bar_click_handler.js
rename to src/ui/public/filter_bar/filter_bar_click_handler.js
diff --git a/src/kibana/components/filter_bar/lib/changeTimeFilter.js b/src/ui/public/filter_bar/lib/changeTimeFilter.js
similarity index 100%
rename from src/kibana/components/filter_bar/lib/changeTimeFilter.js
rename to src/ui/public/filter_bar/lib/changeTimeFilter.js
diff --git a/src/kibana/components/filter_bar/lib/compareFilters.js b/src/ui/public/filter_bar/lib/compareFilters.js
similarity index 100%
rename from src/kibana/components/filter_bar/lib/compareFilters.js
rename to src/ui/public/filter_bar/lib/compareFilters.js
diff --git a/src/ui/public/filter_bar/lib/dedupFilters.js b/src/ui/public/filter_bar/lib/dedupFilters.js
new file mode 100644
index 0000000000000..35de867a9f3b6
--- /dev/null
+++ b/src/ui/public/filter_bar/lib/dedupFilters.js
@@ -0,0 +1,22 @@
+define(function (require) {
+  var _ = require('lodash');
+  var angular = require('angular');
+  var compareFilters = require('ui/filter_bar/lib/compareFilters');
+
+  /**
+   * Combine 2 filter collections, removing duplicates
+   * @param {object} existing The filters to compare to
+   * @param {object} filters The filters being added
+   * @param {object} comparatorOptions Parameters to use for comparison
+   * @returns {object} An array of filters that were not in existing
+   */
+  return function (existingFilters, filters, comparatorOptions) {
+    if (!_.isArray(filters)) filters = [filters];
+
+    return _.filter(filters, function (filter) {
+      return !_.find(existingFilters, function (existingFilter) {
+        return compareFilters(existingFilter, filter, comparatorOptions);
+      });
+    });
+  };
+});
diff --git a/src/kibana/components/filter_bar/lib/extractTimeFilter.js b/src/ui/public/filter_bar/lib/extractTimeFilter.js
similarity index 100%
rename from src/kibana/components/filter_bar/lib/extractTimeFilter.js
rename to src/ui/public/filter_bar/lib/extractTimeFilter.js
diff --git a/src/kibana/components/filter_bar/lib/filterAppliedAndUnwrap.js b/src/ui/public/filter_bar/lib/filterAppliedAndUnwrap.js
similarity index 100%
rename from src/kibana/components/filter_bar/lib/filterAppliedAndUnwrap.js
rename to src/ui/public/filter_bar/lib/filterAppliedAndUnwrap.js
diff --git a/src/kibana/components/filter_bar/lib/filterOutTimeBasedFilter.js b/src/ui/public/filter_bar/lib/filterOutTimeBasedFilter.js
similarity index 100%
rename from src/kibana/components/filter_bar/lib/filterOutTimeBasedFilter.js
rename to src/ui/public/filter_bar/lib/filterOutTimeBasedFilter.js
diff --git a/src/kibana/components/filter_bar/lib/generateMappingChain.js b/src/ui/public/filter_bar/lib/generateMappingChain.js
similarity index 100%
rename from src/kibana/components/filter_bar/lib/generateMappingChain.js
rename to src/ui/public/filter_bar/lib/generateMappingChain.js
diff --git a/src/ui/public/filter_bar/lib/mapAndFlattenFilters.js b/src/ui/public/filter_bar/lib/mapAndFlattenFilters.js
new file mode 100644
index 0000000000000..1214e204c648d
--- /dev/null
+++ b/src/ui/public/filter_bar/lib/mapAndFlattenFilters.js
@@ -0,0 +1,14 @@
+define(function (require) {
+  var _ = require('lodash');
+  return function mapAndFlattenFiltersProvider(Private, Promise) {
+    var mapFilter = Private(require('ui/filter_bar/lib/mapFilter'));
+    return function (filters) {
+      return _(filters)
+      .flatten()
+      .compact()
+      .map(mapFilter)
+      .thru(Promise.all)
+      .value();
+    };
+  };
+});
diff --git a/src/kibana/components/filter_bar/lib/mapDefault.js b/src/ui/public/filter_bar/lib/mapDefault.js
similarity index 100%
rename from src/kibana/components/filter_bar/lib/mapDefault.js
rename to src/ui/public/filter_bar/lib/mapDefault.js
diff --git a/src/kibana/components/filter_bar/lib/mapExists.js b/src/ui/public/filter_bar/lib/mapExists.js
similarity index 100%
rename from src/kibana/components/filter_bar/lib/mapExists.js
rename to src/ui/public/filter_bar/lib/mapExists.js
diff --git a/src/kibana/components/filter_bar/lib/mapFilter.js b/src/ui/public/filter_bar/lib/mapFilter.js
similarity index 100%
rename from src/kibana/components/filter_bar/lib/mapFilter.js
rename to src/ui/public/filter_bar/lib/mapFilter.js
diff --git a/src/ui/public/filter_bar/lib/mapFlattenAndWrapFilters.js b/src/ui/public/filter_bar/lib/mapFlattenAndWrapFilters.js
new file mode 100644
index 0000000000000..4eeec597d2806
--- /dev/null
+++ b/src/ui/public/filter_bar/lib/mapFlattenAndWrapFilters.js
@@ -0,0 +1,15 @@
+define(function (require) {
+  var _ = require('lodash');
+  return function mapFlattenAndWrapFilters(Private) {
+    var mapAndFlattenFilters = Private(require('ui/filter_bar/lib/mapAndFlattenFilters'));
+    return function (filters) {
+      return mapAndFlattenFilters(filters).then(function (filters) {
+        return _.map(filters, function (filter) {
+          filter.meta = filter.meta || {};
+          filter.meta.apply = true;
+          return filter;
+        });
+      });
+    };
+  };
+});
diff --git a/src/kibana/components/filter_bar/lib/mapGeoBoundingBox.js b/src/ui/public/filter_bar/lib/mapGeoBoundingBox.js
similarity index 100%
rename from src/kibana/components/filter_bar/lib/mapGeoBoundingBox.js
rename to src/ui/public/filter_bar/lib/mapGeoBoundingBox.js
diff --git a/src/kibana/components/filter_bar/lib/mapMissing.js b/src/ui/public/filter_bar/lib/mapMissing.js
similarity index 100%
rename from src/kibana/components/filter_bar/lib/mapMissing.js
rename to src/ui/public/filter_bar/lib/mapMissing.js
diff --git a/src/kibana/components/filter_bar/lib/mapQueryString.js b/src/ui/public/filter_bar/lib/mapQueryString.js
similarity index 100%
rename from src/kibana/components/filter_bar/lib/mapQueryString.js
rename to src/ui/public/filter_bar/lib/mapQueryString.js
diff --git a/src/kibana/components/filter_bar/lib/mapRange.js b/src/ui/public/filter_bar/lib/mapRange.js
similarity index 100%
rename from src/kibana/components/filter_bar/lib/mapRange.js
rename to src/ui/public/filter_bar/lib/mapRange.js
diff --git a/src/kibana/components/filter_bar/lib/mapScript.js b/src/ui/public/filter_bar/lib/mapScript.js
similarity index 100%
rename from src/kibana/components/filter_bar/lib/mapScript.js
rename to src/ui/public/filter_bar/lib/mapScript.js
diff --git a/src/kibana/components/filter_bar/lib/mapTerms.js b/src/ui/public/filter_bar/lib/mapTerms.js
similarity index 100%
rename from src/kibana/components/filter_bar/lib/mapTerms.js
rename to src/ui/public/filter_bar/lib/mapTerms.js
diff --git a/src/kibana/components/filter_bar/lib/onlyDisabled.js b/src/ui/public/filter_bar/lib/onlyDisabled.js
similarity index 100%
rename from src/kibana/components/filter_bar/lib/onlyDisabled.js
rename to src/ui/public/filter_bar/lib/onlyDisabled.js
diff --git a/src/kibana/components/filter_bar/lib/onlyStateChanged.js b/src/ui/public/filter_bar/lib/onlyStateChanged.js
similarity index 87%
rename from src/kibana/components/filter_bar/lib/onlyStateChanged.js
rename to src/ui/public/filter_bar/lib/onlyStateChanged.js
index 6c6c9b754466f..777a4327eae68 100644
--- a/src/kibana/components/filter_bar/lib/onlyStateChanged.js
+++ b/src/ui/public/filter_bar/lib/onlyStateChanged.js
@@ -1,6 +1,6 @@
 define(function (require) {
   var _ = require('lodash');
-  var compareFilters = require('components/filter_bar/lib/compareFilters');
+  var compareFilters = require('ui/filter_bar/lib/compareFilters');
   var compareOptions = { disabled: true, negate: true };
 
   /**
diff --git a/src/kibana/components/filter_bar/lib/remapFilters.js b/src/ui/public/filter_bar/lib/remapFilters.js
similarity index 100%
rename from src/kibana/components/filter_bar/lib/remapFilters.js
rename to src/ui/public/filter_bar/lib/remapFilters.js
diff --git a/src/ui/public/filter_bar/lib/uniqFilters.js b/src/ui/public/filter_bar/lib/uniqFilters.js
new file mode 100644
index 0000000000000..66023b9ecd203
--- /dev/null
+++ b/src/ui/public/filter_bar/lib/uniqFilters.js
@@ -0,0 +1,17 @@
+define(function (require) {
+  var _ = require('lodash');
+  var dedupFilters = require('ui/filter_bar/lib/dedupFilters');
+
+  /**
+   * Remove duplicate filters from an array of filters
+   * @param {array} filters The filters to remove duplicates from
+   * @returns {object} The original filters array with duplicates removed
+   */
+  return function (filters, comparatorOptions) {
+    var results = [];
+    _.each(filters, function (filter) {
+      results = _.union(results, dedupFilters(results, [filter], comparatorOptions));
+    });
+    return results;
+  };
+});
diff --git a/src/kibana/components/filter_bar/push_filter.js b/src/ui/public/filter_bar/push_filter.js
similarity index 100%
rename from src/kibana/components/filter_bar/push_filter.js
rename to src/ui/public/filter_bar/push_filter.js
diff --git a/src/ui/public/filter_bar/query_filter.js b/src/ui/public/filter_bar/query_filter.js
new file mode 100644
index 0000000000000..b1cab4a37f47c
--- /dev/null
+++ b/src/ui/public/filter_bar/query_filter.js
@@ -0,0 +1,335 @@
+define(function (require) {
+  var _ = require('lodash');
+
+  return function (Private, $rootScope, getAppState, globalState) {
+    var EventEmitter = Private(require('ui/events'));
+    var onlyDisabled = require('ui/filter_bar/lib/onlyDisabled');
+    var onlyStateChanged = require('ui/filter_bar/lib/onlyStateChanged');
+    var uniqFilters = require('ui/filter_bar/lib/uniqFilters');
+    var compareFilters = require('ui/filter_bar/lib/compareFilters');
+    var mapAndFlattenFilters = Private(require('ui/filter_bar/lib/mapAndFlattenFilters'));
+
+    var queryFilter = new EventEmitter();
+
+    queryFilter.getFilters = function () {
+      var compareOptions = { disabled: true, negate: true };
+      var appFilters = queryFilter.getAppFilters();
+      var globalFilters = queryFilter.getGlobalFilters();
+
+      return uniqFilters(globalFilters.concat(appFilters), compareOptions);
+    };
+
+    queryFilter.getAppFilters = function () {
+      var appState = getAppState();
+      if (!appState || !appState.filters) return [];
+      return (appState.filters) ? _.map(appState.filters, appendStoreType('appState')) : [];
+    };
+
+    queryFilter.getGlobalFilters = function () {
+      if (!globalState.filters) return [];
+      return _.map(globalState.filters, appendStoreType('globalState'));
+    };
+
+    /**
+     * Adds new filters to the scope and state
+     * @param {object|array} fitlers Filter(s) to add
+     * @param {bool} global Should be added to global state
+     * @retuns {Promise} filter map promise
+     */
+    queryFilter.addFilters = function (filters, global) {
+      var appState = getAppState();
+      var state = (global) ? globalState : appState;
+
+      if (!_.isArray(filters)) {
+        filters = [filters];
+      }
+
+      return mapAndFlattenFilters(filters)
+      .then(function (filters) {
+        if (global) {
+          // simply concat global filters, they will be deduped
+          globalState.filters = globalState.filters.concat(filters);
+        } else if (appState) {
+          if (!appState.filters) appState.filters = [];
+          appState.filters = appState.filters.concat(filters);
+        }
+      });
+    };
+
+    /**
+     * Removes the filter from the proper state
+     * @param {object} matchFilter The filter to remove
+     */
+    queryFilter.removeFilter = function (matchFilter) {
+      var appState = getAppState();
+      var filter = _.omit(matchFilter, ['$$hashKey']);
+      var state;
+      var index;
+
+      // check for filter in appState
+      if (appState) {
+        index = _.findIndex(appState.filters, filter);
+        if (index !== -1) state = appState;
+      }
+
+      // if not found, check for filter in globalState
+      if (!state) {
+        index = _.findIndex(globalState.filters, filter);
+        if (index !== -1) state = globalState;
+        else return; // not found in either state, do nothing
+      }
+
+      state.filters.splice(index, 1);
+    };
+
+    /**
+     * Removes all filters
+     */
+    queryFilter.removeAll = function () {
+      var appState = getAppState();
+      appState.filters = [];
+      globalState.filters = [];
+    };
+
+    /**
+     * Toggles the filter between enabled/disabled.
+     * @param {object} filter The filter to toggle
+     & @param {boolean} force Disabled true/false
+     * @returns {object} updated filter
+     */
+    queryFilter.toggleFilter = function (filter, force) {
+      // Toggle the disabled flag
+      var disabled = _.isUndefined(force) ? !filter.meta.disabled : !!force;
+      filter.meta.disabled = disabled;
+      return filter;
+    };
+
+    /**
+     * Disables all filters
+     * @params {boolean} force Disable/enable all filters
+     */
+    queryFilter.toggleAll = function (force) {
+      function doToggle(filter) {
+        queryFilter.toggleFilter(filter, force);
+      }
+
+      executeOnFilters(doToggle);
+    };
+
+
+    /**
+     * Inverts the nagate value on the filter
+     * @param {object} filter The filter to toggle
+     * @returns {object} updated filter
+     */
+    queryFilter.invertFilter = function (filter) {
+      // Toggle the negate meta state
+      filter.meta.negate = !filter.meta.negate;
+      return filter;
+    };
+
+    /**
+     * Inverts all filters
+     * @returns {object} Resulting updated filter list
+     */
+    queryFilter.invertAll = function () {
+      executeOnFilters(queryFilter.invertFilter);
+    };
+
+
+    /**
+     * Pins the filter to the global state
+     * @param {object} filter The filter to pin
+     * @param {boolean} force pinned state
+     * @returns {object} updated filter
+     */
+    queryFilter.pinFilter = function (filter, force) {
+      var appState = getAppState();
+      if (!appState) return filter;
+
+      // ensure that both states have a filters property
+      if (!_.isArray(globalState.filters)) globalState.filters = [];
+      if (!_.isArray(appState.filters)) appState.filters = [];
+
+      var appIndex = _.indexOf(appState.filters, filter);
+
+      if (appIndex !== -1 && force !== false) {
+        appState.filters.splice(appIndex, 1);
+        globalState.filters.push(filter);
+      } else {
+        var globalIndex = _.indexOf(globalState.filters, filter);
+
+        if (globalIndex === -1 || force === true) return filter;
+
+        globalState.filters.splice(globalIndex, 1);
+        appState.filters.push(filter);
+      }
+
+      return filter;
+    };
+
+    /**
+     * Pins all filters
+     * @params {boolean} force Pin/Unpin all filters
+     */
+    queryFilter.pinAll = function (force) {
+      function pin(filter) {
+        queryFilter.pinFilter(filter, force);
+      }
+
+      executeOnFilters(pin);
+    };
+
+    initWatchers();
+
+    return queryFilter;
+
+    /**
+     * Saves both app and global states, ensuring filters are persisted
+     * @returns {object} Resulting filter list, app and global combined
+     */
+    function saveState() {
+      var appState = getAppState();
+      if (appState) appState.save();
+      globalState.save();
+    }
+
+    function appendStoreType(type) {
+      return function (filter) {
+        filter.$state = {
+          store: type
+        };
+        return filter;
+      };
+    }
+
+    // helper to run a function on all filters in all states
+    function executeOnFilters(fn) {
+      var appState = getAppState();
+      var globalFilters = [];
+      var appFilters = [];
+
+      if (globalState.filters) globalFilters = globalState.filters;
+      if (appState && appState.filters) appFilters = appState.filters;
+
+      globalFilters.concat(appFilters).forEach(fn);
+    }
+
+    function mergeStateFilters(gFilters, aFilters, compareOptions) {
+      // ensure we don't mutate the filters passed in
+      var globalFilters = gFilters ? _.cloneDeep(gFilters) : [];
+      var appFilters = aFilters ? _.cloneDeep(aFilters) : [];
+      compareOptions = _.defaults(compareOptions || {}, { disabled: true });
+
+      // existing globalFilters should be mutated by appFilters
+      _.each(appFilters, function (filter, i) {
+        var match = _.find(globalFilters, function (globalFilter) {
+          return compareFilters(globalFilter, filter, compareOptions);
+        });
+
+        // no match, do nothing
+        if (!match) return;
+
+        // matching filter in globalState, update global and remove from appState
+        _.assign(match.meta, filter.meta);
+        appFilters.splice(i, 1);
+      });
+
+      return [
+        uniqFilters(globalFilters, { disabled: true }),
+        uniqFilters(appFilters, { disabled: true })
+      ];
+    }
+
+    /**
+     * Initializes state watchers that use the event emitter
+     * @returns {void}
+     */
+    function initWatchers() {
+      var removeAppStateWatchers;
+
+      $rootScope.$watch(getAppState, function () {
+        removeAppStateWatchers && removeAppStateWatchers();
+        removeAppStateWatchers = initAppStateWatchers();
+      });
+
+      function initAppStateWatchers() {
+        // multi watch on the app and global states
+        var stateWatchers = [{
+          fn: $rootScope.$watch,
+          deep: true,
+          get: queryFilter.getGlobalFilters
+        }, {
+          fn: $rootScope.$watch,
+          deep: true,
+          get: queryFilter.getAppFilters
+        }];
+
+        // when states change, use event emitter to trigger updates and fetches
+        return $rootScope.$watchMulti(stateWatchers, function (next, prev) {
+          // prevent execution on watcher instantiation
+          if (_.isEqual(next, prev)) return;
+
+          var doUpdate = false;
+          var doFetch = false;
+
+          // reconcile filter in global and app states
+          var filters = mergeStateFilters(next[0], next[1]);
+          var globalFilters = filters[0];
+          var appFilters = filters[1];
+          var appState = getAppState();
+
+          // save the state, as it may have updated
+          var globalChanged = !_.isEqual(next[0], globalFilters);
+          var appChanged = !_.isEqual(next[1], appFilters);
+
+          // the filters were changed, apply to state (re-triggers this watcher)
+          if (globalChanged || appChanged) {
+            globalState.filters = globalFilters;
+            if (appState) appState.filters = appFilters;
+            return;
+          }
+
+          // check for actions, bail if we're done
+          getActions();
+          if (!doUpdate) return;
+
+          // save states and emit the required events
+          saveState();
+          queryFilter.emit('update')
+          .then(function () {
+            if (!doFetch) return;
+            queryFilter.emit('fetch');
+          });
+
+          // iterate over each state type, checking for changes
+          function getActions() {
+            var newFilters = [];
+            var oldFilters = [];
+
+            stateWatchers.forEach(function (watcher, i) {
+              var nextVal = next[i];
+              var prevVal = prev[i];
+              newFilters = newFilters.concat(nextVal);
+              oldFilters = oldFilters.concat(prevVal);
+
+              // no update or fetch if there was no change
+              if (nextVal === prevVal) return;
+
+              if (nextVal) doUpdate = true;
+
+              // don't trigger fetch when only disabled filters
+              if (!onlyDisabled(nextVal, prevVal)) doFetch = true;
+            });
+
+            // make sure change wasn't only a state move
+            // checking length first is an optimization
+            if (doFetch && newFilters.length === oldFilters.length) {
+              if (onlyStateChanged(newFilters, oldFilters)) doFetch = false;
+            }
+          }
+        });
+      }
+    }
+  };
+});
diff --git a/src/ui/public/filter_manager/__tests__/filter_manager.js b/src/ui/public/filter_manager/__tests__/filter_manager.js
new file mode 100644
index 0000000000000..6e1139be86612
--- /dev/null
+++ b/src/ui/public/filter_manager/__tests__/filter_manager.js
@@ -0,0 +1,130 @@
+var _ = require('lodash');
+var sinon = require('auto-release-sinon');
+var MockState = require('fixtures/mock_state');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+var $rootScope;
+var queryFilter;
+var filterManager;
+var appState;
+
+function checkAddFilters(length, comps, idx) {
+  idx = idx || 0;
+  var filters = queryFilter.addFilters.getCall(idx).args[0];
+
+  expect(filters.length).to.be(length);
+  if (!_.isArray(comps)) return;
+  comps.forEach(function (comp, i) {
+    expect(filters[i]).to.eql(comp);
+  });
+}
+
+describe('Filter Manager', function () {
+  beforeEach(ngMock.module(
+    'kibana',
+    'kibana/courier',
+    'kibana/global_state',
+    function ($provide) {
+      $provide.service('courier', require('fixtures/mock_courier'));
+
+      appState = new MockState({ filters: [] });
+      $provide.service('getAppState', function () {
+        return function () { return appState; };
+      });
+    }
+  ));
+
+  beforeEach(ngMock.inject(function (_$rootScope_, Private) {
+    $rootScope = _$rootScope_;
+    filterManager = Private(require('ui/filter_manager'));
+
+    // mock required queryFilter methods, used in the manager
+    queryFilter = Private(require('ui/filter_bar/query_filter'));
+    sinon.stub(queryFilter, 'getAppFilters', function () {
+      return appState.filters;
+    });
+    sinon.stub(queryFilter, 'addFilters', function (filters) {
+      if (!_.isArray(filters)) filters = [filters];
+      appState.filters = appState.filters.concat(filters);
+    });
+    sinon.stub(queryFilter, 'invertFilter', function (filter) {
+      filter.meta.negate = !filter.meta.negate;
+    });
+  }));
+
+  it('should have an `add` function', function () {
+    expect(filterManager.add).to.be.a(Function);
+  });
+
+  it('should add a filter', function () {
+    filterManager.add('myField', 1, '+', 'myIndex');
+    expect(queryFilter.addFilters.callCount).to.be(1);
+    checkAddFilters(1, [{
+      meta: { index: 'myIndex', negate: false },
+      query: { match: { myField: { query: 1, type: 'phrase'} } }
+    }]);
+  });
+
+  it('should add multiple filters if passed an array of values', function () {
+    filterManager.add('myField', [1, 2, 3], '+', 'myIndex');
+    expect(queryFilter.addFilters.callCount).to.be(1);
+    checkAddFilters(3, [{
+      meta: { index: 'myIndex', negate: false },
+      query: { match: { myField: { query: 1, type: 'phrase'} } }
+    }, {
+      meta: { index: 'myIndex', negate: false },
+      query: { match: { myField: { query: 2, type: 'phrase'} } }
+    }, {
+      meta: { index: 'myIndex', negate: false },
+      query: { match: { myField: { query: 3, type: 'phrase'} } }
+    }]);
+  });
+
+  it('should add an exists filter if _exists_ is used as the field', function () {
+    filterManager.add('_exists_', 'myField', '+', 'myIndex');
+    checkAddFilters(1, [{
+      meta: { index: 'myIndex', negate: false },
+      exists: { field: 'myField' }
+    }]);
+  });
+
+  it('should negate existing filter instead of added a conflicting filter', function () {
+    filterManager.add('myField', 1, '+', 'myIndex');
+    checkAddFilters(1, [{
+      meta: { index: 'myIndex', negate: false },
+      query: { match: { myField: { query: 1, type: 'phrase'} } }
+    }], 0);
+    expect(appState.filters).to.have.length(1);
+
+    // NOTE: negating exists filters also forces disabled to false
+    filterManager.add('myField', 1, '-', 'myIndex');
+    checkAddFilters(0, null, 1);
+    expect(appState.filters).to.have.length(1);
+
+    filterManager.add('_exists_', 'myField', '+', 'myIndex');
+    checkAddFilters(1, [{
+      meta: { index: 'myIndex', negate: false },
+      exists: { field: 'myField' }
+    }], 2);
+    expect(appState.filters).to.have.length(2);
+
+    filterManager.add('_exists_', 'myField', '-', 'myIndex');
+    checkAddFilters(0, null, 3);
+    expect(appState.filters).to.have.length(2);
+  });
+
+  it('should enable matching filters being changed', function () {
+    _.each([true, false], function (negate) {
+      appState.filters = [{
+        query: { match: { myField: { query: 1 } } },
+        meta: { disabled: true, negate: negate }
+      }];
+      expect(appState.filters.length).to.be(1);
+      expect(appState.filters[0].meta.disabled).to.be(true);
+
+      filterManager.add('myField', 1, '+', 'myIndex');
+      expect(appState.filters.length).to.be(1);
+      expect(appState.filters[0].meta.disabled).to.be(false);
+    });
+  });
+});
diff --git a/src/ui/public/filter_manager/__tests__/lib/phrase.js b/src/ui/public/filter_manager/__tests__/lib/phrase.js
new file mode 100644
index 0000000000000..2f2ca75a242e4
--- /dev/null
+++ b/src/ui/public/filter_manager/__tests__/lib/phrase.js
@@ -0,0 +1,43 @@
+
+var fn = require('ui/filter_manager/lib/phrase');
+var expect = require('expect.js');
+var _ = require('lodash');
+var ngMock = require('ngMock');
+var indexPattern, expected;
+describe('Filter Manager', function () {
+  describe('Phrase filter builder', function () {
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private, _$rootScope_, Promise) {
+      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+      expected = _.cloneDeep(require('fixtures/filter_skeleton'));
+    }));
+
+    it('should be a function', function () {
+      expect(fn).to.be.a(Function);
+    });
+
+    it('should return a match query filter when passed a standard field', function () {
+      expected.query = {
+        match: {
+          bytes: {
+            query: 5,
+            type: 'phrase'
+          }
+        }
+      };
+      expect(fn(indexPattern.fields.byName.bytes, 5, indexPattern)).to.eql(expected);
+    });
+
+    it('should return a script filter when passed a scripted field', function () {
+      expected.meta.field = 'script number';
+      expected.script = {
+        script: '(' + indexPattern.fields.byName['script number'].script + ') == value',
+        lang: 'expression',
+        params: {
+          value: 5,
+        }
+      };
+      expect(fn(indexPattern.fields.byName['script number'], 5, indexPattern)).to.eql(expected);
+    });
+  });
+});
diff --git a/src/ui/public/filter_manager/__tests__/lib/query.js b/src/ui/public/filter_manager/__tests__/lib/query.js
new file mode 100644
index 0000000000000..56e95e02dc7c1
--- /dev/null
+++ b/src/ui/public/filter_manager/__tests__/lib/query.js
@@ -0,0 +1,27 @@
+
+var fn = require('ui/filter_manager/lib/query');
+var expect = require('expect.js');
+var _ = require('lodash');
+var ngMock = require('ngMock');
+var indexPattern, expected;
+describe('Filter Manager', function () {
+  describe('Phrase filter builder', function () {
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private, _$rootScope_, Promise) {
+      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+      expected = _.cloneDeep(require('fixtures/filter_skeleton'));
+    }));
+
+    it('should be a function', function () {
+      expect(fn).to.be.a(Function);
+    });
+
+    it('should return a query filter when passed a standard field', function () {
+      expected.query = {
+        foo: 'bar'
+      };
+      expect(fn({foo: 'bar'}, indexPattern.id)).to.eql(expected);
+    });
+
+  });
+});
diff --git a/src/ui/public/filter_manager/__tests__/lib/range.js b/src/ui/public/filter_manager/__tests__/lib/range.js
new file mode 100644
index 0000000000000..69582a9b934f0
--- /dev/null
+++ b/src/ui/public/filter_manager/__tests__/lib/range.js
@@ -0,0 +1,66 @@
+
+var fn = require('ui/filter_manager/lib/range');
+var expect = require('expect.js');
+var _ = require('lodash');
+var ngMock = require('ngMock');
+var indexPattern, expected;
+describe('Filter Manager', function () {
+  describe('Range filter builder', function () {
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private, _$rootScope_, Promise) {
+      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+      expected = _.cloneDeep(require('fixtures/filter_skeleton'));
+    }));
+
+    it('should be a function', function () {
+      expect(fn).to.be.a(Function);
+    });
+
+    it('should return a range filter when passed a standard field', function () {
+      expected.range = {
+        bytes: {
+          gte: 1,
+          lte: 3
+        }
+      };
+      expect(fn(indexPattern.fields.byName.bytes, {gte: 1, lte: 3}, indexPattern)).to.eql(expected);
+    });
+
+    it('should return a script filter when passed a scripted field', function () {
+      expected.meta.field = 'script number';
+      expected.script = {
+        lang: 'expression',
+        script: '(' + indexPattern.fields.byName['script number'].script + ')>=gte && (' +
+          indexPattern.fields.byName['script number'].script + ')<=lte',
+        params: {
+          value: '>=1 <=3',
+          gte: 1,
+          lte: 3
+        }
+      };
+      expect(fn(indexPattern.fields.byName['script number'], {gte: 1, lte: 3}, indexPattern)).to.eql(expected);
+    });
+
+    it('should throw an error when gte and gt, or lte and lt are both passed', function () {
+      expect(function () {
+        fn(indexPattern.fields.byName['script number'], {gte: 1, gt: 3}, indexPattern);
+      }).to.throwError();
+      expect(function () {
+        fn(indexPattern.fields.byName['script number'], {lte: 1, lt: 3}, indexPattern);
+      }).to.throwError();
+    });
+
+    it('to use the right operator for each of gte, gt, lt and lte', function () {
+      _.each({gte: '>=', gt: '>', lte: '<=', lt: '<'}, function (operator, key) {
+        var params = {};
+        params[key] = 5;
+        var filter = fn(indexPattern.fields.byName['script number'], params, indexPattern);
+
+        expect(filter.script.script).to.be('(' + indexPattern.fields.byName['script number'].script + ')' + operator + key);
+        expect(filter.script.params[key]).to.be(5);
+        expect(filter.script.params.value).to.be(operator + 5);
+
+      });
+    });
+  });
+});
diff --git a/src/ui/public/filter_manager/filter_manager.js b/src/ui/public/filter_manager/filter_manager.js
new file mode 100644
index 0000000000000..6be5886ce9fc4
--- /dev/null
+++ b/src/ui/public/filter_manager/filter_manager.js
@@ -0,0 +1,79 @@
+// Adds a filter to a passed state
+define(function (require) {
+  return function (Private) {
+    var _ = require('lodash');
+    var queryFilter = Private(require('ui/filter_bar/query_filter'));
+    var filterManager = {};
+
+    filterManager.add = function (field, values, operation, index) {
+      values = _.isArray(values) ? values : [values];
+      var fieldName = _.isObject(field) ? field.name : field;
+      var filters = _.flatten([queryFilter.getAppFilters()]);
+      var newFilters = [];
+
+      var negate = (operation === '-');
+
+      // TODO: On array fields, negating does not negate the combination, rather all terms
+      _.each(values, function (value) {
+        var filter;
+        var existing = _.find(filters, function (filter) {
+          if (!filter) return;
+
+          if (fieldName === '_exists_' && filter.exists) {
+            return filter.exists.field === value;
+          }
+
+          if (filter.query) {
+            return filter.query.match[fieldName] && filter.query.match[fieldName].query === value;
+          }
+        });
+
+        if (existing) {
+          existing.meta.disabled = false;
+          if (existing.meta.negate !== negate) {
+            queryFilter.invertFilter(existing);
+          }
+          return;
+        }
+
+        switch (fieldName) {
+        case '_exists_':
+          filter = {
+            meta: {
+              negate: negate,
+              index: index
+            },
+            exists: {
+              field: value
+            }
+          };
+          break;
+        default:
+          if (field.scripted) {
+            filter = {
+              meta: { negate: negate, index: index, field: fieldName },
+              script: {
+                script: '(' + field.script + ') == value',
+                lang: field.lang,
+                params: {
+                  value: value
+                }
+              }
+            };
+          } else {
+            filter = { meta: { negate: negate, index: index }, query: { match: {} } };
+            filter.query.match[fieldName] = { query: value, type: 'phrase' };
+          }
+
+          break;
+        }
+
+        newFilters.push(filter);
+      });
+
+      return queryFilter.addFilters(newFilters);
+    };
+
+    return filterManager;
+  };
+});
diff --git a/src/kibana/components/filter_manager/lib/phrase.js b/src/ui/public/filter_manager/lib/phrase.js
similarity index 100%
rename from src/kibana/components/filter_manager/lib/phrase.js
rename to src/ui/public/filter_manager/lib/phrase.js
diff --git a/src/kibana/components/filter_manager/lib/query.js b/src/ui/public/filter_manager/lib/query.js
similarity index 100%
rename from src/kibana/components/filter_manager/lib/query.js
rename to src/ui/public/filter_manager/lib/query.js
diff --git a/src/kibana/components/filter_manager/lib/range.js b/src/ui/public/filter_manager/lib/range.js
similarity index 100%
rename from src/kibana/components/filter_manager/lib/range.js
rename to src/ui/public/filter_manager/lib/range.js
diff --git a/src/ui/public/filters/__tests__/commaList.js b/src/ui/public/filters/__tests__/commaList.js
new file mode 100644
index 0000000000000..461f3e2aeec76
--- /dev/null
+++ b/src/ui/public/filters/__tests__/commaList.js
@@ -0,0 +1,31 @@
+require('ui/filters/commaList');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+describe('Comma-List filter', function () {
+
+  var commaList;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function ($injector) {
+    commaList = $injector.get('commaListFilter');
+  }));
+
+  it('converts a string to a pretty list', function () {
+    expect(commaList('john,jaine,jim', true)).to.be('john, jaine and jim');
+    expect(commaList('john,jaine,jim', false)).to.be('john, jaine or jim');
+  });
+
+  it('can accept an array too', function () {
+    expect(commaList(['john', 'jaine', 'jim'])).to.be('john, jaine or jim');
+  });
+
+  it('handles undefined ok', function () {
+    expect(commaList()).to.be('');
+  });
+
+  it('handls single values ok', function () {
+    expect(commaList(['john'])).to.be('john');
+  });
+
+});
diff --git a/src/ui/public/filters/__tests__/field_type.js b/src/ui/public/filters/__tests__/field_type.js
new file mode 100644
index 0000000000000..3e60f18bcf4c1
--- /dev/null
+++ b/src/ui/public/filters/__tests__/field_type.js
@@ -0,0 +1,63 @@
+var angular = require('angular');
+var expect = require('expect.js');
+var _ = require('lodash');
+var ngMock = require('ngMock');
+require('plugins/kibana/discover/index');
+require('ui/filters/field_type');
+
+var filter, types;
+
+var init = function (expandable) {
+  // Load the application
+  ngMock.module('kibana');
+
+  types = [
+    {name: 's1', type: 'string'},
+    {name: 's2', type: 'string'},
+    {name: 's3', type: 'string'},
+
+    {name: 'n1', type: 'number'},
+    {name: 'n2', type: 'number'},
+
+    {name: 'i1', type: 'ip'},
+    {name: 'd1', type: 'date'},
+  ];
+
+  // Create the scope
+  ngMock.inject(function ($filter) {
+    filter = $filter('fieldType');
+  });
+};
+
+
+describe('fieldType array filter', function () {
+
+  beforeEach(function () {
+    init();
+  });
+
+  it('should have a fieldType filter', function () {
+    expect(filter).to.not.be(null);
+  });
+
+  it('should have 3 string fields', function () {
+    expect(filter(types, 'string').length).to.be(3);
+  });
+
+  it('should have 2 number fields', function () {
+    expect(filter(types, 'number').length).to.be(2);
+  });
+
+  it('should have 1 ip field and 1 date field', function () {
+    expect(_.pluck(filter(types, ['date', 'ip']), 'name')).to.eql(['i1', 'd1']);
+  });
+
+  it('should return all fields when passed *', function () {
+    expect(filter(types, '*').length).to.be(7);
+  });
+
+  it('should allow negation', function () {
+    var resultNames = _.pluck(filter(types, '!string'), 'name');
+    expect(resultNames).to.eql(['n1', 'n2', 'i1', 'd1']);
+  });
+});
diff --git a/src/ui/public/filters/__tests__/label.js b/src/ui/public/filters/__tests__/label.js
new file mode 100644
index 0000000000000..802614fc149ba
--- /dev/null
+++ b/src/ui/public/filters/__tests__/label.js
@@ -0,0 +1,38 @@
+var angular = require('angular');
+var expect = require('expect.js');
+var _ = require('lodash');
+var faker = require('faker');
+var ngMock = require('ngMock');
+
+// Load kibana and its applications
+require('plugins/kibana/discover/index');
+
+var filter;
+
+var init = function (expandable) {
+  // Load the application
+  ngMock.module('kibana');
+
+  // Create the scope
+  ngMock.inject(function ($filter) {
+    filter = $filter('label');
+  });
+};
+
+describe('label filter', function () {
+  beforeEach(function () {
+    init();
+  });
+
+  it('should have a label filter', function () {
+    expect(filter).to.not.be(null);
+  });
+
+  it('should capitalize the first letter in a string', function () {
+    expect(filter('something')).to.be('Something');
+  });
+
+  it('should capitalize the first letter in every word', function () {
+    expect(filter('foo bar fizz buzz')).to.be('Foo Bar Fizz Buzz');
+  });
+});
diff --git a/src/ui/public/filters/__tests__/moment.js b/src/ui/public/filters/__tests__/moment.js
new file mode 100644
index 0000000000000..2ab8b5ee5a68e
--- /dev/null
+++ b/src/ui/public/filters/__tests__/moment.js
@@ -0,0 +1,51 @@
+var angular = require('angular');
+var expect = require('expect.js');
+var sinon = require('auto-release-sinon');
+var moment = require('moment');
+var ngMock = require('ngMock');
+
+require('ui/filters/moment');
+
+var filter, config;
+var anchor = '2014-01-01T06:06:06.666';
+var clock;
+
+var init = function (expandable) {
+  // Load the application
+  ngMock.module('kibana');
+
+  clock = sinon.useFakeTimers(moment(anchor).valueOf());
+
+  // Create the scope
+  ngMock.inject(function ($filter, _config_) {
+    filter = $filter('moment');
+    config = _config_;
+  });
+};
+
+
+describe('moment formatting filter', function () {
+
+  beforeEach(function () {
+    init();
+  });
+
+  it('should have a moment filter', function () {
+    expect(filter).to.not.be(null);
+  });
+
+  // MMMM Do YYYY, HH:mm:ss.SSS
+  it('should format moments', function () {
+    expect(filter(moment())).to.be('January 1st 2014, 06:06:06.666');
+  });
+
+  it('should format dates', function () {
+    expect(filter(new Date())).to.be('January 1st 2014, 06:06:06.666');
+  });
+
+  it('should return the original value if passed anything other than a moment or Date', function () {
+    expect(filter('beer')).to.be('beer');
+    expect(filter(1)).to.be(1);
+    expect(filter([])).to.eql([]);
+  });
+});
diff --git a/src/ui/public/filters/__tests__/rison.js b/src/ui/public/filters/__tests__/rison.js
new file mode 100644
index 0000000000000..eab70d5e08cdd
--- /dev/null
+++ b/src/ui/public/filters/__tests__/rison.js
@@ -0,0 +1,55 @@
+
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+// Load kibana and its applications
+require('plugins/kibana/discover/index');
+
+var rison;
+var risonDecode;
+
+var init = function (expandable) {
+  // Load the application
+  ngMock.module('kibana');
+
+  // Create the scope
+  ngMock.inject(function ($filter) {
+    rison = $filter('rison');
+    risonDecode = $filter('risonDecode');
+  });
+};
+
+describe('rison filters', function () {
+  var testObj = {
+    time: {
+      from: 'now-15m',
+      to: 'now'
+    }
+  };
+  var testRison = '(time:(from:now-15m,to:now))';
+
+  beforeEach(function () {
+    init();
+  });
+
+  describe('rison', function () {
+    it('should have the filter', function () {
+      expect(rison).to.not.be(null);
+    });
+
+    it('should rison encode data', function () {
+      expect(rison(testObj)).to.be(testRison);
+    });
+  });
+
+  describe('risonDecode', function () {
+    it('should have the filter', function () {
+      expect(risonDecode).to.not.be(null);
+    });
+
+    it('should decode rison data', function () {
+      expect(risonDecode(testRison)).to.eql(testObj);
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/filters/__tests__/short_dots.js b/src/ui/public/filters/__tests__/short_dots.js
new file mode 100644
index 0000000000000..435aaca39906c
--- /dev/null
+++ b/src/ui/public/filters/__tests__/short_dots.js
@@ -0,0 +1,51 @@
+var angular = require('angular');
+var expect = require('expect.js');
+var _ = require('lodash');
+var ngMock = require('ngMock');
+
+require('plugins/kibana/discover/index');
+require('ui/filters/short_dots');
+
+var filter, config;
+
+var init = function (expandable) {
+  // Load the application
+  ngMock.module('kibana');
+
+  // Create the scope
+  ngMock.inject(function ($filter, _config_) {
+    config = _config_;
+    filter = $filter('shortDots');
+  });
+};
+
+
+describe('shortDots filter', function () {
+
+  beforeEach(function () {
+    init();
+  });
+
+  it('should have a uriescape filter', function () {
+    expect(filter).to.not.be(null);
+  });
+
+  it('should shorten foo.bar.baz to f.b.baz when shortDots:enable is true', function () {
+    config.set('shortDots:enable', true);
+    expect(filter('foo.bar.baz')).to.be('f.b.baz');
+  });
+
+  it('should not shorten when shortDots:enable is false', function () {
+    config.set('shortDots:enable', false);
+    expect(filter('foo.bar.baz')).to.be('foo.bar.baz');
+  });
+
+  it('should not shorten floating point numbers in any case', function () {
+    config.set('shortDots:enable', false);
+    expect(filter(12345.6789)).to.be(12345.6789);
+    config.set('shortDots:enable', true);
+    expect(filter(12345.6789)).to.be(12345.6789);
+  });
+
+
+});
diff --git a/src/ui/public/filters/__tests__/start_from.js b/src/ui/public/filters/__tests__/start_from.js
new file mode 100644
index 0000000000000..fbb94552c761c
--- /dev/null
+++ b/src/ui/public/filters/__tests__/start_from.js
@@ -0,0 +1,37 @@
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+require('ui/filters/start_from');
+
+var filter;
+
+var init = function (expandable) {
+  // Load the application
+  ngMock.module('kibana');
+
+  // Create the scope
+  ngMock.inject(function ($filter) {
+    filter = $filter('startFrom');
+  });
+};
+
+describe('startFrom array filter', function () {
+
+  beforeEach(function () {
+    init();
+  });
+
+  it('should have a startFrom filter', function () {
+    expect(filter).to.not.be(null);
+  });
+
+  it('should return an empty array if passed undefined', function () {
+    expect(filter(undefined, 10)).to.eql([]);
+  });
+
+  it('should return an array with the first 3 elements removed', function () {
+    expect(filter([1, 2, 3, 4, 5, 6, 7, 8, 9], 3).length).to.be(6);
+  });
+
+});
diff --git a/src/ui/public/filters/__tests__/uriescape.js b/src/ui/public/filters/__tests__/uriescape.js
new file mode 100644
index 0000000000000..5d09813c909b8
--- /dev/null
+++ b/src/ui/public/filters/__tests__/uriescape.js
@@ -0,0 +1,35 @@
+var angular = require('angular');
+var expect = require('expect.js');
+var _ = require('lodash');
+var ngMock = require('ngMock');
+
+require('plugins/kibana/discover/index');
+
+var filter;
+
+var init = function (expandable) {
+  // Load the application
+  ngMock.module('kibana');
+
+  // Create the scope
+  ngMock.inject(function ($filter) {
+    filter = $filter('uriescape');
+  });
+};
+
+
+describe('uriescape filter', function () {
+
+  beforeEach(function () {
+    init();
+  });
+
+  it('should have a uriescape filter', function () {
+    expect(filter).to.not.be(null);
+  });
+
+  it('should encodeURIComponent a string', function () {
+    expect(filter('this and that')).to.be('this%20and%20that');
+  });
+
+});
diff --git a/src/kibana/filters/_prop_filter.js b/src/ui/public/filters/_prop_filter.js
similarity index 100%
rename from src/kibana/filters/_prop_filter.js
rename to src/ui/public/filters/_prop_filter.js
diff --git a/src/ui/public/filters/commaList.js b/src/ui/public/filters/commaList.js
new file mode 100644
index 0000000000000..7967ce1eb3668
--- /dev/null
+++ b/src/ui/public/filters/commaList.js
@@ -0,0 +1,26 @@
+define(function (require) {
+  var _ = require('lodash');
+
+  require('ui/modules')
+  .get('kibana')
+  .filter('commaList', function () {
+    /**
+     * Angular filter that accepts either an array or a comma-seperated string
+     * and outputs either an array, or a comma-seperated string for presentation.
+     *
+     * @param {String|Array} input - The comma-seperated list or array
+     * @param {Boolean} inclusive - Should the list be joined with an "and"?
+     * @return {String}
+     */
+    return function (input, inclusive) {
+      var list = _.commaSeperatedList(input);
+      if (list.length < 2) {
+        return list.join('');
+      }
+
+      var conj = inclusive ? ' and ' : ' or ';
+      return list.slice(0, -1).join(', ') + conj + _.last(list);
+
+    };
+  });
+});
diff --git a/src/ui/public/filters/field_type.js b/src/ui/public/filters/field_type.js
new file mode 100644
index 0000000000000..7c7613d163e55
--- /dev/null
+++ b/src/ui/public/filters/field_type.js
@@ -0,0 +1,13 @@
+// Gets all fields of a given type.
+// You may also pass "*" to get all types
+// Or an array of types to get all fields of that type
+define(function (require) {
+  var _ = require('lodash');
+  var propFilter = require('ui/filters/_prop_filter');
+
+  require('ui/modules')
+  .get('kibana')
+  .filter('fieldType', function () {
+    return propFilter('type');
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/filters/label.js b/src/ui/public/filters/label.js
new file mode 100644
index 0000000000000..827f663b39dfe
--- /dev/null
+++ b/src/ui/public/filters/label.js
@@ -0,0 +1,16 @@
+define(function (require) {
+  require('ui/modules')
+    .get('kibana')
+    .filter('label', function () {
+      return function (str) {
+        var words = str.split(' ');
+        return words.map(capFirst).join(' ');
+      };
+    });
+
+  function capFirst(str) {
+    var i = str[0];
+    var r = new RegExp(i, 'i');
+    return str.replace(r, i.toUpperCase());
+  }
+});
\ No newline at end of file
diff --git a/src/kibana/filters/match_any.js b/src/ui/public/filters/match_any.js
similarity index 96%
rename from src/kibana/filters/match_any.js
rename to src/ui/public/filters/match_any.js
index 08dd1adc9435b..1e1aa3d2ccffc 100644
--- a/src/kibana/filters/match_any.js
+++ b/src/ui/public/filters/match_any.js
@@ -4,7 +4,7 @@
 define(function (require) {
   var _ = require('lodash');
 
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .filter('matchAny', function () {
     return function (items, rules) {
diff --git a/src/ui/public/filters/moment.js b/src/ui/public/filters/moment.js
new file mode 100644
index 0000000000000..2b81806ebd3d1
--- /dev/null
+++ b/src/ui/public/filters/moment.js
@@ -0,0 +1,15 @@
+define(function (require) {
+  var moment = require('moment');
+  var _ = require('lodash');
+
+  require('ui/modules')
+    .get('kibana')
+    .filter('moment', function (config) {
+    return function (datetime) {
+      var format = config.get('dateFormat');
+      if (moment.isMoment(datetime)) return datetime.format(format);
+      if (_.isDate(datetime)) return moment(datetime).format(format);
+      return datetime;
+    };
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/filters/rison.js b/src/ui/public/filters/rison.js
new file mode 100644
index 0000000000000..a7d3448adc339
--- /dev/null
+++ b/src/ui/public/filters/rison.js
@@ -0,0 +1,16 @@
+define(function (require) {
+  var rison = require('ui/utils/rison');
+  var module = require('ui/modules').get('kibana');
+
+  module.filter('rison', function () {
+    return function (str) {
+      return rison.encode(str);
+    };
+  });
+
+  module.filter('risonDecode', function () {
+    return function (str) {
+      return rison.decode(str);
+    };
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/filters/short_dots.js b/src/ui/public/filters/short_dots.js
new file mode 100644
index 0000000000000..0496dd64c33e7
--- /dev/null
+++ b/src/ui/public/filters/short_dots.js
@@ -0,0 +1,30 @@
+// Shorts dot notated strings
+// eg: foo.bar.baz becomes f.b.baz
+// 'foo.bar.baz'.replace(/(.+?\.)/g,function(v) {return v[0]+'.';});
+define(function (require) {
+  var _ = require('lodash');
+
+  require('ui/modules')
+    .get('kibana')
+    .filter('shortDots', function (Private) {
+      return Private(shortDotsFilterProvider);
+    });
+
+  function shortDotsFilterProvider(config, $rootScope) {
+    var filter;
+
+    function updateFilter() {
+      filter = config.get('shortDots:enable') ? _.shortenDottedString : _.identity;
+    }
+
+    updateFilter();
+    $rootScope.$on('change:config.shortDots:enable', updateFilter);
+    $rootScope.$on('init:config', updateFilter);
+
+    return function (str) {
+      return filter(str);
+    };
+  }
+
+  return shortDotsFilterProvider;
+});
diff --git a/src/ui/public/filters/start_from.js b/src/ui/public/filters/start_from.js
new file mode 100644
index 0000000000000..634addf1305d2
--- /dev/null
+++ b/src/ui/public/filters/start_from.js
@@ -0,0 +1,11 @@
+define(function (require) {
+  require('ui/modules')
+    .get('kibana')
+    .filter('startFrom', function () {
+      return function (input, start) {
+        if (!input) return [];
+        start = +start; //parse to int
+        return input.slice(start);
+      };
+    });
+});
\ No newline at end of file
diff --git a/src/kibana/filters/trust_as_html.js b/src/ui/public/filters/trust_as_html.js
similarity index 84%
rename from src/kibana/filters/trust_as_html.js
rename to src/ui/public/filters/trust_as_html.js
index 3fcfdbb535f10..b828948d10972 100644
--- a/src/kibana/filters/trust_as_html.js
+++ b/src/ui/public/filters/trust_as_html.js
@@ -1,6 +1,6 @@
 define(function (require) {
   var angular = require('angular');
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
 
   // Simple filter to allow using ng-bind-html without explicitly calling $sce.trustAsHtml in a controller
   // (See http://goo.gl/mpj9o2)
diff --git a/src/kibana/filters/unique.js b/src/ui/public/filters/unique.js
similarity index 91%
rename from src/kibana/filters/unique.js
rename to src/ui/public/filters/unique.js
index 1c1a371472015..cb010a2bd52b9 100644
--- a/src/kibana/filters/unique.js
+++ b/src/ui/public/filters/unique.js
@@ -2,7 +2,7 @@
 define(function (require) {
   var _ = require('lodash');
 
-  require('modules')
+  require('ui/modules')
     .get('kibana')
     .filter('unique', function () {
       return function (arr) {
diff --git a/src/ui/public/filters/uriescape.js b/src/ui/public/filters/uriescape.js
new file mode 100644
index 0000000000000..4f1d0e6917d8e
--- /dev/null
+++ b/src/ui/public/filters/uriescape.js
@@ -0,0 +1,9 @@
+define(function (require) {
+  require('ui/modules')
+    .get('kibana')
+    .filter('uriescape', function () {
+      return function (str) {
+        return encodeURIComponent(str);
+      };
+    });
+});
\ No newline at end of file
diff --git a/src/ui/public/fixedScroll.js b/src/ui/public/fixedScroll.js
new file mode 100644
index 0000000000000..431c78656b5ae
--- /dev/null
+++ b/src/ui/public/fixedScroll.js
@@ -0,0 +1,114 @@
+define(function (require) {
+  var $ = require('jquery');
+  var _ = require('lodash');
+
+  var SCROLLER_HEIGHT = 20;
+
+  require('ui/modules')
+  .get('kibana')
+  .directive('fixedScroll', function ($timeout) {
+    return {
+      restrict: 'A',
+      link: function ($scope, $el) {
+        var $window = $(window);
+        var $scroller = $('<div class="fixed-scroll-scroller">').height(SCROLLER_HEIGHT);
+
+        /**
+         * Listen for scroll events on the $scroller and the $el, sets unlisten()
+         *
+         * unlisten must be called before calling or listen() will throw an Error
+         *
+         * Since the browser emits "scroll" events after setting scrollLeft
+         * the listeners also prevent tug-of-war
+         *
+         * @throws {Error} If unlisten was not called first
+         * @return {undefined}
+         */
+        function listen() {
+          if (unlisten !== _.noop) {
+            throw new Error('fixedScroll listeners were not cleaned up properly before re-listening!');
+          }
+
+          var blockTo;
+          function bind($from, $to) {
+            function handler() {
+              if (blockTo === $to) return (blockTo = null);
+              $to.scrollLeft((blockTo = $from).scrollLeft());
+            }
+
+            $from.on('scroll', handler);
+            return function () {
+              $from.off('scroll', handler);
+            };
+          }
+
+          unlisten = _.flow(
+            bind($el, $scroller),
+            bind($scroller, $el),
+            function () { unlisten = _.noop; }
+          );
+        }
+
+        /**
+         * Remove the listeners bound in listen()
+         * @type {function}
+         */
+        var unlisten = _.noop;
+
+        /**
+         * Revert DOM changes and event listeners
+         * @return {undefined}
+         */
+        function cleanUp() {
+          unlisten();
+          $scroller.detach();
+          $el.css('padding-bottom', 0);
+        }
+
+        /**
+         * Modify the DOM and attach event listeners based on need.
+         * Is called many times to re-setup, must be idempotent
+         * @return {undefined}
+         */
+        function setup() {
+          cleanUp();
+
+          var containerWidth = $el.width();
+          var contentWidth = $el.prop('scrollWidth');
+          var containerHorizOverflow = contentWidth - containerWidth;
+
+          var elTop = $el.offset().top - $window.scrollTop();
+          var elBottom = elTop + $el.height();
+          var windowVertOverflow = elBottom - $window.height();
+
+          var requireScroller = containerHorizOverflow > 0 && windowVertOverflow > 0;
+          if (!requireScroller) return;
+
+          // push the content away from the scroller
+          $el.css('padding-bottom', SCROLLER_HEIGHT);
+
+          // fill the scroller with a dummy element that mimics the content
+          $scroller
+          .width(containerWidth)
+          .html($('<div>').css({ width: contentWidth, height: SCROLLER_HEIGHT }))
+          .insertAfter($el);
+
+          // listen for scroll events
+          listen();
+        }
+
+        // reset when the width or scrollWidth of the $el changes
+        $scope.$watchMulti([
+          function () { return $el.prop('scrollWidth'); },
+          function () { return $el.width(); }
+        ], setup);
+
+        // cleanup when the scope is destroyed
+        $scope.$on('$destroy', function () {
+          cleanUp();
+          $scroller = $window = null;
+        });
+      }
+    };
+  });
+});
diff --git a/src/ui/public/highlight/__tests__/highlight.js b/src/ui/public/highlight/__tests__/highlight.js
new file mode 100644
index 0000000000000..73852e6713e75
--- /dev/null
+++ b/src/ui/public/highlight/__tests__/highlight.js
@@ -0,0 +1,71 @@
+
+describe('Highlight', function () {
+  var angular = require('angular');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+  require('ui/highlight');
+
+  var filter, tags;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (highlightFilter, highlightTags) {
+    filter = highlightFilter;
+    tags = highlightTags;
+  }));
+
+  var text = '' +
+    'Bacon ipsum dolor amet pork loin pork cow pig beef chuck ground round shankle sirloin landjaeger kevin ' +
+    'venison sausage ribeye tongue. Chicken bacon ball tip pork. Brisket pork capicola spare ribs pastrami rump ' +
+    'sirloin, t-bone ham shoulder jerky turducken bresaola. Chicken cow beef picanha. Picanha hamburger alcatra ' +
+    'cupim. Salami capicola boudin pork belly shank picanha.';
+
+  it('should not modify text if highlight is empty', function () {
+    expect(filter(text, undefined)).to.be(text);
+    expect(filter(text, null)).to.be(text);
+    expect(filter(text, [])).to.be(text);
+  });
+
+  it('should highlight a single result', function () {
+    var highlights = [
+      tags.pre + 'hamburger' + tags.post + ' alcatra cupim. Salami capicola boudin pork belly shank picanha.'
+    ];
+    var result = filter(text, highlights);
+    expect(result.indexOf('<mark>hamburger</mark>')).to.be.greaterThan(-1);
+    expect(result.split('<mark>hamburger</mark>').length).to.be(text.split('hamburger').length);
+  });
+
+  it('should highlight multiple results', function () {
+    var highlights = [
+      'kevin venison sausage ribeye tongue. ' + tags.pre + 'Chicken' + tags.post + ' bacon ball tip pork. Brisket ' +
+      'pork capicola spare ribs pastrami rump sirloin, t-bone ham shoulder jerky turducken bresaola. ' + tags.pre +
+      'Chicken' + tags.post + ' cow beef picanha. Picanha'
+    ];
+    var result = filter(text, highlights);
+    expect(result.indexOf('<mark>Chicken</mark>')).to.be.greaterThan(-1);
+    expect(result.split('<mark>Chicken</mark>').length).to.be(text.split('Chicken').length);
+  });
+
+  it('should highlight multiple hits in a result', function () {
+    var highlights = [
+      'Bacon ipsum dolor amet ' + tags.pre + 'pork' + tags.post + ' loin ' +
+        '' + tags.pre + 'pork' + tags.post + ' cow pig beef chuck ground round shankle ' +
+        'sirloin landjaeger',
+      'kevin venison sausage ribeye tongue. Chicken bacon ball tip ' +
+        '' + tags.pre + 'pork' + tags.post + '. Brisket ' +
+        '' + tags.pre + 'pork' + tags.post + ' capicola spare ribs',
+      'hamburger alcatra cupim. Salami capicola boudin ' + tags.pre + 'pork' + tags.post + ' ' +
+        'belly shank picanha.'
+    ];
+    var result = filter(text, highlights);
+    expect(result.indexOf('<mark>pork</mark>')).to.be.greaterThan(-1);
+    expect(result.split('<mark>pork</mark>').length).to.be(text.split('pork').length);
+  });
+
+  it('should accept an object and return a string containing its properties', function () {
+    var obj = {foo: 1, bar: 2};
+    var result = filter(obj, null);
+    expect(result.indexOf('' + obj)).to.be(-1);
+    expect(result.indexOf('foo')).to.be.greaterThan(-1);
+    expect(result.indexOf('bar')).to.be.greaterThan(-1);
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/highlight/highlight.js b/src/ui/public/highlight/highlight.js
new file mode 100644
index 0000000000000..6953f2e9a460c
--- /dev/null
+++ b/src/ui/public/highlight/highlight.js
@@ -0,0 +1,32 @@
+define(function (require) {
+  require('ui/highlight/highlight_tags');
+
+  var _ = require('lodash');
+  var angular = require('angular');
+  var module = require('ui/modules').get('kibana');
+
+  module.filter('highlight', function (highlightTags) {
+    return function (formatted, highlight) {
+      if (typeof formatted === 'object') formatted = angular.toJson(formatted);
+
+      _.each(highlight, function (section) {
+        section = _.escape(section);
+
+        // Strip out the highlight tags to compare against the formatted string
+        var untagged = section
+          .split(highlightTags.pre).join('')
+          .split(highlightTags.post).join('');
+
+        // Replace all highlight tags with proper html tags
+        var tagged = section
+          .split(highlightTags.pre).join('<mark>')
+          .split(highlightTags.post).join('</mark>');
+
+        // Replace all instances of the untagged string with the properly tagged string
+        formatted = formatted.split(untagged).join(tagged);
+      });
+
+      return formatted;
+    };
+  });
+});
diff --git a/src/kibana/components/highlight/highlight_tags.js b/src/ui/public/highlight/highlight_tags.js
similarity index 88%
rename from src/kibana/components/highlight/highlight_tags.js
rename to src/ui/public/highlight/highlight_tags.js
index e965b46c8c915..2f6aea6db1402 100644
--- a/src/kibana/components/highlight/highlight_tags.js
+++ b/src/ui/public/highlight/highlight_tags.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
 
   // By default, ElasticSearch surrounds matched values in <em></em>. This is not ideal because it is possible that
   // the value could contain <em></em> in the value. We define these custom tags that we would never expect to see
diff --git a/src/kibana/styles/theme/elk.ico b/src/ui/public/images/elk.ico
similarity index 100%
rename from src/kibana/styles/theme/elk.ico
rename to src/ui/public/images/elk.ico
diff --git a/src/kibana/images/initial_load.gif b/src/ui/public/images/initial_load.gif
similarity index 100%
rename from src/kibana/images/initial_load.gif
rename to src/ui/public/images/initial_load.gif
diff --git a/src/kibana/images/no_border.png b/src/ui/public/images/kibana.png
similarity index 100%
rename from src/kibana/images/no_border.png
rename to src/ui/public/images/kibana.png
diff --git a/src/ui/public/index_patterns/__tests__/_FieldFormat.js b/src/ui/public/index_patterns/__tests__/_FieldFormat.js
new file mode 100644
index 0000000000000..6863573b8ec1a
--- /dev/null
+++ b/src/ui/public/index_patterns/__tests__/_FieldFormat.js
@@ -0,0 +1,152 @@
+describe('FieldFormat class', function () {
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var FieldFormat;
+  var TestFormat;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
+
+    TestFormat = function (params) {
+      TestFormat.Super.call(this, params);
+    };
+
+    TestFormat.id = 'test-format';
+    TestFormat.title = 'Test Format';
+    TestFormat.prototype._convert = _.asPrettyString;
+
+    _.class(TestFormat).inherits(FieldFormat);
+  }));
+
+  describe('params', function () {
+    it('accepts its params via the constructor', function () {
+      var f = new TestFormat({ foo: 'bar' });
+      expect(f.param('foo')).to.be('bar');
+    });
+
+    it('allows reading a clone of the params', function () {
+      var params = { foo: 'bar' };
+      var f = new TestFormat(params);
+      var output = f.params();
+      expect(output).to.eql(params);
+      expect(output).to.not.be(params);
+    });
+  });
+
+  describe('type', function () {
+    it('links the constructor class to instances as the `type`', function () {
+      var f = new TestFormat();
+      expect(f.type).to.be(TestFormat);
+    });
+  });
+
+  describe('toJSON', function () {
+    it('serializes to a version a basic id and param pair', function () {
+      var f = new TestFormat({ foo: 'bar' });
+      var ser = JSON.parse(JSON.stringify(f));
+      expect(ser).to.eql({ id: 'test-format', params: { foo: 'bar' } });
+    });
+
+    it('removes param values that match the defaults', function () {
+      TestFormat.paramDefaults = { foo: 'bar' };
+
+      var f = new TestFormat({ foo: 'bar', baz: 'bar' });
+      var ser = JSON.parse(JSON.stringify(f));
+      expect(ser.params).to.eql({ baz: 'bar' });
+    });
+
+    it('removes the params entirely if they are empty', function () {
+      var f = new TestFormat();
+      var ser = JSON.parse(JSON.stringify(f));
+      expect(ser).to.not.have.property('params');
+    });
+  });
+
+  describe('converters', function () {
+    describe('#getConverterFor', function () {
+      it('returns a converter for a specific content type', function () {
+        var f = new TestFormat();
+        expect(f.getConverterFor('html')()).to.be.a('string');
+        expect(f.getConverterFor('text')()).to.be.a('string');
+      });
+    });
+
+    describe('#_convert, the instance method or methods used to format values', function () {
+      it('can be a function, which gets converted to a text and html converter', function () {
+        TestFormat.prototype._convert = function () {
+          return 'formatted';
+        };
+
+        var f = new TestFormat();
+        var text = f.getConverterFor('text');
+        var html = f.getConverterFor('html');
+        expect(text).to.not.be(html);
+        expect(text()).to.be('formatted');
+        expect(html()).to.be('formatted');
+      });
+
+      it('can be an object, with seperate text and html converter', function () {
+        TestFormat.prototype._convert = {
+          text: _.constant('formatted text'),
+          html: _.constant('formatted html'),
+        };
+
+        var f = new TestFormat();
+        var text = f.getConverterFor('text');
+        var html = f.getConverterFor('html');
+        expect(text).to.not.be(html);
+        expect(text()).to.be('formatted text');
+        expect(html()).to.be('formatted html');
+      });
+
+      it('does not escape the output of the text converter', function () {
+        TestFormat.prototype._convert = _.constant('<script>alert("xxs");</script>');
+        var f = new TestFormat();
+        expect(f.convert('', 'text')).to.contain('<');
+      });
+
+      it('does escape the output of the text converter if used in an html context', function () {
+        TestFormat.prototype._convert = _.constant('<script>alert("xxs");</script>');
+        var f = new TestFormat();
+        expect(f.convert('', 'html')).to.not.contain('<');
+      });
+
+      it('does not escape the output of an html specific converter', function () {
+        TestFormat.prototype._convert = {
+          text: _.constant('<img>'),
+          html: _.constant('<img>'),
+        };
+
+        var f = new TestFormat();
+        expect(f.convert('', 'text')).to.be('<img>');
+        expect(f.convert('', 'html')).to.be('<img>');
+      });
+    });
+
+    describe('#convert', function () {
+      it('formats a value, defaulting to text content type', function () {
+        TestFormat.prototype._convert = {
+          text: _.constant('text'),
+          html: _.constant('html'),
+        };
+
+        var f = new TestFormat();
+        expect(f.convert('val')).to.be('text');
+      });
+
+      it('formats a value as html, when specified via second param', function () {
+        TestFormat.prototype._convert = {
+          text: _.constant('text'),
+          html: _.constant('html'),
+        };
+
+        var f = new TestFormat();
+        expect(f.convert('val', 'html')).to.be('html');
+      });
+    });
+
+  });
+});
diff --git a/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js b/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js
new file mode 100644
index 0000000000000..1c18a8f7f942f
--- /dev/null
+++ b/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js
@@ -0,0 +1,58 @@
+describe('type normalizer (castMappingType)', function () {
+  var _ = require('lodash');
+  var ngMock = require('ngMock');
+  var expect = require('expect.js');
+
+  var fn;
+  var fields;
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private, $injector) {
+    fn = Private(require('ui/index_patterns/_cast_mapping_type'));
+  }));
+
+  it('should be a function', function () {
+    expect(fn).to.be.a(Function);
+  });
+
+  it('should have a types property', function () {
+    expect(fn).to.have.property('types');
+  });
+
+  it('should cast numeric types to "number"', function () {
+    var types = [
+      'float',
+      'double',
+      'integer',
+      'long',
+      'short',
+      'byte',
+      'token_count'
+    ];
+
+    _.each(types, function (type) {
+      expect(fn(type)).to.be('number');
+    });
+  });
+
+  it('should treat non-numeric known types as what they are', function () {
+    var types = [
+      'date',
+      'boolean',
+      'ip',
+      'attachment',
+      'geo_point',
+      'geo_shape',
+      'murmur3',
+      'string'
+    ];
+
+    _.each(types, function (type) {
+      expect(fn(type)).to.be(type);
+    });
+  });
+
+  it('should treat everything else as a string', function () {
+    expect(fn('fooTypeIsNotReal')).to.be('string');
+  });
+
+});
diff --git a/src/ui/public/index_patterns/__tests__/_get_computed_fields.js b/src/ui/public/index_patterns/__tests__/_get_computed_fields.js
new file mode 100644
index 0000000000000..c8e31ca30a3b9
--- /dev/null
+++ b/src/ui/public/index_patterns/__tests__/_get_computed_fields.js
@@ -0,0 +1,34 @@
+describe('get computed fields', function () {
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var indexPattern, getComputedFields, fn;
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private, $injector) {
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    getComputedFields = require('ui/index_patterns/_get_computed_fields');
+    indexPattern.getComputedFields = getComputedFields.bind(indexPattern);
+    fn = indexPattern.getComputedFields;
+
+  }));
+
+  it('should be a function', function () {
+    expect(fn).to.be.a(Function);
+  });
+
+  it('should request all stored fields', function () {
+    expect(fn().fields).to.contain('*');
+  });
+
+  it('should request _source seperately', function () {
+    expect(fn().fields).to.contain('_source');
+  });
+
+  it('should request date fields as fielddata_fields', function () {
+    expect(fn().fielddataFields).to.contain('@timestamp');
+    expect(fn().fielddataFields).to.not.include.keys('bytes');
+  });
+
+
+});
diff --git a/src/ui/public/index_patterns/__tests__/_index_pattern.js b/src/ui/public/index_patterns/__tests__/_index_pattern.js
new file mode 100644
index 0000000000000..7ab6101c009c6
--- /dev/null
+++ b/src/ui/public/index_patterns/__tests__/_index_pattern.js
@@ -0,0 +1,276 @@
+describe('index pattern', function () {
+  var _ = require('lodash');
+  var sinon = require('auto-release-sinon');
+  var ngMock = require('ngMock');
+  var expect = require('expect.js');
+  var Promise = require('bluebird');
+  var errors = require('ui/errors');
+  var IndexedArray = require('ui/IndexedArray');
+  var IndexPattern;
+  var mapper;
+  var mappingSetup;
+  var mockLogstashFields;
+  var DocSource;
+  var config;
+  var docSourceResponse;
+  var indexPatternId = 'test-pattern';
+  var indexPattern;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private, $injector, _config_) {
+    config = _config_;
+    mockLogstashFields = Private(require('fixtures/logstash_fields'));
+    docSourceResponse = Private(require('fixtures/stubbed_doc_source_response'));
+
+    DocSource = Private(require('ui/courier/data_source/doc_source'));
+    sinon.stub(DocSource.prototype, 'doIndex');
+    sinon.stub(DocSource.prototype, 'fetch');
+
+    // stub mapper
+    mapper = Private(require('ui/index_patterns/_mapper'));
+    sinon.stub(mapper, 'getFieldsForIndexPattern', function () {
+      return Promise.resolve(_.filter(mockLogstashFields, { scripted: false }));
+    });
+
+    // stub mappingSetup
+    mappingSetup = Private(require('ui/utils/mapping_setup'));
+    sinon.stub(mappingSetup, 'isDefined', function () {
+      return Promise.resolve(true);
+    });
+
+    IndexPattern = Private(require('ui/index_patterns/_index_pattern'));
+  }));
+
+  // create an indexPattern instance for each test
+  beforeEach(function () {
+    return create(indexPatternId).then(function (pattern) {
+      indexPattern = pattern;
+    });
+  });
+
+  // helper function to create index patterns
+  function create(id, payload) {
+    var indexPattern = new IndexPattern(id);
+    DocSource.prototype.doIndex.returns(Promise.resolve(id));
+    payload = _.defaults(payload || {}, docSourceResponse(id));
+    setDocsourcePayload(payload);
+    return indexPattern.init();
+  }
+
+  function setDocsourcePayload(payload) {
+    DocSource.prototype.fetch.returns(Promise.resolve(payload));
+  }
+
+  describe('api', function () {
+    it('should have expected properties', function () {
+      return create('test-pattern').then(function (indexPattern) {
+        // methods
+        expect(indexPattern).to.have.property('refreshFields');
+        expect(indexPattern).to.have.property('popularizeField');
+        expect(indexPattern).to.have.property('getScriptedFields');
+        expect(indexPattern).to.have.property('getNonScriptedFields');
+        expect(indexPattern).to.have.property('getInterval');
+        expect(indexPattern).to.have.property('addScriptedField');
+        expect(indexPattern).to.have.property('removeScriptedField');
+        expect(indexPattern).to.have.property('toString');
+        expect(indexPattern).to.have.property('toJSON');
+        expect(indexPattern).to.have.property('save');
+
+        // properties
+        expect(indexPattern).to.have.property('fields');
+      });
+    });
+  });
+
+  describe('init', function () {
+    it('should append the found fields', function () {
+      expect(DocSource.prototype.fetch.callCount).to.be(1);
+      expect(indexPattern.fields).to.have.length(mockLogstashFields.length);
+      expect(indexPattern.fields).to.be.an(IndexedArray);
+    });
+  });
+
+  describe('fields', function () {
+    it('should have expected properties on fields', function () {
+      expect(indexPattern.fields[0]).to.have.property('bucketable');
+      expect(indexPattern.fields[0]).to.have.property('displayName');
+      expect(indexPattern.fields[0]).to.have.property('filterable');
+      expect(indexPattern.fields[0]).to.have.property('format');
+      expect(indexPattern.fields[0]).to.have.property('sortable');
+      expect(indexPattern.fields[0]).to.have.property('scripted');
+    });
+  });
+
+  describe('getScriptedFields', function () {
+    it('should return all scripted fields', function () {
+      var scriptedNames = _(mockLogstashFields).where({ scripted: true }).pluck('name').value();
+      var respNames = _.pluck(indexPattern.getScriptedFields(), 'name');
+      expect(respNames).to.eql(scriptedNames);
+    });
+  });
+
+  describe('getNonScriptedFields', function () {
+    it('should return all non-scripted fields', function () {
+      var notScriptedNames = _(mockLogstashFields).where({ scripted: false }).pluck('name').value();
+      var respNames = _.pluck(indexPattern.getNonScriptedFields(), 'name');
+      expect(respNames).to.eql(notScriptedNames);
+    });
+
+  });
+
+  describe('refresh fields', function () {
+    // override the default indexPattern, with a truncated field list
+    require('testUtils/noDigestPromises').activateForSuite();
+    var indexPatternId = 'test-pattern';
+    var indexPattern;
+    var fieldLength;
+    var truncatedFields;
+
+    beforeEach(function () {
+      fieldLength = mockLogstashFields.length;
+      truncatedFields = mockLogstashFields.slice(3);
+      return create(indexPatternId, {
+        _source: {
+          customFormats: '{}',
+          fields: JSON.stringify(truncatedFields)
+        }
+      }).then(function (pattern) {
+        indexPattern = pattern;
+      });
+    });
+
+    it('should fetch fields from the doc source', function () {
+      // ensure that we don't have all the fields
+      expect(truncatedFields.length).to.not.equal(mockLogstashFields.length);
+      expect(indexPattern.fields).to.have.length(truncatedFields.length);
+
+      // ensure that all fields will be included in the returned docSource
+      setDocsourcePayload(docSourceResponse(indexPatternId));
+
+      return Promise.all([
+        // read fields from elasticsearch
+        mapper.getFieldsForIndexPattern(),
+
+        // tell the index pattern to do the same
+        indexPattern.refreshFields(),
+      ])
+      .then(function (data) {
+        var expected = data[0]; // just the fields in the index
+        var fields = indexPattern.getNonScriptedFields(); // get all but scripted fields
+
+        expect(_.pluck(fields, 'name')).to.eql(_.pluck(expected, 'name'));
+      });
+    });
+
+    it('should preserve the scripted fields', function () {
+      // ensure that all fields will be included in the returned docSource
+      setDocsourcePayload(docSourceResponse(indexPatternId));
+
+      // add spy to indexPattern.getScriptedFields
+      var scriptedFieldsSpy = sinon.spy(indexPattern, 'getScriptedFields');
+
+      // refresh fields, which will fetch
+      return indexPattern.refreshFields().then(function () {
+        // called to append scripted fields to the response from mapper.getFieldsForIndexPattern
+        expect(scriptedFieldsSpy.callCount).to.equal(1);
+
+        var scripted = _.where(mockLogstashFields, { scripted: true });
+        var expected = _.filter(indexPattern.fields, { scripted: true });
+        expect(_.pluck(expected, 'name')).to.eql(_.pluck(scripted, 'name'));
+      });
+    });
+  });
+
+  describe('add and remove scripted fields', function () {
+    it('should append the scripted field', function () {
+      // keep a copy of the current scripted field count
+      var saveSpy = sinon.spy(indexPattern, 'save');
+      var oldCount = indexPattern.getScriptedFields().length;
+
+      // add a new scripted field
+      var scriptedField = {
+        name: 'new scripted field',
+        script: 'false',
+        type: 'boolean'
+      };
+      indexPattern.addScriptedField(scriptedField.name, scriptedField.script, scriptedField.type);
+      indexPattern._indexFields(); // normally triggered by docSource.onUpdate()
+
+      var scriptedFields = indexPattern.getScriptedFields();
+      expect(saveSpy.callCount).to.equal(1);
+      expect(scriptedFields).to.have.length(oldCount + 1);
+      expect(indexPattern.fields.byName[scriptedField.name].displayName).to.equal(scriptedField.name);
+    });
+
+    it('should remove scripted field, by name', function () {
+      var saveSpy = sinon.spy(indexPattern, 'save');
+      var scriptedFields = indexPattern.getScriptedFields();
+      var oldCount = scriptedFields.length;
+      var scriptedField = _.last(scriptedFields);
+
+      indexPattern.removeScriptedField(scriptedField.name);
+
+      expect(saveSpy.callCount).to.equal(1);
+      expect(indexPattern.getScriptedFields().length).to.equal(oldCount - 1);
+      expect(indexPattern.fields.byName[scriptedField.name]).to.equal(undefined);
+    });
+
+    it('should not allow duplicate names', function () {
+      var scriptedFields = indexPattern.getScriptedFields();
+      var scriptedField = _.last(scriptedFields);
+      expect(function () {
+        indexPattern.addScriptedField(scriptedField.name, '\'new script\'', 'string');
+      }).to.throwError(function (e) {
+        expect(e).to.be.a(errors.DuplicateField);
+      });
+    });
+  });
+
+  describe('popularizeField', function () {
+    it('should increment the poplarity count by default', function () {
+      var saveSpy = sinon.stub(indexPattern, 'save');
+      indexPattern.fields.forEach(function (field, i) {
+        var oldCount = field.count;
+
+        indexPattern.popularizeField(field.name);
+
+        expect(saveSpy.callCount).to.equal(i + 1);
+        expect(field.count).to.equal(oldCount + 1);
+      });
+    });
+
+    it('should increment the poplarity count', function () {
+      var saveSpy = sinon.stub(indexPattern, 'save');
+      indexPattern.fields.forEach(function (field, i) {
+        var oldCount = field.count;
+        var incrementAmount = 4;
+
+        indexPattern.popularizeField(field.name, incrementAmount);
+
+        expect(saveSpy.callCount).to.equal(i + 1);
+        expect(field.count).to.equal(oldCount + incrementAmount);
+      });
+    });
+
+    it('should decrement the poplarity count', function () {
+      indexPattern.fields.forEach(function (field, i) {
+        var oldCount = field.count;
+        var incrementAmount = 4;
+        var decrementAmount = -2;
+
+        indexPattern.popularizeField(field.name, incrementAmount);
+        indexPattern.popularizeField(field.name, decrementAmount);
+
+        expect(field.count).to.equal(oldCount + incrementAmount + decrementAmount);
+      });
+    });
+
+    it('should not go below 0', function () {
+      indexPattern.fields.forEach(function (field) {
+        var decrementAmount = -Number.MAX_VALUE;
+        indexPattern.popularizeField(field.name, decrementAmount);
+        expect(field.count).to.equal(0);
+      });
+    });
+  });
+});
diff --git a/src/ui/public/index_patterns/__tests__/_map_field.js b/src/ui/public/index_patterns/__tests__/_map_field.js
new file mode 100644
index 0000000000000..190fdcca49dc6
--- /dev/null
+++ b/src/ui/public/index_patterns/__tests__/_map_field.js
@@ -0,0 +1,57 @@
+describe('field mapping normalizer (mapField)', function () {
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var fn;
+  var fields;
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private, $injector, config) {
+    config.set('metaFields', ['_id', '_timestamp']);
+    fn = Private(require('ui/index_patterns/_map_field'));
+    fields = require('fixtures/field_mapping').test.mappings.testType;
+  }));
+
+  it('should be a function', function () {
+    expect(fn).to.be.a(Function);
+  });
+
+  it('should return a modified copy of the object, not modify the original', function () {
+    var pristine = _.cloneDeep(fields['foo.bar']);
+    var mapped = fn(fields['foo.bar'], 'foo.bar');
+
+    expect(fields['foo.bar']).to.not.eql(mapped);
+    expect(fields['foo.bar']).to.eql(pristine);
+  });
+
+  it('should not consider _id indexed unless it is', function () {
+    var mapped = fn(fields._id, '_id');
+    expect(mapped.indexed).to.be(false);
+
+    var mapping = _.cloneDeep(fields._id);
+    mapping.mapping._id.index = 'not_analyzed';
+    var mapped2 = fn(mapping, '_id');
+    expect(mapped2.indexed).to.be(true);
+  });
+
+  it('should always consider _timestamp to be an indexed date', function () {
+    var mapped = fn(fields._timestamp, '_timestamp');
+    expect(mapped.indexed).to.be(true);
+    expect(mapped.type).to.be('date');
+  });
+
+  it('should treat falsy and no as false for index', function () {
+    var mapped = fn(fields.index_no_field, 'index_no_field');
+    expect(mapped.indexed).to.be(false);
+
+    fields.index_no_field.index = false;
+    mapped = fn(fields.index_no_field, 'index_no_field');
+    expect(mapped.indexed).to.be(false);
+  });
+
+  it('should treat other values for index as true', function () {
+    var mapped = fn(fields.not_analyzed_field, 'not_analyzed_field');
+    expect(mapped.indexed).to.be(true);
+  });
+
+});
diff --git a/src/ui/public/index_patterns/__tests__/_pattern_to_wildcard.js b/src/ui/public/index_patterns/__tests__/_pattern_to_wildcard.js
new file mode 100644
index 0000000000000..7450de671725d
--- /dev/null
+++ b/src/ui/public/index_patterns/__tests__/_pattern_to_wildcard.js
@@ -0,0 +1,36 @@
+describe('Index pattern to wildcard', function () {
+
+  var fn = require('ui/index_patterns/_pattern_to_wildcard')();
+  var expect = require('expect.js');
+
+
+  it('should be a function', function () {
+    expect(fn).to.be.a(Function);
+  });
+
+  it('should parse patterns with a single escaped sequence', function () {
+    expect(fn('[foo-]YYYY')).to.equal('foo-*');
+  });
+
+  it('should parse patterns with a multiple escaped sequences', function () {
+    expect(fn('[foo-]YYYY[-bar]')).to.equal('foo-*-bar');
+    expect(fn('[foo-]YYYY[-bar-]MM')).to.equal('foo-*-bar-*');
+  });
+
+  it('should handle leading patterns', function () {
+    expect(fn('YYYY[-foo]')).to.equal('*-foo');
+  });
+
+  it('should ignore [ when inside an escape', function () {
+    expect(fn('[f[oo-]YYYY')).to.equal('f[oo-*');
+  });
+
+  // Not sure if this behavior is useful, but this is how the code works
+  it('should add ] to the string when outside the pattern', function () {
+    expect(fn('[foo-]]YYYY')).to.equal('foo-]*');
+  });
+
+  it('should ignore ] when outside an escape', function () {
+    expect(fn('[f]oo-]YYYY')).to.equal('f*');
+  });
+});
diff --git a/src/ui/public/index_patterns/__tests__/flatten_hit.js b/src/ui/public/index_patterns/__tests__/flatten_hit.js
new file mode 100644
index 0000000000000..c0a7cd614d1f5
--- /dev/null
+++ b/src/ui/public/index_patterns/__tests__/flatten_hit.js
@@ -0,0 +1,142 @@
+
+describe('IndexPattern#flattenHit()', function () {
+
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var flattenHit;
+  var config;
+  var hit;
+  var flat;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private, $injector) {
+    var indexPattern = {
+      fields: {
+        byName: {
+          'message': { type: 'string' },
+          'geo.coordinates': { type: 'geo_point' },
+          'geo.dest': { type: 'string' },
+          'geo.src': { type: 'string' },
+          'bytes': { type: 'number' },
+          '@timestamp': { type: 'date' },
+          'team': { type: 'nested' },
+          'team.name': { type: 'string' },
+          'team.role': { type: 'string' },
+          'user': { type: 'conflict' },
+          'user.name': { type: 'string' },
+          'user.id': { type: 'conflict' },
+          'delta': { type: 'number', scripted: true }
+        }
+      }
+    };
+
+    flattenHit = Private(require('ui/index_patterns/_flatten_hit'))(indexPattern).uncached;
+    config = $injector.get('config');
+
+    hit = {
+      _source: {
+        message: 'Hello World',
+        geo: {
+          coordinates: { lat: 33.4500, lon: 112.0667 },
+          dest: 'US',
+          src: 'IN'
+        },
+        bytes: 10039103,
+        '@timestamp': (new Date()).toString(),
+        tags: [{ text: 'foo' }, { text: 'bar' }],
+        groups: ['loners'],
+        noMapping: true,
+        team: [
+          { name: 'foo', role: 'leader' },
+          { name: 'bar', role: 'follower' },
+          { name: 'baz', role: 'party boy' },
+        ],
+        user: { name: 'smith', id: 123 }
+      },
+      fields: {
+        delta: [42],
+        random: [0.12345]
+      }
+    };
+
+    flat = flattenHit(hit);
+  }));
+
+  it('flattens keys as far down as the mapping goes', function () {
+    expect(flat).to.have.property('geo.coordinates', hit._source.geo.coordinates);
+    expect(flat).to.not.have.property('geo.coordinates.lat');
+    expect(flat).to.not.have.property('geo.coordinates.lon');
+    expect(flat).to.have.property('geo.dest', 'US');
+    expect(flat).to.have.property('geo.src', 'IN');
+    expect(flat).to.have.property('@timestamp', hit._source['@timestamp']);
+    expect(flat).to.have.property('message', 'Hello World');
+    expect(flat).to.have.property('bytes', 10039103);
+  });
+
+  it('flattens keys not in the mapping', function () {
+    expect(flat).to.have.property('noMapping', true);
+    expect(flat).to.have.property('groups');
+    expect(flat.groups).to.eql(['loners']);
+  });
+
+  it('flattens conflicting types in the mapping', function () {
+    expect(flat).to.not.have.property('user');
+    expect(flat).to.have.property('user.name', hit._source.user.name);
+    expect(flat).to.have.property('user.id', hit._source.user.id);
+  });
+
+  it('preserves objects in arrays', function () {
+    expect(flat).to.have.property('tags', hit._source.tags);
+  });
+
+  it('does not enter into nested fields', function () {
+    expect(flat).to.have.property('team', hit._source.team);
+    expect(flat).to.not.have.property('team.name');
+    expect(flat).to.not.have.property('team.role');
+    expect(flat).to.not.have.property('team[0]');
+    expect(flat).to.not.have.property('team.0');
+  });
+
+  it('unwraps script fields', function () {
+    expect(flat).to.have.property('delta', 42);
+  });
+
+  it('assumes that all fields are "computed fields"', function () {
+    expect(flat).to.have.property('random', 0.12345);
+  });
+
+  it('ignores fields that start with an _ and are not in the metaFields', function () {
+    config.set('metaFields', ['_metaKey']);
+    hit.fields._notMetaKey = [100];
+    flat = flattenHit(hit);
+    expect(flat).to.not.have.property('_notMetaKey');
+  });
+
+  it('includes underscore-prefixed keys that are in the metaFields', function () {
+    config.set('metaFields', ['_metaKey']);
+    hit.fields._metaKey = [100];
+    flat = flattenHit(hit);
+    expect(flat).to.have.property('_metaKey', 100);
+  });
+
+  it('adapts to changes in the metaFields', function () {
+    hit.fields._metaKey = [100];
+
+    config.set('metaFields', ['_metaKey']);
+    flat = flattenHit(hit);
+    expect(flat).to.have.property('_metaKey', 100);
+
+    config.set('metaFields', []);
+    flat = flattenHit(hit);
+    expect(flat).to.not.have.property('_metaKey');
+  });
+
+  it('handles fields that are not arrays, like _timestamp', function () {
+    hit.fields._metaKey = 20000;
+    config.set('metaFields', ['_metaKey']);
+    flat = flattenHit(hit);
+    expect(flat).to.have.property('_metaKey', 20000);
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/index_patterns/__tests__/index.js b/src/ui/public/index_patterns/__tests__/index.js
new file mode 100644
index 0000000000000..12e59695f6e1d
--- /dev/null
+++ b/src/ui/public/index_patterns/__tests__/index.js
@@ -0,0 +1,8 @@
+describe('Index Patterns', function () {
+  require('./_index_pattern');
+  require('./_cast_mapping_type');
+  require('./_map_field');
+  require('./_pattern_to_wildcard');
+  require('./_get_computed_fields');
+  require('./_FieldFormat');
+});
diff --git a/src/ui/public/index_patterns/__tests__/intervals.js b/src/ui/public/index_patterns/__tests__/intervals.js
new file mode 100644
index 0000000000000..edf0e90194111
--- /dev/null
+++ b/src/ui/public/index_patterns/__tests__/intervals.js
@@ -0,0 +1,67 @@
+
+var moment = require('moment');
+describe('Index Patterns', function () {
+  describe('interval.toIndexList()', function () {
+    var expect = require('expect.js');
+    var ngMock = require('ngMock');
+
+    var intervals;
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      intervals = Private(require('ui/index_patterns/_intervals'));
+    }));
+
+    it('should return correct indices for hourly [logstash-]YYYY.MM.DD.HH', function () {
+      var start = moment.utc('2014-01-01T07:00:00Z');
+      var end = moment.utc('2014-01-01T08:30:00Z');
+      var interval = { name: 'hours', startOf: 'hour', display: 'Hourly' };
+      var list = intervals.toIndexList('[logstash-]YYYY.MM.DD.HH', interval, start, end);
+      expect(list).to.contain('logstash-2014.01.01.07');
+      expect(list).to.contain('logstash-2014.01.01.08');
+    });
+
+    it('should return correct indices for daily [logstash-]YYYY.MM.DD', function () {
+      var start = moment(1418244231248);
+      var end = moment(1418849261281);
+      var interval = { name: 'days', startOf: 'day', display: 'Daily' };
+      var list = intervals.toIndexList('[logstash-]YYYY.MM.DD', interval, start, end);
+      expect(list).to.contain('logstash-2014.12.10');
+      expect(list).to.contain('logstash-2014.12.11');
+      expect(list).to.contain('logstash-2014.12.12');
+      expect(list).to.contain('logstash-2014.12.13');
+      expect(list).to.contain('logstash-2014.12.14');
+      expect(list).to.contain('logstash-2014.12.15');
+      expect(list).to.contain('logstash-2014.12.16');
+      expect(list).to.contain('logstash-2014.12.17');
+    });
+
+    it('should return correct indices for weekly [logstash-]GGGG.WW', function () {
+      var start = moment.utc(1418244231248);
+      var end = moment.utc(1418849261281);
+      var interval = { name: 'weeks', startOf: 'isoWeek', display: 'Weekly' };
+      var list = intervals.toIndexList('[logstash-]GGGG.WW', interval, start, end);
+      expect(list).to.contain('logstash-2014.50');
+      expect(list).to.contain('logstash-2014.51');
+    });
+
+    it('should return correct indices for monthly [logstash-]YYYY.MM', function () {
+      var start = moment.utc('2014-12-01');
+      var end = moment.utc('2015-02-01');
+      var interval = { name: 'months', startOf: 'month', display: 'Monthly' };
+      var list = intervals.toIndexList('[logstash-]YYYY.MM', interval, start, end);
+      expect(list).to.contain('logstash-2014.12');
+      expect(list).to.contain('logstash-2015.01');
+      expect(list).to.contain('logstash-2015.02');
+    });
+
+    it('should return correct indices for yearly [logstash-]YYYY', function () {
+      var start = moment.utc('2014-12-01');
+      var end = moment.utc('2015-02-01');
+      var interval = { name: 'years', startOf: 'year', display: 'Yearly' };
+      var list = intervals.toIndexList('[logstash-]YYYY', interval, start, end);
+      expect(list).to.contain('logstash-2014');
+      expect(list).to.contain('logstash-2015');
+    });
+
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/index_patterns/_cast_mapping_type.js b/src/ui/public/index_patterns/_cast_mapping_type.js
new file mode 100644
index 0000000000000..5a4e8c0020dc6
--- /dev/null
+++ b/src/ui/public/index_patterns/_cast_mapping_type.js
@@ -0,0 +1,42 @@
+define(function (require) {
+  return function CastMappingTypeFn() {
+    var IndexedArray = require('ui/IndexedArray');
+
+    castMappingType.types = new IndexedArray({
+      index: ['name'],
+      group: ['type'],
+      immutable: true,
+      initialSet: [
+        { name: 'string',       type: 'string',     group: 'base'   },
+        { name: 'date',         type: 'date',       group: 'base'   },
+        { name: 'boolean',      type: 'boolean',    group: 'base'   },
+        { name: 'float',        type: 'number',     group: 'number' },
+        { name: 'double',       type: 'number',     group: 'number' },
+        { name: 'integer',      type: 'number',     group: 'number' },
+        { name: 'long',         type: 'number',     group: 'number' },
+        { name: 'short',        type: 'number',     group: 'number' },
+        { name: 'byte',         type: 'number',     group: 'number' },
+        { name: 'token_count',  type: 'number',     group: 'number' },
+        { name: 'geo_point',    type: 'geo_point',  group: 'geo'    },
+        { name: 'geo_shape',    type: 'geo_shape',  group: 'geo'    },
+        { name: 'ip',           type: 'ip',         group: 'other'  },
+        { name: 'attachment',   type: 'attachment', group: 'other'  },
+        { name: 'murmur3',      type: 'murmur3',    group: 'hash'   }
+      ]
+    });
+
+    /**
+     * Accepts a mapping type, and converts it into it's js equivilent
+     * @param  {String} type - the type from the mapping's 'type' field
+     * @return {String} - the most specific type that we care for
+     */
+    function castMappingType(name) {
+      if (!name) return 'unknown';
+
+      var match = castMappingType.types.byName[name];
+      return match ? match.type : 'string';
+    }
+
+    return castMappingType;
+  };
+});
diff --git a/src/kibana/components/index_patterns/_ensure_some.js b/src/ui/public/index_patterns/_ensure_some.js
similarity index 92%
rename from src/kibana/components/index_patterns/_ensure_some.js
rename to src/ui/public/index_patterns/_ensure_some.js
index fdbfa18068fc0..71e8d5e5f4a5b 100644
--- a/src/kibana/components/index_patterns/_ensure_some.js
+++ b/src/ui/public/index_patterns/_ensure_some.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function EnsureSomeIndexPatternsFn(Private, Notifier, $location, kbnUrl) {
-    var errors = require('errors');
+    var errors = require('ui/errors');
     var notify = new Notifier();
 
     return function ensureSomeIndexPatterns() {
diff --git a/src/ui/public/index_patterns/_field.js b/src/ui/public/index_patterns/_field.js
new file mode 100644
index 0000000000000..a74c2f2e5db6d
--- /dev/null
+++ b/src/ui/public/index_patterns/_field.js
@@ -0,0 +1,79 @@
+define(function (require) {
+  return function FieldObjectProvider(Private, shortDotsFilter, $rootScope, Notifier) {
+    var notify = new Notifier({ location: 'IndexPattern Field' });
+    var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
+    var fieldTypes = Private(require('ui/index_patterns/_field_types'));
+    var fieldFormats = Private(require('ui/registry/field_formats'));
+    var ObjDefine = require('ui/utils/ObjDefine');
+
+    function Field(indexPattern, spec) {
+      // unwrap old instances of Field
+      if (spec instanceof Field) spec = spec.$$spec;
+
+      // constuct this object using ObjDefine class, which
+      // extends the Field.prototype but gets it's properties
+      // defined using the logic below
+      var obj = new ObjDefine(spec, Field.prototype);
+
+      if (spec.name === '_source') {
+        spec.type = '_source';
+      }
+
+      // find the type for this field, fallback to unkown type
+      var type = fieldTypes.byName[spec.type];
+      if (spec.type && !type) {
+        notify.error(
+          'Unkown field type "' + spec.type + '"' +
+          ' for field "' + spec.name + '"' +
+          ' in indexPattern "' + indexPattern.id + '"'
+        );
+      }
+
+      if (!type) type = fieldTypes.byName.unknown;
+
+      var format = spec.format;
+      if (!format || !(format instanceof FieldFormat)) {
+        format = indexPattern.fieldFormatMap[spec.name] || fieldFormats.getDefaultInstance(spec.type);
+      }
+
+      var indexed = !!spec.indexed;
+      var scripted = !!spec.scripted;
+      var sortable = spec.name === '_score' || ((indexed || scripted) && type.sortable);
+      var bucketable = indexed || scripted;
+      var filterable = spec.name === '_id' || scripted || (indexed && type.filterable);
+
+      obj.fact('name');
+      obj.fact('type');
+      obj.writ('count', spec.count || 0);
+
+      // scripted objs
+      obj.fact('scripted', scripted);
+      obj.writ('script', scripted ? spec.script : null);
+      obj.writ('lang', scripted ? (spec.lang || 'expression') : null);
+
+      // mapping info
+      obj.fact('indexed', indexed);
+      obj.fact('analyzed', !!spec.analyzed);
+      obj.fact('doc_values', !!spec.doc_values);
+
+      // usage flags, read-only and won't be saved
+      obj.comp('format', format);
+      obj.comp('sortable', sortable);
+      obj.comp('bucketable', bucketable);
+      obj.comp('filterable', filterable);
+
+      // computed values
+      obj.comp('indexPattern', indexPattern);
+      obj.comp('displayName', shortDotsFilter(spec.name));
+      obj.comp('$$spec', spec);
+
+      return obj.create();
+    }
+
+    Field.prototype.routes = {
+      edit: '/settings/indices/{{indexPattern.id}}/field/{{name}}'
+    };
+
+    return Field;
+  };
+});
diff --git a/src/kibana/components/index_patterns/_field_format/FieldFormat.js b/src/ui/public/index_patterns/_field_format/FieldFormat.js
similarity index 96%
rename from src/kibana/components/index_patterns/_field_format/FieldFormat.js
rename to src/ui/public/index_patterns/_field_format/FieldFormat.js
index 95aa72b7661dc..bcf411d34b7ac 100644
--- a/src/kibana/components/index_patterns/_field_format/FieldFormat.js
+++ b/src/ui/public/index_patterns/_field_format/FieldFormat.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function FieldFormatClassProvider(config, $rootScope, Private) {
     var _ = require('lodash');
-    var contentTypes = Private(require('components/index_patterns/_field_format/contentTypes'));
+    var contentTypes = Private(require('ui/index_patterns/_field_format/contentTypes'));
 
     function FieldFormat(params) {
       var self = this;
diff --git a/src/kibana/components/index_patterns/_field_format/contentTypes.js b/src/ui/public/index_patterns/_field_format/contentTypes.js
similarity index 98%
rename from src/kibana/components/index_patterns/_field_format/contentTypes.js
rename to src/ui/public/index_patterns/_field_format/contentTypes.js
index b23355f73f0ff..510f70f96ccfc 100644
--- a/src/kibana/components/index_patterns/_field_format/contentTypes.js
+++ b/src/ui/public/index_patterns/_field_format/contentTypes.js
@@ -2,6 +2,7 @@ define(function (require) {
   return function contentTypesProvider(highlightFilter) {
     var _ = require('lodash');
     var angular = require('angular');
+    require('ui/highlight');
 
     var types = {
       html: function (format, convert) {
diff --git a/src/kibana/components/index_patterns/_field_list.js b/src/ui/public/index_patterns/_field_list.js
similarity index 77%
rename from src/kibana/components/index_patterns/_field_list.js
rename to src/ui/public/index_patterns/_field_list.js
index 9c54b654e786c..b4fe34e0568b4 100644
--- a/src/kibana/components/index_patterns/_field_list.js
+++ b/src/ui/public/index_patterns/_field_list.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function FieldListProvider(Private) {
-    var Field = Private(require('components/index_patterns/_field'));
-    var IndexedArray = require('utils/indexed_array/index');
+    var Field = Private(require('ui/index_patterns/_field'));
+    var IndexedArray = require('ui/IndexedArray');
     var _ = require('lodash');
 
     _.class(FieldList).inherits(IndexedArray);
diff --git a/src/kibana/components/index_patterns/_field_types.js b/src/ui/public/index_patterns/_field_types.js
similarity index 94%
rename from src/kibana/components/index_patterns/_field_types.js
rename to src/ui/public/index_patterns/_field_types.js
index 3de0360d32a3e..8d8b927a5be08 100644
--- a/src/kibana/components/index_patterns/_field_types.js
+++ b/src/ui/public/index_patterns/_field_types.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function IndexPatternFieldTypes() {
-    var IndexedArray = require('utils/indexed_array/index');
+    var IndexedArray = require('ui/IndexedArray');
 
     return new IndexedArray({
       index: ['name'],
diff --git a/src/kibana/components/index_patterns/_flatten_hit.js b/src/ui/public/index_patterns/_flatten_hit.js
similarity index 100%
rename from src/kibana/components/index_patterns/_flatten_hit.js
rename to src/ui/public/index_patterns/_flatten_hit.js
diff --git a/src/kibana/components/index_patterns/_format_hit.js b/src/ui/public/index_patterns/_format_hit.js
similarity index 100%
rename from src/kibana/components/index_patterns/_format_hit.js
rename to src/ui/public/index_patterns/_format_hit.js
diff --git a/src/kibana/components/index_patterns/_get_computed_fields.js b/src/ui/public/index_patterns/_get_computed_fields.js
similarity index 100%
rename from src/kibana/components/index_patterns/_get_computed_fields.js
rename to src/ui/public/index_patterns/_get_computed_fields.js
diff --git a/src/kibana/components/index_patterns/_get_ids.js b/src/ui/public/index_patterns/_get_ids.js
similarity index 91%
rename from src/kibana/components/index_patterns/_get_ids.js
rename to src/ui/public/index_patterns/_get_ids.js
index 3d0b91d4a5c0c..0a213945a91d3 100644
--- a/src/kibana/components/index_patterns/_get_ids.js
+++ b/src/ui/public/index_patterns/_get_ids.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  return function GetIndexPatternIdsFn(es, configFile) {
+  return function GetIndexPatternIdsFn(es, kbnIndex) {
     var _ = require('lodash');
 
     // many places may require the id list, so we will cache it seperately
@@ -15,7 +15,7 @@ define(function (require) {
       }
 
       cachedPromise = es.search({
-        index: configFile.kibana_index,
+        index: kbnIndex,
         type: 'index-pattern',
         fields: [],
         body: {
diff --git a/src/ui/public/index_patterns/_index_pattern.js b/src/ui/public/index_patterns/_index_pattern.js
new file mode 100644
index 0000000000000..2ab2109388a28
--- /dev/null
+++ b/src/ui/public/index_patterns/_index_pattern.js
@@ -0,0 +1,271 @@
+define(function (require) {
+  return function IndexPatternFactory(Private, timefilter, Notifier, config, kbnIndex, Promise, $rootScope) {
+    var _ = require('lodash');
+    var errors = require('ui/errors');
+    var angular = require('angular');
+
+    var fieldformats = Private(require('ui/registry/field_formats'));
+    var getIds = Private(require('ui/index_patterns/_get_ids'));
+    var mapper = Private(require('ui/index_patterns/_mapper'));
+    var intervals = Private(require('ui/index_patterns/_intervals'));
+    var getComputedFields = require('ui/index_patterns/_get_computed_fields');
+    var DocSource = Private(require('ui/courier/data_source/doc_source'));
+    var mappingSetup = Private(require('ui/utils/mapping_setup'));
+    var FieldList = Private(require('ui/index_patterns/_field_list'));
+
+    var flattenHit = Private(require('ui/index_patterns/_flatten_hit'));
+    var formatHit = require('ui/index_patterns/_format_hit');
+
+    var type = 'index-pattern';
+
+    var notify = new Notifier();
+
+    var mapping = mappingSetup.expandShorthand({
+      title: 'string',
+      timeFieldName: 'string',
+      intervalName: 'string',
+      fields: 'json',
+      fieldFormatMap: {
+        type: 'string',
+        _serialize: function (map) {
+          if (map == null) return;
+
+          var count = 0;
+          var serialized = _.transform(map, function (flat, format, field) {
+            if (!format) return;
+            count++;
+            flat[field] = format;
+          });
+
+          if (count) return angular.toJson(serialized);
+        },
+        _deserialize: function (map) {
+          if (map == null) return {};
+          return _.mapValues(angular.fromJson(map), function (mapping) {
+            var FieldFormat = fieldformats.byId[mapping.id];
+            return FieldFormat && new FieldFormat(mapping.params);
+          });
+        }
+      }
+    });
+
+    function IndexPattern(id) {
+      var self = this;
+
+      setId(id);
+
+      var docSource = new DocSource();
+
+      self.init = function () {
+        // tell the docSource where to find the doc
+        docSource
+        .index(kbnIndex)
+        .type(type)
+        .id(self.id);
+
+        // listen for config changes and update field list
+        $rootScope.$on('change:config', function () {
+          initFields();
+        });
+
+        return mappingSetup.isDefined(type)
+        .then(function (defined) {
+          // create mapping for this type if one does not exist
+          if (defined) return true;
+          return mappingSetup.setup(type, mapping);
+        })
+        .then(function () {
+          // If there is no id, then there is no document to fetch from elasticsearch
+          if (!self.id) return;
+
+          // fetch the object from ES
+          return docSource.fetch()
+          .then(function applyESResp(resp) {
+            if (!resp.found) throw new errors.SavedObjectNotFound(type, self.id);
+
+            // deserialize any json fields
+            _.forOwn(mapping, function ittr(fieldMapping, name) {
+              if (fieldMapping._deserialize) {
+                resp._source[name] = fieldMapping._deserialize(resp._source[name], resp, name, fieldMapping);
+              }
+            });
+
+            // Give obj all of the values in _source
+            _.assign(self, resp._source);
+
+            self._indexFields();
+
+            // Any time obj is updated, re-call applyESResp
+            docSource.onUpdate().then(applyESResp, notify.fatal);
+          });
+        })
+        .then(function () {
+          // return our obj as the result of init()
+          return self;
+        });
+      };
+
+      function initFields(fields) {
+        self.fields = new FieldList(self, fields || self.fields || []);
+      }
+
+      self._indexFields = function () {
+        if (self.id) {
+          if (!self.fields) {
+            return self.refreshFields();
+          } else {
+            initFields();
+          }
+        }
+      };
+
+      self.addScriptedField = function (name, script, type, lang) {
+        type = type || 'string';
+
+        var scriptFields = _.pluck(self.getScriptedFields(), 'name');
+
+        if (_.contains(scriptFields, name)) {
+          throw new errors.DuplicateField(name);
+        }
+
+        self.fields.push({
+          name: name,
+          script: script,
+          type: type,
+          scripted: true,
+          lang: lang
+        });
+
+        self.save();
+      };
+
+      self.removeScriptedField = function (name) {
+        var fieldIndex = _.findIndex(self.fields, {
+          name: name,
+          scripted: true
+        });
+
+        self.fields.splice(fieldIndex, 1);
+
+        self.save();
+      };
+
+      self.popularizeField = function (fieldName, unit) {
+        if (unit == null) unit = 1;
+
+        var field = _.get(self, ['fields', 'byName', fieldName]);
+        if (!field) return;
+
+        var count = Math.max((field.count || 0) + unit, 0);
+        if (field.count !== count) {
+          field.count = count;
+          self.save();
+        }
+      };
+
+      self.getNonScriptedFields = function () {
+        return _.where(self.fields, { scripted: false });
+      };
+
+      self.getScriptedFields = function () {
+        return _.where(self.fields, { scripted: true });
+      };
+
+      self.getInterval = function () {
+        return this.intervalName && _.find(intervals, { name: this.intervalName });
+      };
+
+      self.toIndexList = function (start, stop) {
+        var interval = this.getInterval();
+        if (interval) {
+          return intervals.toIndexList(self.id, interval, start, stop);
+        } else {
+          return self.id;
+        }
+      };
+
+      self.prepBody = function () {
+        var body = {};
+
+        // serialize json fields
+        _.forOwn(mapping, function (fieldMapping, fieldName) {
+          if (self[fieldName] != null) {
+            body[fieldName] = (fieldMapping._serialize)
+              ? fieldMapping._serialize(self[fieldName])
+              : self[fieldName];
+          }
+        });
+
+        // ensure that the docSource has the current self.id
+        docSource.id(self.id);
+
+        // clear the indexPattern list cache
+        getIds.clearCache();
+        return body;
+      };
+
+      function setId(id) {
+        return self.id = id;
+      }
+
+      self.create = function () {
+        var body = self.prepBody();
+        return docSource.doCreate(body)
+        .then(setId)
+        .catch(function (err) {
+          var confirmMessage = 'Are you sure you want to overwrite this?';
+          if (_.get(err, 'origError.status') === 409 && window.confirm(confirmMessage)) {
+            return docSource.doIndex(body).then(setId);
+          }
+          return Promise.resolve(false);
+        });
+      };
+
+      self.save = function () {
+        var body = self.prepBody();
+        return docSource.doIndex(body).then(setId);
+      };
+
+      self.refreshFields = function () {
+        return mapper.clearCache(self)
+        .then(self._fetchFields)
+        .then(self.save);
+      };
+
+      self._fetchFields = function () {
+        return mapper.getFieldsForIndexPattern(self, true)
+        .then(function (fields) {
+          // append existing scripted fields
+          fields = fields.concat(self.getScriptedFields());
+
+          // initialize self.field with this field list
+          initFields(fields);
+        });
+      };
+
+      self.toJSON = function () {
+        return self.id;
+      };
+
+      self.toString = function () {
+        return '' + self.toJSON();
+      };
+
+      self.metaFields = config.get('metaFields');
+      self.getComputedFields = getComputedFields.bind(self);
+
+      self.flattenHit = flattenHit(self);
+      self.formatHit = formatHit(self, fieldformats.getDefaultInstance('string'));
+      self.formatField = self.formatHit.formatField;
+    }
+
+    IndexPattern.prototype.routes = {
+      edit: '/settings/indices/{{id}}',
+      addField: '/settings/indices/{{id}}/create-field',
+      indexedFields: '/settings/indices/{{id}}?_a=(tab:indexedFields)',
+      scriptedFields: '/settings/indices/{{id}}?_a=(tab:scriptedFields)'
+    };
+
+    return IndexPattern;
+  };
+});
diff --git a/src/kibana/components/index_patterns/_intervals.js b/src/ui/public/index_patterns/_intervals.js
similarity index 97%
rename from src/kibana/components/index_patterns/_intervals.js
rename to src/ui/public/index_patterns/_intervals.js
index 6162ea75be56d..c7f24488e98d2 100644
--- a/src/kibana/components/index_patterns/_intervals.js
+++ b/src/ui/public/index_patterns/_intervals.js
@@ -2,7 +2,7 @@ define(function (require) {
   return function IndexNameIntervalsService(timefilter) {
     var _ = require('lodash');
     var moment = require('moment');
-    var IndexedArray = require('utils/indexed_array/index');
+    var IndexedArray = require('ui/IndexedArray');
 
     var intervals = new IndexedArray({
       index: ['name'],
diff --git a/src/kibana/components/index_patterns/_local_cache.js b/src/ui/public/index_patterns/_local_cache.js
similarity index 100%
rename from src/kibana/components/index_patterns/_local_cache.js
rename to src/ui/public/index_patterns/_local_cache.js
diff --git a/src/ui/public/index_patterns/_map_field.js b/src/ui/public/index_patterns/_map_field.js
new file mode 100644
index 0000000000000..47313d57c521f
--- /dev/null
+++ b/src/ui/public/index_patterns/_map_field.js
@@ -0,0 +1,51 @@
+define(function (require) {
+  return function MapFieldFn(Private, config) {
+    var _ = require('lodash');
+    var castMappingType = Private(require('ui/index_patterns/_cast_mapping_type'));
+
+    /**
+     * Accepts a field object and its name, and tries to give it a mapping
+     * @param  {Object} field - the field mapping returned by elasticsearch
+     * @param  {String} type - name of the field
+     * @return {Object} - the resulting field after overrides and tweaking
+     */
+    return function mapField(field, name) {
+      var keys = Object.keys(field.mapping);
+      if (keys.length === 0 || (name[0] === '_') && !_.contains(config.get('metaFields'), name)) return;
+
+      var mapping = _.cloneDeep(field.mapping[keys.shift()]);
+      mapping.type = castMappingType(mapping.type);
+
+      // Override the mapping, even if elasticsearch says otherwise
+      var mappingOverrides = {
+        _source: { type: '_source' },
+        _index: { type: 'string' },
+        _type: { type: 'string' },
+        _id: { type: 'string' },
+        _timestamp: {
+          type: 'date',
+          indexed: true
+        },
+        _score: {
+          type: 'number',
+          indexed: false
+        }
+      };
+
+      if (!mapping.index || mapping.index === 'no') {
+        // elasticsearch responds with false sometimes and 'no' others
+        mapping.indexed = false;
+      } else {
+        mapping.indexed = true;
+      }
+
+      mapping.analyzed = mapping.index === 'analyzed' ? true : false;
+
+      if (mappingOverrides[name]) {
+        _.merge(mapping, mappingOverrides[name]);
+      }
+
+      return mapping;
+    };
+  };
+});
diff --git a/src/kibana/components/index_patterns/_mapper.js b/src/ui/public/index_patterns/_mapper.js
similarity index 86%
rename from src/kibana/components/index_patterns/_mapper.js
rename to src/ui/public/index_patterns/_mapper.js
index 8cd767eccea79..c0b77bd8caafc 100644
--- a/src/kibana/components/index_patterns/_mapper.js
+++ b/src/ui/public/index_patterns/_mapper.js
@@ -1,14 +1,14 @@
 define(function (require) {
-  return function MapperService(Private, Promise, es, config) {
+  return function MapperService(Private, Promise, es, config, kbnIndex) {
     var _ = require('lodash');
     var moment = require('moment');
 
-    var IndexPatternMissingIndices = require('errors').IndexPatternMissingIndices;
-    var transformMappingIntoFields = Private(require('components/index_patterns/_transform_mapping_into_fields'));
-    var intervals = Private(require('components/index_patterns/_intervals'));
-    var patternToWildcard = Private(require('components/index_patterns/_pattern_to_wildcard'));
+    var IndexPatternMissingIndices = require('ui/errors').IndexPatternMissingIndices;
+    var transformMappingIntoFields = Private(require('ui/index_patterns/_transform_mapping_into_fields'));
+    var intervals = Private(require('ui/index_patterns/_intervals'));
+    var patternToWildcard = Private(require('ui/index_patterns/_pattern_to_wildcard'));
 
-    var LocalCache = Private(require('components/index_patterns/_local_cache'));
+    var LocalCache = Private(require('ui/index_patterns/_local_cache'));
 
     function Mapper() {
 
@@ -33,7 +33,7 @@ define(function (require) {
 
         if (!skipIndexPatternCache) {
           return es.get({
-            index: config.file.kibana_index,
+            index: kbnIndex,
             type: 'index-pattern',
             id: id,
             _sourceInclude: ['fields']
diff --git a/src/kibana/components/index_patterns/_object.tmpl.html b/src/ui/public/index_patterns/_object.tmpl.html
similarity index 100%
rename from src/kibana/components/index_patterns/_object.tmpl.html
rename to src/ui/public/index_patterns/_object.tmpl.html
diff --git a/src/kibana/components/index_patterns/_pattern_cache.js b/src/ui/public/index_patterns/_pattern_cache.js
similarity index 100%
rename from src/kibana/components/index_patterns/_pattern_cache.js
rename to src/ui/public/index_patterns/_pattern_cache.js
diff --git a/src/kibana/components/index_patterns/_pattern_to_wildcard.js b/src/ui/public/index_patterns/_pattern_to_wildcard.js
similarity index 100%
rename from src/kibana/components/index_patterns/_pattern_to_wildcard.js
rename to src/ui/public/index_patterns/_pattern_to_wildcard.js
diff --git a/src/kibana/components/index_patterns/_transform_mapping_into_fields.js b/src/ui/public/index_patterns/_transform_mapping_into_fields.js
similarity index 88%
rename from src/kibana/components/index_patterns/_transform_mapping_into_fields.js
rename to src/ui/public/index_patterns/_transform_mapping_into_fields.js
index 04a11df357afb..eb850650510f1 100644
--- a/src/kibana/components/index_patterns/_transform_mapping_into_fields.js
+++ b/src/ui/public/index_patterns/_transform_mapping_into_fields.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  return function transformMappingIntoFields(Private, configFile, config) {
+  return function transformMappingIntoFields(Private, kbnIndex, config) {
     var _ = require('lodash');
-    var mapField = Private(require('components/index_patterns/_map_field'));
+    var mapField = Private(require('ui/index_patterns/_map_field'));
 
 
     /**
@@ -16,7 +16,7 @@ define(function (require) {
     return function (response) {
       var fields = {};
       _.each(response, function (index, indexName) {
-        if (indexName === configFile.kibana_index) return;
+        if (indexName === kbnIndex) return;
         _.each(index.mappings, function (mappings) {
           _.each(mappings, function (field, name) {
             var keys = Object.keys(field.mapping);
diff --git a/src/ui/public/index_patterns/index_patterns.js b/src/ui/public/index_patterns/index_patterns.js
new file mode 100644
index 0000000000000..979c9f7ad2620
--- /dev/null
+++ b/src/ui/public/index_patterns/index_patterns.js
@@ -0,0 +1,48 @@
+define(function (require) {
+  var module = require('ui/modules').get('kibana/index_patterns');
+  require('ui/filters/short_dots');
+
+  module.service('indexPatterns', function (es, Notifier, Private, Promise, kbnIndex) {
+    var self = this;
+    var _ = require('lodash');
+    var errors = require('ui/errors');
+
+    var IndexPattern = Private(require('ui/index_patterns/_index_pattern'));
+    var patternCache = Private(require('ui/index_patterns/_pattern_cache'));
+
+    var notify = new Notifier({ location: 'IndexPatterns Service'});
+
+    self.get = function (id) {
+      if (!id) return self.make();
+
+      var cache = patternCache.get(id);
+      return cache || patternCache.set(id, self.make(id));
+    };
+
+    self.make = function (id) {
+      return (new IndexPattern(id)).init();
+    };
+
+    self.delete = function (pattern) {
+      self.getIds.clearCache();
+      patternCache.delete(pattern.id);
+      return es.delete({
+        index: kbnIndex,
+        type: 'index-pattern',
+        id: pattern.id
+      });
+    };
+
+    self.errors = {
+      MissingIndices: errors.IndexPatternMissingIndices
+    };
+
+    self.cache = patternCache;
+    self.getIds = Private(require('ui/index_patterns/_get_ids'));
+    self.intervals = Private(require('ui/index_patterns/_intervals'));
+    self.mapper = Private(require('ui/index_patterns/_mapper'));
+    self.patternToWildcard = Private(require('ui/index_patterns/_pattern_to_wildcard'));
+    self.fieldFormats = Private(require('ui/registry/field_formats'));
+    self.IndexPattern = IndexPattern;
+  });
+});
diff --git a/src/ui/public/listen/__tests__/listen.js b/src/ui/public/listen/__tests__/listen.js
new file mode 100644
index 0000000000000..ec2c7471158a8
--- /dev/null
+++ b/src/ui/public/listen/__tests__/listen.js
@@ -0,0 +1,76 @@
+
+describe('listen component', function () {
+  var sinon = require('auto-release-sinon');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var $rootScope;
+  var Events;
+
+  require('ui/listen');
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function ($injector, Private) {
+    $rootScope = $injector.get('$rootScope');
+    Events = Private(require('ui/events'));
+  }));
+
+  it('exposes the $listen method on all scopes', function () {
+    expect($rootScope.$listen).to.be.a('function');
+    expect($rootScope.$new().$listen).to.be.a('function');
+  });
+
+  it('binds to an event emitter', function () {
+    var emitter = new Events();
+    var $scope = $rootScope.$new();
+
+    function handler() {}
+    $scope.$listen(emitter, 'hello', handler);
+
+    expect(emitter._listeners.hello).to.have.length(1);
+    expect(emitter._listeners.hello[0].handler).to.be(handler);
+  });
+
+  it('binds to $scope, waiting for the destroy event', function () {
+    var emitter = new Events();
+    var $scope = $rootScope.$new();
+
+    sinon.stub($scope, '$on');
+    sinon.stub($rootScope, '$on');
+
+    function handler() {}
+    $scope.$listen(emitter, 'hello', handler);
+
+    expect($rootScope.$on).to.have.property('callCount', 0);
+    expect($scope.$on).to.have.property('callCount', 1);
+
+    var call = $scope.$on.firstCall;
+    expect(call.args[0]).to.be('$destroy');
+    expect(call.args[1]).to.be.a('function');
+  });
+
+  it('unbinds the event handler when $destroy is triggered', function () {
+    var emitter = new Events();
+    var $scope = $rootScope.$new();
+
+    sinon.stub($scope, '$on');
+    sinon.stub(emitter, 'off');
+
+    // set the listener
+    function handler() {}
+    $scope.$listen(emitter, 'hello', handler);
+
+    // get the unbinder that was registered to $scope
+    var unbinder = $scope.$on.firstCall.args[1];
+
+    // call the unbinder
+    expect(emitter.off).to.have.property('callCount', 0);
+    unbinder();
+    expect(emitter.off).to.have.property('callCount', 1);
+
+    // check that the off args were as expected
+    var call = emitter.off.firstCall;
+    expect(call.args[0]).to.be('hello');
+    expect(call.args[1]).to.be(handler);
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/listen/listen.js b/src/ui/public/listen/listen.js
new file mode 100644
index 0000000000000..26fcf9859b063
--- /dev/null
+++ b/src/ui/public/listen/listen.js
@@ -0,0 +1,24 @@
+define(function (require) {
+  var _ = require('lodash');
+
+  require('ui/modules').get('kibana')
+  .run(function ($rootScope) {
+
+    /**
+     * Helper that registers an event listener, and removes that listener when
+     * the $scope is destroyed.
+     *
+     * @param  {EventEmitter} emitter - the event emitter to listen to
+     * @param  {string} eventName - the event name
+     * @param  {Function} handler - the event handler
+     * @return {undefined}
+     */
+    $rootScope.constructor.prototype.$listen = function (emitter, eventName, handler) {
+      emitter.on(eventName, handler);
+      this.$on('$destroy', function () {
+        emitter.off(eventName, handler);
+      });
+    };
+
+  });
+});
\ No newline at end of file
diff --git a/src/kibana/utils/modules.js b/src/ui/public/modules.js
similarity index 99%
rename from src/kibana/utils/modules.js
rename to src/ui/public/modules.js
index 077da91c353b3..286b6cd6a20a3 100644
--- a/src/kibana/utils/modules.js
+++ b/src/ui/public/modules.js
@@ -59,4 +59,4 @@ define(function (require) {
     get: get,
     close: close
   };
-});
\ No newline at end of file
+});
diff --git a/src/ui/public/notify/Notifier.js b/src/ui/public/notify/Notifier.js
new file mode 100644
index 0000000000000..ada3394f45720
--- /dev/null
+++ b/src/ui/public/notify/Notifier.js
@@ -0,0 +1,358 @@
+
+define(function (require) {
+  var _ = require('lodash');
+  var $ = require('jquery');
+
+  var notifs = [];
+  var setTO = setTimeout;
+  var clearTO = clearTimeout;
+  var consoleGroups = ('group' in window.console) && ('groupCollapsed' in window.console) && ('groupEnd' in window.console);
+
+  var fatalSplashScreen = require('ui/notify/partials/fatal_splash_screen.html');
+
+  var log = _.noop;
+  if (typeof KIBANA_DIST === 'undefined') {
+    log = function () {
+      console.log.apply(console, arguments);
+    };
+  }
+
+  // used to identify the first call to fatal, set to false there
+  var firstFatal = true;
+
+  var fatalToastTemplate = (function lazyTemplate(tmpl) {
+    var compiled;
+    return function (vars) {
+      return (compiled || (compiled = _.template(tmpl)))(vars);
+    };
+  }(require('ui/notify/partials/fatal.html')));
+
+  function now() {
+    if (window.performance && window.performance.now) {
+      return window.performance.now();
+    }
+    return Date.now();
+  }
+
+  function closeNotif(cb, key) {
+    return function () {
+      // this === notif
+      var i = notifs.indexOf(this);
+      if (i !== -1) notifs.splice(i, 1);
+      if (this.timerId) this.timerId = clearTO(this.timerId);
+      if (typeof cb === 'function') cb(key);
+    };
+  }
+
+  function add(notif, cb) {
+    if (notif.lifetime !== Infinity) {
+      notif.timerId = setTO(function () {
+        closeNotif(cb, 'ignore').call(notif);
+      }, notif.lifetime);
+    }
+
+    notif.clear = closeNotif();
+    if (notif.actions) {
+      notif.actions.forEach(function (action) {
+        notif[action] = closeNotif(cb, action);
+      });
+    }
+
+    notif.count = (notif.count || 0) + 1;
+
+    var dup = _.find(notifs, function (item) {
+      return item.content === notif.content && item.lifetime === notif.lifetime;
+    });
+
+    if (dup) {
+      dup.count += 1;
+      dup.stacks = _.union(dup.stacks, [notif.stack]);
+      return dup;
+    }
+
+    notif.stacks = [notif.stack];
+    notifs.push(notif);
+    return notif;
+  }
+
+  function formatMsg(msg, from) {
+    var rtn = '';
+    if (from) {
+      rtn += from + ': ';
+    }
+
+    if (typeof msg === 'string') {
+      rtn += msg;
+    } else if (msg instanceof Error) {
+      rtn += msg.message;
+    }
+
+    return rtn;
+  }
+
+  // browsers format Error.stack differently; always include message
+  function formatStack(err) {
+    if (err.stack && !~err.stack.indexOf(err.message)) {
+      return 'Error: ' + err.message + '\n' + err.stack;
+    }
+    return err.stack;
+  }
+
+  /**
+   * Functionality to check that
+   */
+  function Notifier(opts) {
+    var self = this;
+    opts = opts || {};
+
+    // label type thing to say where notifications came from
+    self.from = opts.location;
+
+    'event lifecycle timed fatal error warning info'.split(' ').forEach(function (m) {
+      self[m] = _.bind(self[m], self);
+    });
+  }
+
+  // to be notified when the first fatal error occurs, push a function into this array.
+  Notifier.fatalCallbacks = [];
+
+  // set the timer functions that all notification managers will use
+  Notifier.setTimerFns = function (set, clear) {
+    setTO = set;
+    clearTO = clear;
+  };
+
+  // simply a pointer to the global notif list
+  Notifier.prototype._notifs = notifs;
+
+  /**
+   * Log a sometimes redundant event
+   * @param {string} name - The name of the group
+   * @param {boolean} success - Simple flag stating whether the event succeeded
+   */
+  Notifier.prototype.event = createGroupLogger('event', {
+    open: true
+  });
+
+  /**
+   * Log a major, important, event in the lifecycle of the application
+   * @param {string} name - The name of the lifecycle event
+   * @param {boolean} success - Simple flag stating whether the lifecycle event succeeded
+   */
+  Notifier.prototype.lifecycle = createGroupLogger('lifecycle', {
+    open: true
+  });
+
+  /**
+   * Wrap a function so that it's execution time gets logged.
+   *
+   * @param {function} fn - the function to wrap, it's .name property is
+   *                      read so make sure to set it
+   * @return {function} - the wrapped function
+   */
+  Notifier.prototype.timed = function (name, fn) {
+    var self = this;
+
+    if (typeof name === 'function') {
+      fn = name;
+      name = fn.name;
+    }
+
+    return function WrappedNotifierFunction() {
+      var cntx = this;
+      var args = arguments;
+
+      return self.event(name, function () {
+        return fn.apply(cntx, args);
+      });
+    };
+  };
+
+  /**
+   * Kill the page, display an error, then throw the error.
+   * Used as a last-resort error back in many promise chains
+   * so it rethrows the error that's displayed on the page.
+   *
+   * @param  {Error} err - The error that occured
+   */
+  Notifier.prototype.fatal = function (err) {
+    this._showFatal(err);
+    throw err;
+  };
+
+  /**
+   * Display an error that destroys the entire app. Broken out so that
+   * global error handlers can display fatal errors without throwing another
+   * error like in #fatal()
+   *
+   * @param  {Error} err - The fatal error that occured
+   */
+  Notifier.prototype._showFatal = function (err) {
+    if (firstFatal) {
+      _.callEach(Notifier.fatalCallbacks);
+      firstFatal = false;
+      window.addEventListener('hashchange', function () {
+        window.location.reload();
+      });
+    }
+
+    var html = fatalToastTemplate({
+      msg: formatMsg(err, this.from),
+      stack: formatStack(err)
+    });
+
+    var $container = $('#fatal-splash-screen');
+
+    if (!$container.size()) {
+      $(document.body)
+        // in case the app has not completed boot
+      .removeAttr('ng-cloak')
+      .html(fatalSplashScreen);
+
+      $container = $('#fatal-splash-screen');
+    }
+
+    $container.append(html);
+    console.error(err.stack);
+  };
+
+  /**
+   * Alert the user of an error that occured
+   * @param  {Error|String} err
+   */
+  Notifier.prototype.error = function (err, cb) {
+    return add({
+      type: 'danger',
+      content: formatMsg(err, this.from),
+      icon: 'warning',
+      title: 'Error',
+      lifetime: Infinity,
+      actions: ['report', 'accept'],
+      stack: formatStack(err)
+    }, cb);
+  };
+
+  /**
+   * Warn the user abort something
+   * @param  {[type]} msg [description]
+   * @return {[type]}     [description]
+   */
+  Notifier.prototype.warning = function (msg, cb) {
+    return add({
+      type: 'warning',
+      content: formatMsg(msg, this.from),
+      icon: 'warning',
+      title: 'Warning',
+      lifetime: 10000,
+      actions: ['accept']
+    }, cb);
+  };
+
+  /**
+   * Display a debug message
+   * @param  {String} msg [description]
+   * @return {[type]}     [description]
+   */
+  Notifier.prototype.info = function (msg, cb) {
+    return add({
+      type: 'info',
+      content: formatMsg(msg, this.from),
+      icon: 'info-circle',
+      title: 'Debug',
+      lifetime: 5000,
+      actions: ['accept']
+    }, cb);
+  };
+
+  if (log === _.noop) {
+    Notifier.prototype.log = _.noop;
+  } else {
+    Notifier.prototype.log = function () {
+      var args = [].slice.apply(arguments);
+      if (this.from) args.unshift(this.from + ':');
+      log.apply(null, args);
+    };
+  }
+
+  // general functionality used by .event() and .lifecycle()
+  function createGroupLogger(type, opts) {
+    // Track the groups managed by this logger
+    var groups = window[type + 'Groups'] = {};
+
+    return function logger(name, success) {
+      var status; // status of the timer
+      var exec; // function to execute and wrap
+      var ret; // return value
+
+      var complete = function (val) { logger(name, true); return val; };
+      var failure = function (err) { logger(name, false); throw err; };
+
+      if (typeof success === 'function' || success === void 0) {
+        // start
+        groups[name] = now();
+        if (success) {
+          // success === the function to time
+          exec = success;
+        } else {
+          // function that can report on the success or failure of an op, and pass their value along
+          ret = complete;
+          ret.failure = failure;
+        }
+      }
+      else {
+        groups[name] = now() - (groups[name] || 0);
+        var time = ' in ' + groups[name].toFixed(2) + 'ms';
+
+        // end
+        if (success) {
+          status = 'complete' + time;
+        } else {
+          groups[name] = false;
+          status = 'failure' + time;
+        }
+      }
+
+      if (consoleGroups) {
+        if (status) {
+          console.log(status);
+          console.groupEnd();
+        } else {
+          if (opts.open) {
+            console.group(name);
+          } else {
+            console.groupCollapsed(name);
+          }
+        }
+      } else {
+        log('KBN: ' + name + (status ? ' - ' + status : ''));
+      }
+
+      if (exec) {
+        try {
+          ret = exec();
+        } catch (e) {
+          return failure(e);
+        }
+
+        if (ret && typeof ret.then === 'function') {
+          // return a new promise that proxies the value
+          // and logs about the promise outcome
+          return ret.then(function (val) {
+            complete();
+            return val;
+          }, function (err) {
+            failure(err);
+            throw err;
+          });
+        }
+
+        // the function executed fine, and didn't return a promise, move along
+        complete();
+      }
+
+      return ret;
+    };
+  }
+
+  return Notifier;
+});
diff --git a/src/ui/public/notify/directives.js b/src/ui/public/notify/directives.js
new file mode 100644
index 0000000000000..62681163211e7
--- /dev/null
+++ b/src/ui/public/notify/directives.js
@@ -0,0 +1,15 @@
+define(function (require) {
+  var notify = require('ui/modules').get('kibana/notify');
+  var _ = require('lodash');
+
+  notify.directive('kbnNotifications', function () {
+    return {
+      restrict: 'E',
+      scope: {
+        list: '=list'
+      },
+      replace: true,
+      template: require('ui/notify/partials/toaster.html')
+    };
+  });
+});
diff --git a/src/ui/public/notify/errors.js b/src/ui/public/notify/errors.js
new file mode 100644
index 0000000000000..f5d9ded164fca
--- /dev/null
+++ b/src/ui/public/notify/errors.js
@@ -0,0 +1,29 @@
+define(function (require) {
+  var errors = {};
+  var _ = require('lodash');
+
+  var canStack = (function () {
+    var err = new Error();
+    return !!err.stack;
+  }());
+
+  // abstract error class
+  _.class(KibanaError).inherits(Error);
+  function KibanaError(msg, constructor) {
+    this.message = msg;
+
+    Error.call(this, this.message);
+    if (!this.stack) {
+      if (Error.captureStackTrace) {
+        Error.captureStackTrace(this, constructor || KibanaError);
+      } else if (canStack) {
+        this.stack = (new Error()).stack;
+      } else {
+        this.stack = '';
+      }
+    }
+  }
+  errors.KibanaError = KibanaError;
+
+  return errors;
+});
diff --git a/src/ui/public/notify/notify.js b/src/ui/public/notify/notify.js
new file mode 100644
index 0000000000000..9a371eed3fdc5
--- /dev/null
+++ b/src/ui/public/notify/notify.js
@@ -0,0 +1,45 @@
+define(function (require) {
+  var _ = require('lodash');
+  var $ = require('jquery');
+  var modules = require('ui/modules');
+  var module = modules.get('kibana/notify');
+  var errors = require('ui/notify/errors');
+  var Notifier = require('ui/notify/Notifier');
+  var rootNotifier = new Notifier();
+
+  require('ui/notify/directives');
+
+  module.factory('createNotifier', function () {
+    return function (opts) {
+      return new Notifier(opts);
+    };
+  });
+
+  module.factory('Notifier', function () {
+    return Notifier;
+  });
+
+  module.run(function ($timeout) {
+    // provide alternate methods for setting timeouts, which will properly trigger digest cycles
+    Notifier.setTimerFns($timeout, $timeout.cancel);
+  });
+
+  /**
+   * Global Angular exception handler (NOT JUST UNCAUGHT EXCEPTIONS)
+   */
+  // modules
+  //   .get('exceptionOverride')
+  //   .factory('$exceptionHandler', function () {
+  //     return function (exception, cause) {
+  //       rootNotifier.fatal(exception, cause);
+  //     };
+  //   });
+
+  window.onerror = function (err, url, line) {
+    rootNotifier.fatal(new Error(err + ' (' + url + ':' + line + ')'));
+    return true;
+  };
+
+  return rootNotifier;
+
+});
diff --git a/src/kibana/components/notify/partials/fatal.html b/src/ui/public/notify/partials/fatal.html
similarity index 100%
rename from src/kibana/components/notify/partials/fatal.html
rename to src/ui/public/notify/partials/fatal.html
diff --git a/src/kibana/components/notify/partials/fatal_splash_screen.html b/src/ui/public/notify/partials/fatal_splash_screen.html
similarity index 100%
rename from src/kibana/components/notify/partials/fatal_splash_screen.html
rename to src/ui/public/notify/partials/fatal_splash_screen.html
diff --git a/src/kibana/components/notify/partials/toaster.html b/src/ui/public/notify/partials/toaster.html
similarity index 100%
rename from src/kibana/components/notify/partials/toaster.html
rename to src/ui/public/notify/partials/toaster.html
diff --git a/src/kibana/components/number_list/number_list.html b/src/ui/public/number_list/number_list.html
similarity index 100%
rename from src/kibana/components/number_list/number_list.html
rename to src/ui/public/number_list/number_list.html
diff --git a/src/ui/public/number_list/number_list.js b/src/ui/public/number_list/number_list.js
new file mode 100644
index 0000000000000..0b6e1b97053c9
--- /dev/null
+++ b/src/ui/public/number_list/number_list.js
@@ -0,0 +1,108 @@
+define(function (require) {
+  var _ = require('lodash');
+  var parseRange = require('ui/utils/range');
+
+  require('ui/number_list/number_list_input');
+  require('ui/modules')
+  .get('kibana')
+  .directive('kbnNumberList', function () {
+    return {
+      restrict: 'E',
+      template: require('ui/number_list/number_list.html'),
+      controllerAs: 'numberListCntr',
+      require: 'ngModel',
+      controller: function ($scope, $attrs, $parse) {
+        var self = this;
+
+        // Called from the pre-link function once we have the controllers
+        self.init = function (modelCntr) {
+          self.modelCntr = modelCntr;
+
+          self.getList = function () {
+            return self.modelCntr.$modelValue;
+          };
+
+          self.getUnitName = _.partial($parse($attrs.unit), $scope);
+
+          var defaultRange = self.range = parseRange('[0,Infinity)');
+
+          $scope.$watch(function () {
+            return $attrs.range;
+          }, function (range, prev) {
+            if (!range) {
+              self.range = defaultRange;
+              return;
+            }
+
+            try {
+              self.range = parseRange(range);
+            } catch (e) {
+              throw new TypeError('Unable to parse range: ' + e.message);
+            }
+          });
+
+          /**
+           * Remove an item from list by index
+           * @param  {number} index
+           * @return {undefined}
+           */
+          self.remove = function (index) {
+            var list = self.getList();
+            if (!list) return;
+
+            list.splice(index, 1);
+          };
+
+          /**
+           * Add an item to the end of the list
+           * @return {undefined}
+           */
+          self.add = function () {
+            var list = self.getList();
+            if (!list) return;
+
+            list.push(_.last(list) + 1);
+          };
+
+          /**
+           * Check to see if the list is too short.
+           *
+           * @return {Boolean}
+           */
+          self.tooShort = function () {
+            return _.size(self.getList()) < 1;
+          };
+
+          /**
+           * Check to see if the list is too short, but simply
+           * because the user hasn't interacted with it yet
+           *
+           * @return {Boolean}
+           */
+          self.undefinedLength = function () {
+            return self.tooShort() && (self.modelCntr.$untouched && self.modelCntr.$pristine);
+          };
+
+          /**
+           * Check to see if the list is too short
+           *
+           * @return {Boolean}
+           */
+          self.invalidLength = function () {
+            return self.tooShort() && !self.undefinedLength();
+          };
+
+          $scope.$watchCollection(self.getList, function () {
+            self.modelCntr.$setValidity('numberListLength', !self.tooShort());
+          });
+        };
+      },
+      link: {
+        pre: function ($scope, $el, attrs, ngModelCntr) {
+          $scope.numberListCntr.init(ngModelCntr);
+        }
+      },
+    };
+  });
+
+});
diff --git a/src/kibana/components/number_list/number_list_input.js b/src/ui/public/number_list/number_list_input.js
similarity index 98%
rename from src/kibana/components/number_list/number_list_input.js
rename to src/ui/public/number_list/number_list_input.js
index 95df591ec9426..9c3aa1936d59a 100644
--- a/src/kibana/components/number_list/number_list_input.js
+++ b/src/ui/public/number_list/number_list_input.js
@@ -1,7 +1,7 @@
 define(function (require) {
   var $ = require('jquery');
   var _ = require('lodash');
-  var keyMap = require('utils/key_map');
+  var keyMap = require('ui/utils/key_map');
 
   var INVALID = {}; // invalid flag
   var FLOATABLE = /^[\d\.e\-\+]+$/i;
@@ -9,7 +9,7 @@ define(function (require) {
   var VALIDATION_ERROR = 'numberListRangeAndOrder';
   var DIRECTIVE_ATTR = 'kbn-number-list-input';
 
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .directive('kbnNumberListInput', function ($parse) {
     return {
diff --git a/src/ui/public/paginated_table/__tests__/index.js b/src/ui/public/paginated_table/__tests__/index.js
new file mode 100644
index 0000000000000..0a798c511952d
--- /dev/null
+++ b/src/ui/public/paginated_table/__tests__/index.js
@@ -0,0 +1,368 @@
+
+require('ui/paginated_table');
+var _ = require('lodash');
+var $ = require('jquery');
+var sinon = require('sinon');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+describe('paginated table', function () {
+  var $el;
+  var $rootScope;
+  var $compile;
+  var $scope;
+  var $elScope;
+  var $orderBy;
+  var defaultPerPage = 10;
+
+  var makeData = function (colCount, rowCount) {
+    var columns = [];
+    var rows = [];
+
+    if (_.isNumber(colCount)) {
+      _.times(colCount, function (i) {
+        columns.push({ title: 'column' + i });
+      });
+    } else {
+      columns = colCount;
+    }
+
+    if (_.isNumber(rowCount)) {
+      _.times(rowCount, function (col) {
+        var rowItems = [];
+
+        _.times(columns.length, function (row) {
+          rowItems.push('item' + col + row);
+        });
+
+        rows.push(rowItems);
+      });
+    } else {
+      rows = rowCount;
+    }
+
+    return {
+      columns: columns,
+      rows: rows
+    };
+  };
+
+  var renderTable = function (cols, rows, perPage) {
+    $scope.cols = cols || [];
+    $scope.rows = rows || [];
+    $scope.perPage = perPage || defaultPerPage;
+
+    $el = $compile('<paginated-table columns="cols" rows="rows" per-page="perPage">')($scope);
+
+    $scope.$digest();
+  };
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (_$rootScope_, _$compile_, $filter) {
+    $rootScope = _$rootScope_;
+    $compile = _$compile_;
+    $orderBy = $filter('orderBy');
+    $scope = $rootScope.$new();
+  }));
+
+  describe('rendering', function () {
+    it('should not display without rows', function () {
+      var cols = [{
+        title: 'test1'
+      }];
+      var rows = [];
+
+      renderTable(cols, rows);
+      expect($el.children().size()).to.be(0);
+    });
+
+    it('should render columns and rows', function () {
+      var data = makeData(2, 2);
+      var cols = data.columns;
+      var rows = data.rows;
+
+      renderTable(cols, rows);
+      expect($el.children().size()).to.be(1);
+      var tableRows = $el.find('tbody tr');
+      // should pad rows
+      expect(tableRows.size()).to.be(defaultPerPage);
+      // should contain the row data
+      expect(tableRows.eq(0).find('td').eq(0).text()).to.be(rows[0][0]);
+      expect(tableRows.eq(0).find('td').eq(1).text()).to.be(rows[0][1]);
+      expect(tableRows.eq(1).find('td').eq(0).text()).to.be(rows[1][0]);
+      expect(tableRows.eq(1).find('td').eq(1).text()).to.be(rows[1][1]);
+    });
+
+    it('should paginate rows', function () {
+      // note: paginate truncates pages, so don't make too many
+      var rowCount = _.random(16, 24);
+      var perPageCount = _.random(5, 8);
+      var data = makeData(3, rowCount);
+      var pageCount = Math.ceil(rowCount / perPageCount);
+
+      renderTable(data.columns, data.rows, perPageCount);
+      var tableRows = $el.find('tbody tr');
+      expect(tableRows.size()).to.be(perPageCount);
+      // add 2 for the first and last page links
+      expect($el.find('paginate-controls a').size()).to.be(pageCount + 2);
+    });
+  });
+
+  describe('sorting', function () {
+    var data;
+    var lastRowIndex;
+    var paginatedTable;
+
+    beforeEach(function () {
+      data = makeData(3, [
+        ['bbbb', 'aaaa', 'zzzz'],
+        ['cccc', 'cccc', 'aaaa'],
+        ['zzzz', 'bbbb', 'bbbb'],
+        ['aaaa', 'zzzz', 'cccc'],
+      ]);
+
+      lastRowIndex = data.rows.length - 1;
+      renderTable(data.columns, data.rows);
+      paginatedTable = $el.isolateScope().paginatedTable;
+    });
+
+    // afterEach(function () {
+    //   $scope.$destroy();
+    // });
+
+    it('should not sort by default', function () {
+      var tableRows = $el.find('tbody tr');
+      expect(tableRows.eq(0).find('td').eq(0).text()).to.be(data.rows[0][0]);
+      expect(tableRows.eq(lastRowIndex).find('td').eq(0).text()).to.be(data.rows[lastRowIndex][0]);
+    });
+
+    it('should do nothing when sorting by invalid column id', function () {
+      // sortColumn
+      paginatedTable.sortColumn(999);
+      $scope.$digest();
+
+      var tableRows = $el.find('tbody tr');
+      expect(tableRows.eq(0).find('td').eq(0).text()).to.be('bbbb');
+      expect(tableRows.eq(0).find('td').eq(1).text()).to.be('aaaa');
+      expect(tableRows.eq(0).find('td').eq(2).text()).to.be('zzzz');
+    });
+
+    it('should do nothing when sorting by non sortable column', function () {
+      data.columns[0].sortable = false;
+
+      // sortColumn
+      paginatedTable.sortColumn(0);
+      $scope.$digest();
+
+      var tableRows = $el.find('tbody tr');
+      expect(tableRows.eq(0).find('td').eq(0).text()).to.be('bbbb');
+      expect(tableRows.eq(0).find('td').eq(1).text()).to.be('aaaa');
+      expect(tableRows.eq(0).find('td').eq(2).text()).to.be('zzzz');
+    });
+
+    it('should sort ascending on first invocation', function () {
+      // sortColumn
+      paginatedTable.sortColumn(0);
+      $scope.$digest();
+
+      var tableRows = $el.find('tbody tr');
+      expect(tableRows.eq(0).find('td').eq(0).text()).to.be('aaaa');
+      expect(tableRows.eq(lastRowIndex).find('td').eq(0).text()).to.be('zzzz');
+    });
+
+    it('should sort descending on second invocation', function () {
+      // sortColumn
+      paginatedTable.sortColumn(0);
+      paginatedTable.sortColumn(0);
+      $scope.$digest();
+
+      var tableRows = $el.find('tbody tr');
+      expect(tableRows.eq(0).find('td').eq(0).text()).to.be('zzzz');
+      expect(tableRows.eq(lastRowIndex).find('td').eq(0).text()).to.be('aaaa');
+    });
+
+    it('should clear sorting on third invocation', function () {
+      // sortColumn
+      paginatedTable.sortColumn(0);
+      paginatedTable.sortColumn(0);
+      paginatedTable.sortColumn(0);
+      $scope.$digest();
+
+      var tableRows = $el.find('tbody tr');
+      expect(tableRows.eq(0).find('td').eq(0).text()).to.be(data.rows[0][0]);
+      expect(tableRows.eq(lastRowIndex).find('td').eq(0).text()).to.be('aaaa');
+    });
+
+    it('should sort new column ascending', function () {
+      // sort by first column
+      paginatedTable.sortColumn(0);
+      $scope.$digest();
+
+      // sort by second column
+      paginatedTable.sortColumn(1);
+      $scope.$digest();
+
+      var tableRows = $el.find('tbody tr');
+      expect(tableRows.eq(0).find('td').eq(1).text()).to.be('aaaa');
+      expect(tableRows.eq(lastRowIndex).find('td').eq(1).text()).to.be('zzzz');
+    });
+
+  });
+
+  describe('sorting duplicate columns', function () {
+    var data;
+    var paginatedTable;
+    var colText = 'test row';
+
+    beforeEach(function () {
+      var cols = [
+        { title: colText },
+        { title: colText },
+        { title: colText }
+      ];
+      var rows = [
+        ['bbbb', 'aaaa', 'zzzz'],
+        ['cccc', 'cccc', 'aaaa'],
+        ['zzzz', 'bbbb', 'bbbb'],
+        ['aaaa', 'zzzz', 'cccc'],
+      ];
+      data = makeData(cols, rows);
+
+      renderTable(data.columns, data.rows);
+      paginatedTable = $el.isolateScope().paginatedTable;
+    });
+
+    it('should have duplicate column titles', function () {
+      var columns = $el.find('thead th span');
+      columns.each(function () {
+        expect($(this).text()).to.be(colText);
+      });
+    });
+
+    it('should handle sorting on columns with the same name', function () {
+      // sort by the last column
+      paginatedTable.sortColumn(2);
+      $scope.$digest();
+
+      var tableRows = $el.find('tbody tr');
+      expect(tableRows.eq(0).find('td').eq(0).text()).to.be('cccc');
+      expect(tableRows.eq(0).find('td').eq(1).text()).to.be('cccc');
+      expect(tableRows.eq(0).find('td').eq(2).text()).to.be('aaaa');
+      expect(tableRows.eq(1).find('td').eq(2).text()).to.be('bbbb');
+      expect(tableRows.eq(2).find('td').eq(2).text()).to.be('cccc');
+      expect(tableRows.eq(3).find('td').eq(2).text()).to.be('zzzz');
+    });
+
+    it('should sort correctly between columns', function () {
+      // sort by the last column
+      paginatedTable.sortColumn(2);
+      $scope.$digest();
+
+      var tableRows = $el.find('tbody tr');
+      expect(tableRows.eq(0).find('td').eq(0).text()).to.be('cccc');
+      expect(tableRows.eq(0).find('td').eq(1).text()).to.be('cccc');
+      expect(tableRows.eq(0).find('td').eq(2).text()).to.be('aaaa');
+
+      // sort by the first column
+      paginatedTable.sortColumn(0);
+      $scope.$digest();
+
+      tableRows = $el.find('tbody tr');
+      expect(tableRows.eq(0).find('td').eq(0).text()).to.be('aaaa');
+      expect(tableRows.eq(0).find('td').eq(1).text()).to.be('zzzz');
+      expect(tableRows.eq(0).find('td').eq(2).text()).to.be('cccc');
+
+      expect(tableRows.eq(1).find('td').eq(0).text()).to.be('bbbb');
+      expect(tableRows.eq(2).find('td').eq(0).text()).to.be('cccc');
+      expect(tableRows.eq(3).find('td').eq(0).text()).to.be('zzzz');
+    });
+
+    it('should not sort duplicate columns', function () {
+      paginatedTable.sortColumn(1);
+      $scope.$digest();
+
+      var sorters = $el.find('thead th i');
+      expect(sorters.eq(0).hasClass('fa-sort')).to.be(true);
+      expect(sorters.eq(1).hasClass('fa-sort')).to.be(false);
+      expect(sorters.eq(2).hasClass('fa-sort')).to.be(true);
+    });
+
+  });
+
+  describe('custom sorting', function () {
+    var data;
+    var paginatedTable;
+    var sortHandler;
+
+    beforeEach(function () {
+      sortHandler = sinon.spy();
+      data = makeData(3, 3);
+      $scope.cols = data.columns;
+      $scope.rows = data.rows;
+      $scope.perPage = defaultPerPage;
+      $scope.sortHandler = sortHandler;
+
+      $el = $compile('<paginated-table columns="cols" rows="rows" per-page="perPage"' +
+        'sort-handler="sortHandler">')($scope);
+
+      $scope.$digest();
+      paginatedTable = $el.isolateScope().paginatedTable;
+    });
+
+    // TODO: This is failing randomly
+    it('should allow custom sorting handler', function () {
+      var columnIndex = 1;
+      paginatedTable.sortColumn(columnIndex);
+      $scope.$digest();
+      expect(sortHandler.callCount).to.be(1);
+      expect(sortHandler.getCall(0).args[0]).to.be(columnIndex);
+    });
+  });
+
+  describe('object rows', function () {
+    var cols;
+    var rows;
+    var paginatedTable;
+
+    beforeEach(function () {
+      cols = [{
+        title: 'object test'
+      }];
+      rows = [
+        ['aaaa'],
+        [{
+          markup: '<h1>I am HTML in a row</h1>',
+          value: 'zzzz'
+        }],
+        ['bbbb']
+      ];
+      renderTable(cols, rows);
+      paginatedTable = $el.isolateScope().paginatedTable;
+    });
+
+    it('should append object markup', function () {
+      var tableRows = $el.find('tbody tr');
+      expect(tableRows.eq(0).find('h1').size()).to.be(0);
+      expect(tableRows.eq(1).find('h1').size()).to.be(1);
+      expect(tableRows.eq(2).find('h1').size()).to.be(0);
+    });
+
+    it('should sort using object value', function () {
+      paginatedTable.sortColumn(0);
+      $scope.$digest();
+      var tableRows = $el.find('tbody tr');
+      expect(tableRows.eq(0).find('h1').size()).to.be(0);
+      expect(tableRows.eq(1).find('h1').size()).to.be(0);
+      // html row should be the last row
+      expect(tableRows.eq(2).find('h1').size()).to.be(1);
+
+      paginatedTable.sortColumn(0);
+      $scope.$digest();
+      tableRows = $el.find('tbody tr');
+      // html row should be the first row
+      expect(tableRows.eq(0).find('h1').size()).to.be(1);
+      expect(tableRows.eq(1).find('h1').size()).to.be(0);
+      expect(tableRows.eq(2).find('h1').size()).to.be(0);
+    });
+  });
+});
diff --git a/src/kibana/components/paginated_table/paginated_table.html b/src/ui/public/paginated_table/paginated_table.html
similarity index 100%
rename from src/kibana/components/paginated_table/paginated_table.html
rename to src/ui/public/paginated_table/paginated_table.html
diff --git a/src/kibana/components/paginated_table/paginated_table.js b/src/ui/public/paginated_table/paginated_table.js
similarity index 95%
rename from src/kibana/components/paginated_table/paginated_table.js
rename to src/ui/public/paginated_table/paginated_table.js
index c6705e791574b..e90c958db2e8e 100644
--- a/src/kibana/components/paginated_table/paginated_table.js
+++ b/src/ui/public/paginated_table/paginated_table.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .directive('paginatedTable', function ($filter) {
     var _ = require('lodash');
@@ -7,7 +7,7 @@ define(function (require) {
 
     return {
       restrict: 'E',
-      template: require('text!components/paginated_table/paginated_table.html'),
+      template: require('ui/paginated_table/paginated_table.html'),
       transclude: true,
       scope: {
         rows: '=',
diff --git a/src/kibana/partials/global_config.html b/src/ui/public/partials/global_config.html
similarity index 100%
rename from src/kibana/partials/global_config.html
rename to src/ui/public/partials/global_config.html
diff --git a/src/kibana/partials/info.html b/src/ui/public/partials/info.html
similarity index 100%
rename from src/kibana/partials/info.html
rename to src/ui/public/partials/info.html
diff --git a/src/kibana/partials/nav_config.html b/src/ui/public/partials/nav_config.html
similarity index 100%
rename from src/kibana/partials/nav_config.html
rename to src/ui/public/partials/nav_config.html
diff --git a/src/kibana/partials/paginate_controls.html b/src/ui/public/partials/paginate_controls.html
similarity index 100%
rename from src/kibana/partials/paginate_controls.html
rename to src/ui/public/partials/paginate_controls.html
diff --git a/src/kibana/partials/saved_object_finder.html b/src/ui/public/partials/saved_object_finder.html
similarity index 100%
rename from src/kibana/partials/saved_object_finder.html
rename to src/ui/public/partials/saved_object_finder.html
diff --git a/src/kibana/partials/truncate_by_height.html b/src/ui/public/partials/truncate_by_height.html
similarity index 100%
rename from src/kibana/partials/truncate_by_height.html
rename to src/ui/public/partials/truncate_by_height.html
diff --git a/src/ui/public/persisted_log/__tests__/persisted_log.js b/src/ui/public/persisted_log/__tests__/persisted_log.js
new file mode 100644
index 0000000000000..9e6298a43a01c
--- /dev/null
+++ b/src/ui/public/persisted_log/__tests__/persisted_log.js
@@ -0,0 +1,116 @@
+
+var sinon = require('sinon');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+var storage;
+var config;
+var PersistedLog;
+
+var historyName = 'testHistory';
+var historyLimit = 10;
+var payload = [
+  { first: 'clark', last: 'kent' },
+  { first: 'peter', last: 'parker' },
+  { first: 'bruce', last: 'wayne' }
+];
+
+require('ui/persisted_log');
+
+function init() {
+  ngMock.module('kibana/persisted_log', function ($provide) {
+    // mock storage service
+    $provide.service('localStorage', function () {
+      this.get = sinon.stub();
+      this.set = sinon.stub();
+      this.remove = sinon.spy();
+      this.clear = sinon.spy();
+    });
+  });
+
+  ngMock.inject(function ($injector) {
+    storage = $injector.get('localStorage');
+    PersistedLog = $injector.get('PersistedLog');
+  });
+}
+
+describe('PersistedLog', function () {
+  beforeEach(function () {
+    init();
+  });
+
+  describe('expected API', function () {
+    it('has expected methods', function () {
+      var log = new PersistedLog(historyName);
+
+      expect(log.add).to.be.a('function');
+      expect(log.get).to.be.a('function');
+    });
+  });
+
+  describe('internal functionality', function () {
+    it('reads from storage', function () {
+      var log = new PersistedLog(historyName);
+
+      expect(storage.get.calledOnce).to.be(true);
+      expect(storage.get.calledWith(historyName)).to.be(true);
+    });
+
+    it('writes to storage', function () {
+      var log = new PersistedLog(historyName);
+      var newItem = { first: 'diana', last: 'prince' };
+
+      var data = log.add(newItem);
+
+      expect(storage.set.calledOnce).to.be(true);
+      expect(data).to.eql([newItem]);
+    });
+  });
+
+  describe('persisting data', function () {
+    it('fetches records from storage', function () {
+      storage.get.returns(payload);
+      var log = new PersistedLog(historyName);
+
+      var items = log.get();
+      expect(items.length).to.equal(3);
+      expect(items).to.eql(payload);
+    });
+
+    it('prepends new records', function () {
+      storage.get.returns(payload.slice(0));
+      var log = new PersistedLog(historyName);
+      var newItem = { first: 'selina', last: 'kyle' };
+
+      var items = log.add(newItem);
+      expect(items.length).to.equal(payload.length + 1);
+      expect(items[0]).to.eql(newItem);
+    });
+  });
+
+  describe('stack options', function () {
+    it('should observe the maxLength option', function () {
+      var bulkData = [];
+
+      for (var i = 0; i < historyLimit; i++) {
+        bulkData.push(['record ' + i]);
+      }
+      storage.get.returns(bulkData);
+
+      var log = new PersistedLog(historyName, { maxLength: historyLimit });
+      log.add(['new array 1']);
+      var items = log.add(['new array 2']);
+
+      expect(items.length).to.equal(historyLimit);
+    });
+
+    it('should observe the filterDuplicates option', function () {
+      storage.get.returns(payload.slice(0));
+      var log = new PersistedLog(historyName, { filterDuplicates: true });
+      var newItem = payload[1];
+
+      var items = log.add(newItem);
+      expect(items.length).to.equal(payload.length);
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/persisted_log/persisted_log.js b/src/ui/public/persisted_log/persisted_log.js
new file mode 100644
index 0000000000000..42f137cedc2fa
--- /dev/null
+++ b/src/ui/public/persisted_log/persisted_log.js
@@ -0,0 +1,48 @@
+define(function (require) {
+  var modules = require('ui/modules');
+  var _ = require('lodash');
+
+  modules.get('kibana/persisted_log')
+  .factory('PersistedLog', function ($window, localStorage) {
+    function PersistedLog(name, options) {
+      options = options || {};
+      this.name = name;
+      this.maxLength = options.maxLength || 0;
+      this.filterDuplicates = options.filterDuplicates || false;
+      this.items = localStorage.get(this.name) || [];
+    }
+
+    PersistedLog.prototype.add = function (val) {
+      if (val == null) {
+        return this.items;
+      }
+
+      var stack = this.items;
+
+      // remove any matching items from the stack if option is set
+      if (this.filterDuplicates) {
+        stack = _.pull(this.items, val);
+        stack = _.filter(stack, function (item) {
+          return !_.isEqual(item, val);
+        });
+      }
+
+      stack.unshift(val);
+
+      // if maxLength is set, truncate the stack
+      if (this.maxLength > 0) {
+        stack = stack.slice(0, this.maxLength);
+      }
+
+      // persist the stack
+      localStorage.set(this.name, stack);
+      return this.items = stack;
+    };
+
+    PersistedLog.prototype.get = function () {
+      return this.items;
+    };
+
+    return PersistedLog;
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/private/__tests__/private.js b/src/ui/public/private/__tests__/private.js
new file mode 100644
index 0000000000000..b2a0c2230c54e
--- /dev/null
+++ b/src/ui/public/private/__tests__/private.js
@@ -0,0 +1,107 @@
+
+describe('Private module loader', function () {
+
+  var Private;
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function ($injector) {
+    Private = $injector.get('Private');
+  }));
+
+  it('accepts a provider that will be called to init a module', function () {
+    var football = {};
+    function Provider() {
+      return football;
+    }
+
+    var instance = Private(Provider);
+    expect(instance).to.be(football);
+  });
+
+  it('injects angular dependencies into the Provider', function () {
+    function Provider(Private) {
+      return Private;
+    }
+
+    var instance = Private(Provider);
+    expect(instance).to.be(Private);
+  });
+
+  it('detects circular dependencies', function () {
+    expect(function () {
+      function Provider1() {
+        var p3 = Private(Provider3);
+      }
+
+      function Provider2() {
+        var p3 = Private(Provider3);
+      }
+
+      function Provider3() {
+        var p1 = Private(Provider3);
+      }
+
+      var p1 = Private(Provider1);
+    }).to.throwException(/circular/i);
+  });
+
+  it('allways provides the same instance form the Provider', function () {
+    function Provider() {
+      return {};
+    }
+
+    expect(Private(Provider)).to.be(Private(Provider));
+  });
+
+  describe('#stub', function () {
+    it('accepts a replacement instance for a Provider', function () {
+      var replaced = {};
+      var replacement = {};
+
+      function Provider() {
+        return replaced;
+      }
+
+      var instance = Private(Provider);
+      expect(instance).to.be(replaced);
+
+      Private.stub(Provider, replacement);
+
+      var instance2 = Private(Provider);
+      expect(instance2).to.be(replacement);
+
+      Private.stub(Provider, replaced);
+
+      var instance3 = Private(Provider);
+      expect(instance3).to.be(replaced);
+    });
+  });
+
+  describe('#swap', function () {
+    it('accepts a new Provider that should replace an existing Provider', function () {
+      function Provider1() {
+        return {};
+      }
+
+      function Provider2() {
+        return {};
+      }
+
+      var instance1 = Private(Provider1);
+      expect(instance1).to.be.an('object');
+
+      Private.swap(Provider1, Provider2);
+
+      var instance2 = Private(Provider1);
+      expect(instance2).to.be.an('object');
+      expect(instance2).to.not.be(instance1);
+
+      Private.swap(Provider1, Provider1);
+
+      var instance3 = Private(Provider1);
+      expect(instance3).to.be(instance1);
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/private/private.js b/src/ui/public/private/private.js
new file mode 100644
index 0000000000000..767e30d5bc3f3
--- /dev/null
+++ b/src/ui/public/private/private.js
@@ -0,0 +1,191 @@
+define(function (require) {
+  /**
+   * # `Private()`
+   * Private module loader, used to merge angular and require js dependency styles
+   * by allowing a require.js module to export a single provider function that will
+   * create a value used within an angular application. This provider can declare
+   * angular dependencies by listing them as arguments, and can be require additional
+   * Private modules.
+   *
+   * ## Define a private module provider:
+   * ```js
+   * define(function (require) {
+   *   return function PingProvider($http) {
+   *     this.ping = function () {
+   *       return $http.head('/health-check');
+   *     };
+   *   };
+   * });
+   * ```
+   *
+   * ## Require a private module:
+   * ```js
+   * define(function (require) {
+   *   return function ServerHealthProvider(Private, Promise) {
+   *     var ping = Private(require('ui/ping'));
+   *     return {
+   *       check: Promise.method(function () {
+   *         var attempts = 0;
+   *         return (function attempt() {
+   *           attempts += 1;
+   *           return ping.ping()
+   *           .catch(function (err) {
+   *             if (attempts < 3) return attempt();
+   *           })
+   *         }())
+   *         .then(function () {
+   *           return true;
+   *         })
+   *         .catch(function () {
+   *           return false;
+   *         });
+   *       })
+   *     }
+   *   };
+   * });
+   * ```
+   *
+   * # `Private.stub(provider, newInstance)`
+   * `Private.stub()` replaces the instance of a module with another value. This is all we have needed until now.
+   *
+   * ```js
+   * beforeEach(inject(function ($injector, Private) {
+   *   Private.stub(
+   *     // since this module just exports a function, we need to change
+   *     // what Private returns in order to modify it's behavior
+   *     require('ui/agg_response/hierarchical/_build_split'),
+   *     sinon.stub().returns(fakeSplit)
+   *   );
+   * }));
+   * ```
+   *
+   * # `Private.swap(oldProvider, newProvider)`
+   * This new method does an 1-for-1 swap of module providers, unlike `stub()` which replaces a modules instance.
+   * Pass the module you want to swap out, and the one it should be replaced with, then profit.
+   *
+   * Note: even though this example shows `swap()` being called in a config
+   * function, it can be called from anywhere. It is particularly useful
+   * in this scenario though.
+   *
+   * ```js
+   * beforeEach(module('kibana', function (PrivateProvider) {
+   *   PrivateProvider.swap(
+   *     // since the courier is required automatically before the tests are loaded,
+   *     // we can't stub it's internal components unless we do so before the
+   *     // application starts. This is why angular has config functions
+   *     require('ui/courier/_redirect_when_missing'),
+   *     function StubbedRedirectProvider($decorate) {
+   *       // $decorate is a function that will instantiate the original module when called
+   *       return sinon.spy($decorate());
+   *     }
+   *   );
+   * }));
+   * ```
+   *
+   * @param {[type]} prov [description]
+   */
+
+
+  var _ = require('lodash');
+  var nextId = _.partial(_.uniqueId, 'privateProvider#');
+
+  function name(fn) {
+    return fn.name || fn.toString().split('\n').shift();
+  }
+
+  require('ui/modules').get('kibana')
+  .provider('Private', function () {
+    var provider = this;
+
+    // one cache/swaps per Provider
+    var cache = {};
+    var swaps = {};
+
+    // return the uniq id for this function
+    function identify(fn) {
+      if (typeof fn !== 'function') {
+        throw new TypeError('Expected private module "' + fn + '" to be a function');
+      }
+
+      if (fn.$$id) return fn.$$id;
+      else return (fn.$$id = nextId());
+    }
+
+    provider.stub = function (fn, instance) {
+      cache[identify(fn)] = instance;
+      return instance;
+    };
+
+    provider.swap = function (fn, prov) {
+      var id = identify(fn);
+      swaps[id] = prov;
+    };
+
+    provider.$get = ['$injector', function PrivateFactory($injector) {
+
+      // prevent circular deps by tracking where we came from
+      var privPath = [];
+      var pathToString = function () {
+        return privPath.map(name).join(' -> ');
+      };
+
+      // call a private provider and return the instance it creates
+      function instantiate(prov, locals) {
+        if (~privPath.indexOf(prov)) {
+          throw new Error(
+            'Circular refrence to "' + name(prov) + '"' +
+            ' found while resolving private deps: ' + pathToString()
+          );
+        }
+
+        privPath.push(prov);
+
+        var context = {};
+        var instance = $injector.invoke(prov, context, locals);
+        if (!_.isObject(instance)) instance = context;
+
+        privPath.pop();
+        return instance;
+      }
+
+      // retrieve an instance from cache or create and store on
+      function get(id, prov, $delegateProv, $delegateId) {
+        if (cache[id]) return cache[id];
+
+        var instance;
+
+        if ($delegateId != null && $delegateProv != null) {
+          instance = instantiate(prov, {
+            $decorate: _.partial(get, $delegateId, $delegateProv)
+          });
+        } else {
+          instance = instantiate(prov);
+        }
+
+        return (cache[id] = instance);
+      }
+
+      // main api, get the appropriate instance for a provider
+      function Private(prov) {
+        var id = identify(prov);
+        var $delegateId;
+        var $delegateProv;
+
+        if (swaps[id]) {
+          $delegateId = id;
+          $delegateProv = prov;
+
+          prov = swaps[$delegateId];
+          id = identify(prov);
+        }
+
+        return get(id, prov, $delegateId, $delegateProv);
+      }
+
+      Private.stub = provider.stub;
+      Private.swap = provider.swap;
+
+      return Private;
+    }];
+  });
+});
diff --git a/src/kibana/services/promises.js b/src/ui/public/promises.js
similarity index 98%
rename from src/kibana/services/promises.js
rename to src/ui/public/promises.js
index 742b3df9d54f0..1715c1a9d439c 100644
--- a/src/kibana/services/promises.js
+++ b/src/ui/public/promises.js
@@ -1,7 +1,7 @@
 define(function (require) {
   var _ = require('lodash');
 
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
 
   // Provides a tiny subset of the excelent API from
   // bluebird, reimplemented using the $q service
diff --git a/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js b/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js
new file mode 100644
index 0000000000000..85ddd16a8d410
--- /dev/null
+++ b/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js
@@ -0,0 +1,79 @@
+
+describe('Reflow watcher', function () {
+  require('angular');
+  var $ = require('jquery');
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var sinon = require('auto-release-sinon');
+  var ngMock = require('ngMock');
+
+  var $body = $(document.body);
+  var $window = $(window);
+  var expectStubbedEventAndEl = function (stub, event, $el) {
+    expect(stub.getCalls().some(function (call) {
+      var events = call.args[0].split(' ');
+      return _.contains(events, event) && $el.is(call.thisValue);
+    })).to.be(true);
+  };
+
+  var EventEmitter;
+  var reflowWatcher;
+  var $rootScope;
+  var $onStub;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private, $injector) {
+    $rootScope = $injector.get('$rootScope');
+    EventEmitter = Private(require('ui/events'));
+
+    // stub jQuery's $.on method while creating the reflowWatcher
+    $onStub = sinon.stub($.fn, 'on');
+    reflowWatcher = Private(require('ui/reflow_watcher'));
+    $onStub.restore();
+
+    // setup the reflowWatchers $http watcher
+    $rootScope.$apply();
+  }));
+
+  it('is an event emitter', function () {
+    expect(reflowWatcher).to.be.an(EventEmitter);
+  });
+
+  describe('listens', function () {
+    it('to "mouseup" on the body', function () {
+      expectStubbedEventAndEl($onStub, 'mouseup', $body);
+    });
+
+    it('to "resize" on the window', function () {
+      expectStubbedEventAndEl($onStub, 'resize', $window);
+    });
+  });
+
+  describe('un-listens in #destroy()', function () {
+    var $offStub;
+
+    beforeEach(function () {
+      $offStub = sinon.stub($.fn, 'off');
+      reflowWatcher.destroy();
+      $offStub.restore();
+    });
+
+    it('to "mouseup" on the body', function () {
+      expectStubbedEventAndEl($offStub, 'mouseup', $body);
+    });
+
+    it('to "resize" on the window', function () {
+      expectStubbedEventAndEl($offStub, 'resize', $window);
+    });
+  });
+
+  it('triggers the "reflow" event within a new angular tick', function () {
+    var stub = sinon.stub();
+    reflowWatcher.on('reflow', stub);
+    reflowWatcher.trigger();
+
+    expect(stub).to.have.property('callCount', 0);
+    $rootScope.$apply();
+    expect(stub).to.have.property('callCount', 1);
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/reflow_watcher/reflow_watcher.js b/src/ui/public/reflow_watcher/reflow_watcher.js
new file mode 100644
index 0000000000000..00705fe241042
--- /dev/null
+++ b/src/ui/public/reflow_watcher/reflow_watcher.js
@@ -0,0 +1,68 @@
+define(function (require) {
+  return function ReflowWatcherService(Private, $rootScope, $http) {
+    var angular = require('angular');
+    var $ = require('jquery');
+    var _ = require('lodash');
+
+    var EventEmitter = Private(require('ui/events'));
+    var $body = $(document.body);
+    var $window = $(window);
+
+    var MOUSE_EVENTS = 'mouseup';
+    var WINDOW_EVENTS = 'resize';
+
+    _.class(ReflowWatcher).inherits(EventEmitter);
+    /**
+     * Watches global activity which might hint at a change in the content, which
+     * in turn provides a hint to resizers that they should check their size
+     */
+    function ReflowWatcher() {
+      ReflowWatcher.Super.call(this);
+
+      // bound version of trigger that can be used as a handler
+      this.trigger = _.bind(this.trigger, this);
+      this._emitReflow = _.bind(this._emitReflow, this);
+
+      // list of functions to call that will unbind our watchers
+      this._unwatchers = [
+        $rootScope.$watchCollection(function () {
+          return $http.pendingRequests;
+        }, this.trigger)
+      ];
+
+      $body.on(MOUSE_EVENTS, this.trigger);
+      $window.on(WINDOW_EVENTS, this.trigger);
+    }
+
+    /**
+     * Simply emit reflow, but in a way that can be bound and passed to
+     * other functions. Using _.bind caused extra arguments to be added, and
+     * then emitted to other places. No Bueno
+     *
+     * @return {void}
+     */
+    ReflowWatcher.prototype._emitReflow = function () {
+      this.emit('reflow');
+    };
+
+    /**
+     * Emit the "reflow" event in the next tick of the digest cycle
+     * @return {void}
+     */
+    ReflowWatcher.prototype.trigger = function () {
+      $rootScope.$evalAsync(this._emitReflow);
+    };
+
+    /**
+     * Signal to the ReflowWatcher that it should clean up it's listeners
+     * @return {void}
+     */
+    ReflowWatcher.prototype.destroy = function () {
+      $body.off(MOUSE_EVENTS, this.trigger);
+      $window.off(WINDOW_EVENTS, this.trigger);
+      _.callEach(this._unwatchers);
+    };
+
+    return new ReflowWatcher();
+  };
+});
\ No newline at end of file
diff --git a/src/ui/public/registry/__tests__/index.js b/src/ui/public/registry/__tests__/index.js
new file mode 100644
index 0000000000000..6a80dc2fbe814
--- /dev/null
+++ b/src/ui/public/registry/__tests__/index.js
@@ -0,0 +1,115 @@
+
+describe('Registry', function () {
+  var _ = require('lodash');
+  var sinon = require('auto-release-sinon');
+  var registry = require('ui/registry/_registry');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+  var Private;
+  var IndexedArray;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function ($injector) {
+    Private = $injector.get('Private');
+  }));
+
+  it('is technically a function', function () {
+    var reg = registry();
+    expect(reg).to.be.a('function');
+  });
+
+  describe('#register', function () {
+    it('accepts a Private module', function () {
+      var reg = registry();
+      var mod = function SomePrivateModule() {};
+
+      reg.register(mod);
+      // modules are not exposed, so this is the most that we can test
+    });
+  });
+
+  describe('as a module', function () {
+    it('exposes the list of registered modules', function () {
+      var reg = registry();
+      var mod = function SomePrivateModule(Private) {
+        this.PrivateModuleLoader = Private;
+      };
+
+      reg.register(mod);
+      var modules = Private(reg);
+      expect(modules).to.have.length(1);
+      expect(modules[0]).to.have.property('PrivateModuleLoader', Private);
+    });
+  });
+
+  describe('spec', function () {
+    it('executes with the module list as "this", and can override it', function () {
+      var i = 0;
+      var self;
+
+      var reg = registry({
+        constructor: function () {
+          return { mods: (self = this) };
+        }
+      });
+
+      var modules = Private(reg);
+      expect(modules).to.be.an('object');
+      expect(modules).to.have.property('mods', self);
+    });
+  });
+
+  describe('spec.name', function () {
+    it('sets the displayName of the registry and the name param on the final instance', function () {
+      var reg = registry({
+        name: 'visTypes'
+      });
+
+      expect(reg).to.have.property('displayName', '[registry visTypes]');
+      expect(Private(reg)).to.have.property('name', 'visTypes');
+    });
+  });
+
+  describe('spec.constructor', function () {
+    it('executes before the modules are returned', function () {
+      var i = 0;
+      var reg = registry({
+        constructor: function () {
+          i = i + 1;
+        }
+      });
+
+      var modules = Private(reg);
+      expect(i).to.be(1);
+    });
+
+    it('executes with the module list as "this", and can override it', function () {
+      var i = 0;
+      var self;
+
+      var reg = registry({
+        constructor: function () {
+          return { mods: (self = this) };
+        }
+      });
+
+      var modules = Private(reg);
+      expect(modules).to.be.an('object');
+      expect(modules).to.have.property('mods', self);
+    });
+  });
+
+  describe('spec[any]', function () {
+    it('mixes the extra properties into the module list', function () {
+      var reg = registry({
+        someMethod: function () {
+          return this;
+        }
+      });
+
+      var modules = Private(reg);
+      expect(modules).to.have.property('someMethod');
+      expect(modules.someMethod()).to.be(modules);
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/kibana/registry/_registry.js b/src/ui/public/registry/_registry.js
similarity index 94%
rename from src/kibana/registry/_registry.js
rename to src/ui/public/registry/_registry.js
index 32c5901db6b0e..95c6e96cdc6ea 100644
--- a/src/kibana/registry/_registry.js
+++ b/src/ui/public/registry/_registry.js
@@ -1,6 +1,6 @@
 define(function (require) {
   var _ = require('lodash');
-  var IndexedArray = require('utils/indexed_array/index');
+  var IndexedArray = require('ui/IndexedArray');
   var notPropsOptNames = IndexedArray.OPT_NAMES.concat('constructor');
 
   /**
@@ -16,7 +16,7 @@ define(function (require) {
    *
    * + register a module
    * ```js
-   * var registry = require('registry/vis_types');
+   * var registry = require('ui/registry/vis_types');
    * registry.add(function InjectablePrivateModule($http, Promise) {
    *   ...
    * })
@@ -24,7 +24,7 @@ define(function (require) {
    *
    * + get all registered modules
    * ```js
-   * var visTypes = Private(require('registry/vis_types'));
+   * var visTypes = Private(require('ui/registry/vis_types'));
    * ```
    *
    *
diff --git a/src/kibana/registry/field_formats.js b/src/ui/public/registry/field_formats.js
similarity index 98%
rename from src/kibana/registry/field_formats.js
rename to src/ui/public/registry/field_formats.js
index b675f160fc7f6..3de51d4924d20 100644
--- a/src/kibana/registry/field_formats.js
+++ b/src/ui/public/registry/field_formats.js
@@ -1,7 +1,7 @@
 define(function (require) {
   var _ = require('lodash');
 
-  return require('registry/_registry')({
+  return require('ui/registry/_registry')({
     name: 'fieldFormats',
     index: ['id'],
     group: ['fieldType'],
diff --git a/src/ui/public/registry/spy_modes.js b/src/ui/public/registry/spy_modes.js
new file mode 100644
index 0000000000000..44c815f78342c
--- /dev/null
+++ b/src/ui/public/registry/spy_modes.js
@@ -0,0 +1,7 @@
+define(function (require) {
+  return require('ui/registry/_registry')({
+    name: 'visTypes',
+    index: ['name'],
+    order: ['order']
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/registry/vis_types.js b/src/ui/public/registry/vis_types.js
new file mode 100644
index 0000000000000..77023b35ac93c
--- /dev/null
+++ b/src/ui/public/registry/vis_types.js
@@ -0,0 +1,7 @@
+define(function (require) {
+  return require('ui/registry/_registry')({
+    name: 'visTypes',
+    index: ['name'],
+    order: ['title']
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/routes/RouteManager.js b/src/ui/public/routes/RouteManager.js
new file mode 100644
index 0000000000000..5c08ca02b43d7
--- /dev/null
+++ b/src/ui/public/routes/RouteManager.js
@@ -0,0 +1,57 @@
+var _ = require('lodash');
+
+var wrapRouteWithPrep = require('./wrapRouteWithPrep');
+
+function RouteManager() {
+  var self = this;
+  var when = [];
+  var defaults = [];
+  var otherwise;
+
+  self.config = function ($routeProvider) {
+    when.forEach(function (args) {
+      var path = args[0];
+      var route = args[1] || {};
+
+      // merge in any defaults
+      defaults.forEach(function (args) {
+        if (args[0].test(path)) {
+          _.merge(route, args[1]);
+        }
+      });
+
+      if (route.reloadOnSearch === void 0) {
+        route.reloadOnSearch = false;
+      }
+
+      wrapRouteWithPrep(route);
+      $routeProvider.when(path, route);
+    });
+
+    if (otherwise) {
+      wrapRouteWithPrep(otherwise);
+      $routeProvider.otherwise(otherwise);
+    }
+  };
+
+  self.when = function (path, route) {
+    when.push([path, route]);
+    return self;
+  };
+
+  // before attaching the routes to the routeProvider, test the RE
+  // against the .when() path and add/override the resolves if there is a match
+  self.defaults = function (RE, def) {
+    defaults.push([RE, def]);
+    return self;
+  };
+
+  self.otherwise = function (route) {
+    otherwise = route;
+    return self;
+  };
+
+  self.RouteManager = RouteManager;
+}
+
+module.exports = RouteManager;
diff --git a/src/ui/public/routes/WorkQueue.js b/src/ui/public/routes/WorkQueue.js
new file mode 100644
index 0000000000000..a1cfdf78e13c0
--- /dev/null
+++ b/src/ui/public/routes/WorkQueue.js
@@ -0,0 +1,52 @@
+define(function (require) {
+  var _ = require('lodash');
+
+  function WorkQueue() {
+    var q = this;
+
+    var work = [];
+    var fullDefers = [];
+
+    q.limit = 0;
+    Object.defineProperty(q, 'length', {
+      get: function () {
+        return work.length;
+      }
+    });
+
+    var checkIfFull = function () {
+      if (work.length >= q.limit) {
+        fullDefers.length && resolve(fullDefers);
+      }
+    };
+
+    var resolve = function (defers) {
+      return defers.splice(0).map(function (defer) {
+        return defer.resolve();
+      });
+    };
+
+    q.resolveWhenFull = function (defer) {
+      fullDefers.push(defer);
+      checkIfFull();
+    };
+
+    q.doWork = function () {
+      var resps = resolve(work);
+      checkIfFull();
+      return resps;
+    };
+
+    q.empty = function () {
+      work.splice(0);
+      checkIfFull();
+    };
+
+    q.push = function (defer) {
+      work.push(defer);
+      checkIfFull();
+    };
+  }
+
+  return WorkQueue;
+});
diff --git a/src/ui/public/routes/__tests__/_RouteManager.js b/src/ui/public/routes/__tests__/_RouteManager.js
new file mode 100644
index 0000000000000..ce5a7e9864a3e
--- /dev/null
+++ b/src/ui/public/routes/__tests__/_RouteManager.js
@@ -0,0 +1,104 @@
+var _ = require('lodash');
+var ngMock = require('ngMock');
+var sinon = require('auto-release-sinon');
+var RouteManager = require('ui/routes/RouteManager');
+var expect = require('expect.js');
+
+var routes; // will contain an new instance of RouteManager for each test
+var chainableMethods = [
+  { name: 'when', args: ['', {}] },
+  { name: 'otherwise', args: [{}] },
+  { name: 'defaults', args: [/regexp/, {}] }
+];
+
+var $rp;
+describe('routes/RouteManager', function () {
+  beforeEach(ngMock.module('kibana', function ($routeProvider) {
+    $rp = $routeProvider;
+    sinon.stub($rp, 'otherwise');
+    sinon.stub($rp, 'when');
+  }));
+
+  beforeEach(ngMock.inject(function () {
+    routes = new RouteManager();
+  }));
+
+  it('should have chainable methods: ' + _.pluck(chainableMethods, 'name').join(', '), function () {
+    chainableMethods.forEach(function (meth) {
+      expect(routes[meth.name].apply(routes, _.clone(meth.args))).to.be(routes);
+    });
+  });
+
+  describe('#otherwise', function () {
+    it('should forward the last otherwise route', function () {
+      var otherRoute = {};
+      routes.otherwise({});
+      routes.otherwise(otherRoute);
+
+      routes.config($rp);
+
+      expect($rp.otherwise.callCount).to.be(1);
+      expect($rp.otherwise.getCall(0).args[0]).to.be(otherRoute);
+    });
+  });
+
+  describe('#when', function () {
+    it('should merge the additions into the when() defined routes', function () {
+      routes.when('/some/route');
+      routes.when('/some/other/route');
+
+      // add the addition resolve to every route
+      routes.defaults(/.*/, {
+        resolve: {
+          addition: function () {}
+        }
+      });
+
+      routes.config($rp);
+
+      // should have run once for each when route
+      expect($rp.when.callCount).to.be(2);
+      expect($rp.otherwise.callCount).to.be(0);
+
+      // every route should have the "addition" resolve
+      expect($rp.when.getCall(0).args[1].resolve.addition).to.be.a('function');
+      expect($rp.when.getCall(1).args[1].resolve.addition).to.be.a('function');
+    });
+  });
+
+  describe('#config', function () {
+    it('should add defined routes to the global $routeProvider service in order', function () {
+      var args = [
+        ['/one', {}],
+        ['/two', {}]
+      ];
+
+      args.forEach(function (a) {
+        routes.when(a[0], a[1]);
+      });
+
+      routes.config($rp);
+
+      expect($rp.when.callCount).to.be(args.length);
+      _.times(args.length, function (i) {
+        var call = $rp.when.getCall(i);
+        var a = args.shift();
+
+        expect(call.args[0]).to.be(a[0]);
+        expect(call.args[1]).to.be(a[1]);
+      });
+    });
+
+    it('sets route.reloadOnSearch to false by default', function () {
+      routes.when('/nothing-set');
+      routes.when('/no-reload', { reloadOnSearch: false });
+      routes.when('/always-reload', { reloadOnSearch: true });
+      routes.config($rp);
+
+      expect($rp.when.callCount).to.be(3);
+      expect($rp.when.firstCall.args[1]).to.have.property('reloadOnSearch', false);
+      expect($rp.when.secondCall.args[1]).to.have.property('reloadOnSearch', false);
+      expect($rp.when.lastCall.args[1]).to.have.property('reloadOnSearch', true);
+    });
+  });
+});
diff --git a/src/ui/public/routes/__tests__/_WorkQueue.js b/src/ui/public/routes/__tests__/_WorkQueue.js
new file mode 100644
index 0000000000000..526df2161b402
--- /dev/null
+++ b/src/ui/public/routes/__tests__/_WorkQueue.js
@@ -0,0 +1,91 @@
+var _ = require('lodash');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+var WorkQueue = require('ui/routes/WorkQueue');
+var sinon = require('auto-release-sinon');
+require('ui/promises');
+
+describe('work queue', function () {
+  var queue;
+  var Promise;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (_Promise_) {
+    Promise = _Promise_;
+  }));
+  beforeEach(function () { queue = new WorkQueue(); });
+  afterEach(function () { queue.empty(); });
+
+  describe('#push', function () {
+    it('adds to the interval queue', function () {
+      queue.push(Promise.defer());
+      expect(queue).to.have.length(1);
+    });
+  });
+
+  describe('#resolveWhenFull', function () {
+    it('resolves requests waiting for the queue to fill when appropriate', function () {
+      var size = _.random(5, 50);
+      queue.limit = size;
+
+      var whenFull = Promise.defer();
+      sinon.stub(whenFull, 'resolve');
+      queue.resolveWhenFull(whenFull);
+
+      // push all but one into the queue
+      _.times(size - 1, function () {
+        queue.push(Promise.defer());
+      });
+
+      expect(whenFull.resolve.callCount).to.be(0);
+      queue.push(Promise.defer());
+      expect(whenFull.resolve.callCount).to.be(1);
+
+      queue.empty();
+    });
+  });
+
+  /**
+   * Fills the queue with a random number of work defers, but stubs all defer methods
+   * with the same stub and passed it back.
+   *
+   * @param  {function} then - called with then(size, stub) so that the test
+   *                         can manipulate the filled queue
+   */
+  function fillWithStubs(then) {
+    var size = _.random(5, 50);
+    var stub = sinon.stub();
+
+    _.times(size, function () {
+      var d = Promise.defer();
+      // overwrite the defer methods with the stub
+      d.resolve = stub;
+      d.reject = stub;
+      queue.push(d);
+    });
+
+    then(size, stub);
+  }
+
+  describe('#doWork', function () {
+    it('flushes the queue and resolves all promises', function () {
+      fillWithStubs(function (size, stub) {
+        expect(queue).to.have.length(size);
+        queue.doWork();
+        expect(queue).to.have.length(0);
+        expect(stub.callCount).to.be(size);
+      });
+    });
+  });
+
+  describe('#empty()', function () {
+    it('empties the internal queue WITHOUT resolving any promises', function () {
+      fillWithStubs(function (size, stub) {
+        expect(queue).to.have.length(size);
+        queue.empty();
+        expect(queue).to.have.length(0);
+        expect(stub.callCount).to.be(0);
+      });
+    });
+  });
+});
diff --git a/src/ui/public/routes/__tests__/_wrapRouteWithPrep.js b/src/ui/public/routes/__tests__/_wrapRouteWithPrep.js
new file mode 100644
index 0000000000000..7d01a74ae3242
--- /dev/null
+++ b/src/ui/public/routes/__tests__/_wrapRouteWithPrep.js
@@ -0,0 +1,88 @@
+var RouteManager = require('ui/routes/RouteManager');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+var wrapRouteWithPrep = require('ui/routes/wrapRouteWithPrep');
+var Promise = require('bluebird');
+var _ = require('lodash');
+var stub = require('auto-release-sinon').stub;
+
+require('ui/private');
+
+var routes;
+
+describe('wrapRouteWithPrep fn', function () {
+  require('testUtils/noDigestPromises').activateForSuite();
+
+  beforeEach(function () {
+    routes = new RouteManager();
+  });
+
+  var SchedulingTest = function (opts) {
+    opts = opts || {};
+
+    var delaySetup = opts.delayUserWork ? 0 : 50;
+    var delayUserWork = opts.delayUserWork ? 50 : 0;
+
+    return function () {
+      ngMock.module('kibana', 'kibana/notify');
+      var setupComplete = false;
+      var userWorkComplete = false;
+      var route;
+      var Private;
+      var Promise;
+      var $injector;
+
+      ngMock.inject(function ($rootScope, _Private_, _Promise_, _$injector_) {
+        Private = _Private_;
+        Promise = _Promise_;
+        $injector = _$injector_;
+      });
+
+      var setup = Private(require('ui/routes/setup'));
+      stub(setup, 'routeSetupWork', function () {
+        return new Promise(function (resolve, reject) {
+          setTimeout(function () {
+            setupComplete = true;
+            resolve();
+          }, delaySetup);
+        });
+      });
+
+      routes
+        .when('/', {
+          resolve: {
+            test: function () {
+              expect(setupComplete).to.be(true);
+              userWorkComplete = true;
+            }
+          }
+        })
+        .config({
+          when: function (p, _r) { route = _r; }
+        });
+
+      return new Promise(function (resolve, reject) {
+        setTimeout(function () {
+          Promise.all(_.map(route.resolve, function (fn) {
+            return $injector.invoke(fn);
+          }))
+          .then(function () {
+            expect(setupComplete).to.be(true);
+            expect(userWorkComplete).to.be(true);
+          })
+          .then(resolve, reject);
+
+        }, delayUserWork);
+      });
+    };
+  };
+
+  it('always waits for setup to complete before calling user work', new SchedulingTest());
+
+  it('does not call user work when setup fails', new SchedulingTest({ failSetup: true }));
+
+  it('calls all user work even if it is not initialized until after setup is complete', new SchedulingTest({
+    delayUserWork: false
+  }));
+});
diff --git a/src/ui/public/routes/__tests__/index.js b/src/ui/public/routes/__tests__/index.js
new file mode 100644
index 0000000000000..18b596294a4a5
--- /dev/null
+++ b/src/ui/public/routes/__tests__/index.js
@@ -0,0 +1,5 @@
+describe('Custom Route Management', function () {
+  require('./_RouteManager');
+  require('./_WorkQueue');
+  require('./_wrapRouteWithPrep');
+});
diff --git a/src/ui/public/routes/routes.js b/src/ui/public/routes/routes.js
new file mode 100644
index 0000000000000..faa10c794686a
--- /dev/null
+++ b/src/ui/public/routes/routes.js
@@ -0,0 +1,8 @@
+var RouteManager = require('./RouteManager');
+var defaultRouteManager = new RouteManager();
+
+require('ui/modules')
+.get('kibana', ['ngRoute'])
+.config(defaultRouteManager.config);
+
+module.exports = defaultRouteManager;
diff --git a/src/ui/public/routes/setup.js b/src/ui/public/routes/setup.js
new file mode 100644
index 0000000000000..abfd95359e625
--- /dev/null
+++ b/src/ui/public/routes/setup.js
@@ -0,0 +1,65 @@
+define(function (require) {
+  return function routeSetup(Promise, config, $route, kbnUrl, courier, Notifier, Private, $rootScope) {
+    var _ = require('lodash');
+    var errors = require('ui/errors');
+    var NoDefaultIndexPattern = errors.NoDefaultIndexPattern;
+    var NoDefinedIndexPatterns = errors.NoDefinedIndexPatterns;
+    var firstNoDefaultError = true;
+
+    var rootSearchSource = Private(require('ui/courier/data_source/_root_search_source'));
+    var allowedRoutesRE = /^\/settings\//;
+    var notify = new Notifier();
+
+    return {
+      routeSetupWork: function () {
+        return Promise.all([
+          config.init(),
+          courier.SearchSource.ready,
+          $rootScope.kibana && $rootScope.kibana.ready
+        ])
+        .then(function () {
+          var path = _.get($route, 'current.$$route.originalPath');
+          var defaultIndexRequired = path && !path.match(allowedRoutesRE);
+
+          return courier.indexPatterns.getIds()
+          .then(function (patterns) {
+            var defined = !!config.get('defaultIndex');
+            var exists = _.contains(patterns, config.get('defaultIndex'));
+
+            if (defined && !exists) {
+              config.clear('defaultIndex');
+              defined = false;
+            }
+
+            if (!defined) {
+              if (defaultIndexRequired) {
+                throw new NoDefaultIndexPattern();
+              } else {
+                firstNoDefaultError = false;
+              }
+            }
+
+            return rootSearchSource.loadDefault();
+          });
+        });
+      },
+      handleKnownError: function (err) {
+        if (err instanceof NoDefaultIndexPattern || err instanceof NoDefinedIndexPatterns) {
+          // .change short circuits the routes by calling $route.refresh(). We can safely swallow this error
+          // after reporting it to the user
+          kbnUrl.change('/settings/indices');
+
+          if (err instanceof NoDefaultIndexPattern) {
+            if (firstNoDefaultError) {
+              firstNoDefaultError = false;
+            } else {
+              notify.error(err);
+            }
+          }
+        } else {
+          return Promise.reject(err);
+        }
+      }
+    };
+  };
+});
diff --git a/src/ui/public/routes/wrapRouteWithPrep.js b/src/ui/public/routes/wrapRouteWithPrep.js
new file mode 100644
index 0000000000000..9fdb247a7c78d
--- /dev/null
+++ b/src/ui/public/routes/wrapRouteWithPrep.js
@@ -0,0 +1,54 @@
+define(function (require) {
+  var angular = require('angular');
+  var _ = require('lodash');
+
+  var WorkQueue = require('ui/routes/WorkQueue');
+  var errors = require('ui/errors');
+
+  function wrapRouteWithPrep(route) {
+    if (!route.resolve && route.redirectTo) return;
+
+    var userWork = new WorkQueue();
+    // the point at which we will consider the queue "full"
+    userWork.limit = _.keys(route.resolve).length;
+
+    var resolve = {
+      __prep__: function (Private, Promise, $route, $injector, Notifier) {
+        var setup = Private(require('ui/routes/setup'));
+
+        return setup.routeSetupWork()
+        .then(function () {
+          // wait for the queue to fill up, then do all the work
+          var defer = Promise.defer();
+          userWork.resolveWhenFull(defer);
+
+          return defer.promise.then(function () {
+            return Promise.all(userWork.doWork());
+          });
+        })
+        .catch(function (err) {
+          // discard any remaining user work
+          userWork.empty();
+          return setup.handleKnownError(err);
+        });
+      }
+    };
+
+    // send each user resolve to the userWork queue, which will prevent it from running before the
+    // prep is complete
+    _.forOwn(route.resolve || {}, function (expr, name) {
+      resolve[name] = function ($injector, Promise) {
+        var defer = Promise.defer();
+        userWork.push(defer);
+        return defer.promise.then(function () {
+          return $injector[angular.isString(expr) ? 'get' : 'invoke'](expr);
+        });
+      };
+    });
+
+    // we're copied everything over so now overwrite
+    route.resolve = resolve;
+  }
+
+  return wrapRouteWithPrep;
+});
diff --git a/src/ui/public/state_management/__tests__/app_state.js b/src/ui/public/state_management/__tests__/app_state.js
new file mode 100644
index 0000000000000..e0f4d1f07703f
--- /dev/null
+++ b/src/ui/public/state_management/__tests__/app_state.js
@@ -0,0 +1,55 @@
+var sinon = require('auto-release-sinon');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+require('ui/state_management/app_state');
+
+describe('State Management', function () {
+  var $rootScope, AppState;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (_$rootScope_, _$location_, Private) {
+    $rootScope = _$rootScope_;
+    AppState = Private(require('ui/state_management/app_state'));
+  }));
+
+  describe('App State', function () {
+    var appState;
+
+    beforeEach(function () {
+      appState = new AppState();
+    });
+
+    it('should have _urlParam of _a', function () {
+      expect(appState).to.have.property('_urlParam');
+      expect(appState._urlParam).to.equal('_a');
+    });
+
+    it('should use passed in params', function () {
+      var params = {
+        test: true,
+        mock: false
+      };
+
+      appState = new AppState(params);
+      expect(appState).to.have.property('_defaults');
+
+      Object.keys(params).forEach(function (key) {
+        expect(appState._defaults).to.have.property(key);
+        expect(appState._defaults[key]).to.equal(params[key]);
+      });
+    });
+
+    it('should have a destroy method', function () {
+      expect(appState).to.have.property('destroy');
+    });
+
+    it('should be destroyed on $routeChangeStart', function () {
+      var destroySpy = sinon.spy(appState, 'destroy');
+      var url = '/test/path';
+
+      $rootScope.$emit('$routeChangeStart');
+
+      expect(destroySpy.callCount).to.be(1);
+    });
+  });
+});
diff --git a/src/ui/public/state_management/__tests__/global_state.js b/src/ui/public/state_management/__tests__/global_state.js
new file mode 100644
index 0000000000000..5fedf936db996
--- /dev/null
+++ b/src/ui/public/state_management/__tests__/global_state.js
@@ -0,0 +1,32 @@
+
+var sinon = require('sinon');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+require('ui/state_management/global_state');
+
+describe('State Management', function () {
+  var $rootScope, $location, state;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (_$location_, globalState) {
+    $location = _$location_;
+    state = globalState;
+  }));
+
+  describe('Global State', function () {
+    it('should use previous state when not in URL', function () {
+      // set satte via URL
+      $location.search({ _g: '(foo:(bar:baz))' });
+      state.fetch();
+      expect(state.toObject()).to.eql({ foo: { bar: 'baz' } });
+
+      $location.search({ _g: '(fizz:buzz)' });
+      state.fetch();
+      expect(state.toObject()).to.eql({ fizz: 'buzz' });
+
+      $location.search({});
+      state.fetch();
+      expect(state.toObject()).to.eql({ fizz: 'buzz' });
+    });
+  });
+});
diff --git a/src/ui/public/state_management/__tests__/state.js b/src/ui/public/state_management/__tests__/state.js
new file mode 100644
index 0000000000000..29eaf9c425b19
--- /dev/null
+++ b/src/ui/public/state_management/__tests__/state.js
@@ -0,0 +1,158 @@
+
+var _ = require('lodash');
+var sinon = require('sinon');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+require('ui/private');
+
+describe('State Management', function () {
+  var $rootScope, $location, State, Events;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (_$rootScope_, _$location_, Private) {
+    $location = _$location_;
+    $rootScope = _$rootScope_;
+    State = Private(require('ui/state_management/state'));
+    Events = Private(require('ui/events'));
+  }));
+
+  describe('Provider', function () {
+    it('should reset the state to the defaults', function () {
+      var state = new State('_s', { message: ['test'] });
+      state.reset();
+      var search = $location.search();
+      expect(search).to.have.property('_s');
+      expect(search._s).to.equal('(message:!(test))');
+      expect(state.message).to.eql(['test']);
+    });
+
+    it('should apply the defaults upon initialization', function () {
+      var state = new State('_s', { message: 'test' });
+      expect(state).to.have.property('message', 'test');
+    });
+
+    it('should inherit from Events', function () {
+      var state = new State();
+      expect(state).to.be.an(Events);
+    });
+
+    it('should emit an event if reset with changes', function (done) {
+      var state = new State('_s', { message: 'test' });
+      state.on('reset_with_changes', function (keys) {
+        expect(keys).to.eql(['message']);
+        done();
+      });
+      state.save();
+      state.message = 'foo';
+      state.reset();
+      $rootScope.$apply();
+    });
+
+    it('should not emit an event if reset without changes', function () {
+      var state = new State('_s', { message: 'test' });
+      state.on('reset_with_changes', function () {
+        expect().fail();
+      });
+      state.save();
+      state.message = 'test';
+      state.reset();
+      $rootScope.$apply();
+    });
+  });
+
+  describe('Search', function () {
+    it('should save to $location.search()', function () {
+      var state = new State('_s', { test: 'foo' });
+      state.save();
+      var search = $location.search();
+      expect(search).to.have.property('_s');
+      expect(search._s).to.equal('(test:foo)');
+    });
+
+    it('should emit an event if changes are saved', function (done) {
+      var state = new State();
+      state.on('save_with_changes', function (keys) {
+        expect(keys).to.eql(['test']);
+        done();
+      });
+      state.test = 'foo';
+      state.save();
+      var search = $location.search();
+      $rootScope.$apply();
+    });
+  });
+
+  describe('Fetch', function () {
+    it('should emit an event if changes are fetched', function (done) {
+      var state = new State();
+      state.on('fetch_with_changes', function (keys) {
+        expect(keys).to.eql(['foo']);
+        done();
+      });
+      $location.search({ _s: '(foo:bar)' });
+      state.fetch();
+      expect(state).to.have.property('foo', 'bar');
+      $rootScope.$apply();
+    });
+
+    it('should have events that attach to scope', function (done) {
+      var state = new State();
+      state.on('test', function (message) {
+        expect(message).to.equal('foo');
+        done();
+      });
+      state.emit('test', 'foo');
+      $rootScope.$apply();
+    });
+
+    it('should fire listeners for #onUpdate() on #fetch()', function (done) {
+      var state = new State();
+      state.on('fetch_with_changes', function (keys) {
+        expect(keys).to.eql(['foo']);
+        done();
+      });
+      $location.search({ _s: '(foo:bar)' });
+      state.fetch();
+      expect(state).to.have.property('foo', 'bar');
+      $rootScope.$apply();
+    });
+
+    it('should apply defaults to fetches', function () {
+      var state = new State('_s', { message: 'test' });
+      $location.search({ _s: '(foo:bar)' });
+      state.fetch();
+      expect(state).to.have.property('foo', 'bar');
+      expect(state).to.have.property('message', 'test');
+    });
+
+    it('should call fetch when $routeUpdate is fired on $rootScope', function () {
+      var state = new State();
+      var spy = sinon.spy(state, 'fetch');
+      $rootScope.$emit('$routeUpdate', 'test');
+      sinon.assert.calledOnce(spy);
+    });
+
+    it('should clear state when missing form URL', function () {
+      var stateObj;
+      var state = new State();
+
+      // set satte via URL
+      $location.search({ _s: '(foo:(bar:baz))' });
+      state.fetch();
+      stateObj = state.toObject();
+      expect(stateObj).to.eql({ foo: { bar: 'baz' } });
+
+      // ensure changing URL changes state
+      $location.search({ _s: '(one:two)' });
+      state.fetch();
+      stateObj = state.toObject();
+      expect(stateObj).to.eql({ one: 'two' });
+
+      // remove search, state should be empty
+      $location.search({});
+      state.fetch();
+      stateObj = state.toObject();
+      expect(stateObj).to.eql({});
+    });
+  });
+});
diff --git a/src/kibana/components/state_management/_state_sync.js b/src/ui/public/state_management/_state_sync.js
similarity index 99%
rename from src/kibana/components/state_management/_state_sync.js
rename to src/ui/public/state_management/_state_sync.js
index d61d9badb7e0e..7c4925eb17cae 100644
--- a/src/kibana/components/state_management/_state_sync.js
+++ b/src/ui/public/state_management/_state_sync.js
@@ -2,7 +2,7 @@ define(function (require) {
 
   var angular = require('angular');
   var _ = require('lodash');
-  var rison = require('utils/rison');
+  var rison = require('ui/utils/rison');
 
   // invokable/private angular dep
   return function ($location) {
diff --git a/src/ui/public/state_management/app_state.js b/src/ui/public/state_management/app_state.js
new file mode 100644
index 0000000000000..1956fbe9b439a
--- /dev/null
+++ b/src/ui/public/state_management/app_state.js
@@ -0,0 +1,54 @@
+define(function (require) {
+  var _ = require('lodash');
+  var modules = require('ui/modules');
+  var urlParam = '_a';
+
+
+  function AppStateProvider(Private, $rootScope, getAppState) {
+    var State = Private(require('ui/state_management/state'));
+
+
+    _.class(AppState).inherits(State);
+    function AppState(defaults) {
+      AppState.Super.call(this, urlParam, defaults);
+      getAppState._set(this);
+    }
+
+    // if the url param is missing, write it back
+    AppState.prototype._persistAcrossApps = false;
+
+
+    AppState.prototype.destroy = function () {
+      AppState.Super.prototype.destroy.call(this);
+      getAppState._set(null);
+    };
+
+    return AppState;
+  }
+
+  modules.get('kibana/global_state')
+  .factory('AppState', function (Private) {
+    return Private(AppStateProvider);
+  })
+  .service('getAppState', function ($location) {
+    var currentAppState;
+
+    function get() {
+      return currentAppState;
+    }
+
+    // Checks to see if the appState might already exist, even if it hasn't been newed up
+    get.previouslyStored = function () {
+      var search = $location.search();
+      return search[urlParam] ? true : false;
+    };
+
+    get._set = function (current) {
+      currentAppState = current;
+    };
+
+    return get;
+  });
+
+  return AppStateProvider;
+});
diff --git a/src/ui/public/state_management/global_state.js b/src/ui/public/state_management/global_state.js
new file mode 100644
index 0000000000000..6f74135ea4e8d
--- /dev/null
+++ b/src/ui/public/state_management/global_state.js
@@ -0,0 +1,26 @@
+define(function (require) {
+  var _ = require('lodash');
+  var angular = require('angular');
+  var qs = require('ui/utils/query_string');
+  var rison = require('ui/utils/rison');
+
+  var module = require('ui/modules').get('kibana/global_state');
+
+  module.service('globalState', function (Private, $rootScope, $location) {
+    var State = Private(require('ui/state_management/state'));
+
+    _.class(GlobalState).inherits(State);
+    function GlobalState(defaults) {
+      GlobalState.Super.call(this, '_g', defaults);
+    }
+
+    // if the url param is missing, write it back
+    GlobalState.prototype._persistAcrossApps = true;
+
+    GlobalState.prototype.removeFromUrl = function (url) {
+      return qs.replaceParamInUrl(url, this._urlParam, null);
+    };
+
+    return new GlobalState();
+  });
+});
diff --git a/src/ui/public/state_management/state.js b/src/ui/public/state_management/state.js
new file mode 100644
index 0000000000000..1c0c91ed003cc
--- /dev/null
+++ b/src/ui/public/state_management/state.js
@@ -0,0 +1,151 @@
+define(function (require) {
+  var _ = require('lodash');
+  var rison = require('ui/utils/rison');
+
+  var applyDiff = require('ui/utils/diff_object');
+  var qs = require('ui/utils/query_string');
+
+  return function StateProvider(Notifier, Private, $rootScope, $location) {
+    var Events = Private(require('ui/events'));
+
+    _.class(State).inherits(Events);
+    function State(urlParam, defaults) {
+      State.Super.call(this);
+
+      var self = this;
+      self.setDefaults(defaults);
+      self._urlParam = urlParam || '_s';
+
+      // When the URL updates we need to fetch the values from the URL
+      self._cleanUpListeners = _.partial(_.callEach, [
+        // partial route update, no app reload
+        $rootScope.$on('$routeUpdate', function () {
+          self.fetch();
+        }),
+
+        // begining of full route update, new app will be initialized before
+        // $routeChangeSuccess or $routeChangeError
+        $rootScope.$on('$routeChangeStart', function () {
+          if (self._persistAcrossApps) {
+            self.fetch();
+          } else {
+            self.destroy();
+          }
+        })
+      ]);
+
+      // Initialize the State with fetch
+      self.fetch();
+    }
+
+    State.prototype._readFromURL = function () {
+      var search = $location.search();
+      try {
+        return search[this._urlParam] ? rison.decode(search[this._urlParam]) : null;
+      } catch (e) {
+        var notify = new Notifier();
+        notify.error('Unable to parse URL');
+        search[this._urlParam] = rison.encode(this._defaults);
+        $location.search(search).replace();
+        return null;
+      }
+    };
+
+    /**
+     * Fetches the state from the url
+     * @returns {void}
+     */
+    State.prototype.fetch = function () {
+      var stash = this._readFromURL();
+
+      // nothing to read from the url? save if ordered to persist
+      if (stash === null) {
+        if (this._persistAcrossApps) {
+          return this.save();
+        } else {
+          stash = {};
+        }
+      }
+
+      _.defaults(stash, this._defaults);
+      // apply diff to state from stash, will change state in place via side effect
+      var diffResults = applyDiff(this, stash);
+
+      if (diffResults.keys.length) {
+        this.emit('fetch_with_changes', diffResults.keys);
+      }
+    };
+
+    /**
+     * Saves the state to the url
+     * @returns {void}
+     */
+    State.prototype.save = function (replace) {
+      var stash = this._readFromURL();
+      var state = this.toObject();
+      replace = replace || false;
+
+      if (!stash) {
+        replace = true;
+        stash = {};
+      }
+
+      _.defaults(state, this._defaults);
+      // apply diff to state from stash, will change state in place via side effect
+      var diffResults = applyDiff(stash, state);
+
+      if (diffResults.keys.length) {
+        this.emit('save_with_changes', diffResults.keys);
+      }
+
+      // persist the state in the URL
+      var search = $location.search();
+      search[this._urlParam] = this.toRISON();
+      if (replace) {
+        $location.search(search).replace();
+      } else {
+        $location.search(search);
+      }
+    };
+
+    /**
+     * Calls save with a forced replace
+     * @returns {void}
+     */
+    State.prototype.replace = function () {
+      this.save(true);
+    };
+
+    /**
+     * Resets the state to the defaults
+     *
+     * @returns {void}
+     */
+    State.prototype.reset = function () {
+      // apply diff to _attributes from defaults, this is side effecting so
+      // it will change the state in place.
+      var diffResults = applyDiff(this, this._defaults);
+      if (diffResults.keys.length) {
+        this.emit('reset_with_changes', diffResults.keys);
+      }
+      this.save();
+    };
+
+    /**
+     * Cleans up the state object
+     * @returns {void}
+     */
+    State.prototype.destroy = function () {
+      this.off(); // removes all listners
+      this._cleanUpListeners(); // Removes the $routeUpdate listner
+    };
+
+    State.prototype.setDefaults = function (defaults) {
+      this._defaults = defaults || {};
+    };
+
+    return State;
+
+  };
+
+});
diff --git a/src/ui/public/storage/__tests__/storage.js b/src/ui/public/storage/__tests__/storage.js
new file mode 100644
index 0000000000000..600483dc2ab93
--- /dev/null
+++ b/src/ui/public/storage/__tests__/storage.js
@@ -0,0 +1,107 @@
+
+var sinon = require('sinon');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+var storage;
+var $window;
+var payload = { first: 'john', last: 'smith' };
+
+require('ui/storage');
+
+function init() {
+  ngMock.module('kibana/storage', function ($provide) {
+    // mock $window.localStorage for storage
+    $provide.value('$window', {
+      localStorage: {
+        getItem: sinon.stub(),
+        setItem: sinon.spy(),
+        removeItem: sinon.spy(),
+        clear: sinon.spy()
+      }
+    });
+  });
+
+  ngMock.inject(function ($injector) {
+    storage = $injector.get('localStorage');
+    $window = $injector.get('$window');
+  });
+}
+
+describe('StorageService', function () {
+  beforeEach(function () {
+    init();
+  });
+
+  describe('expected API', function () {
+    it('should have expected methods', function () {
+      expect(storage.get).to.be.a('function');
+      expect(storage.set).to.be.a('function');
+      expect(storage.remove).to.be.a('function');
+      expect(storage.clear).to.be.a('function');
+    });
+  });
+
+  describe('call behavior', function () {
+    it('should call getItem on the store', function () {
+      storage.get('name');
+
+      expect($window.localStorage.getItem.callCount).to.equal(1);
+    });
+
+    it('should call setItem on the store', function () {
+      storage.set('name', 'john smith');
+
+      expect($window.localStorage.setItem.callCount).to.equal(1);
+    });
+
+    it('should call removeItem on the store', function () {
+      storage.remove('name');
+
+      expect($window.localStorage.removeItem.callCount).to.equal(1);
+    });
+
+    it('should call clear on the store', function () {
+      storage.clear();
+
+      expect($window.localStorage.clear.callCount).to.equal(1);
+    });
+  });
+
+  describe('json data', function () {
+    it('should parse JSON when reading from the store', function () {
+      var getItem = $window.localStorage.getItem;
+      getItem.returns(JSON.stringify(payload));
+
+      var data = storage.get('name');
+      expect(data).to.eql(payload);
+    });
+
+    it('should write JSON string to the store', function () {
+      var setItem = $window.localStorage.setItem;
+      var key = 'name';
+      var value = payload;
+
+      storage.set(key, value);
+
+      var call = setItem.getCall(0);
+      expect(call.args[0]).to.equal(key);
+      expect(call.args[1]).to.equal(JSON.stringify(value));
+    });
+  });
+
+  describe('expected responses', function () {
+    it('should return null when not exists', function () {
+      var data = storage.get('notexists');
+      expect(data).to.equal(null);
+    });
+
+    it('should return null when invalid JSON', function () {
+      var getItem = $window.localStorage.getItem;
+      getItem.returns('not: json');
+
+      var data = storage.get('name');
+      expect(data).to.equal(null);
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/storage/storage.js b/src/ui/public/storage/storage.js
new file mode 100644
index 0000000000000..4e02f8465bcfd
--- /dev/null
+++ b/src/ui/public/storage/storage.js
@@ -0,0 +1,43 @@
+define(function (require) {
+  var modules = require('ui/modules');
+  var angular = require('angular');
+
+  function Storage(store) {
+    var self = this;
+    self.store = store;
+
+    self.get = function (key) {
+      try {
+        return JSON.parse(self.store.getItem(key));
+      } catch (e) {
+        return null;
+      }
+    };
+
+    self.set = function (key, value) {
+      try {
+        return self.store.setItem(key, angular.toJson(value));
+      } catch (e) {
+        return false;
+      }
+    };
+
+    self.remove = function (key) {
+      return self.store.removeItem(key);
+    };
+
+    self.clear = function () {
+      return self.store.clear();
+    };
+  }
+
+  var createService = function (type) {
+    return function ($window) {
+      return new Storage($window[type]);
+    };
+  };
+
+  modules.get('kibana/storage')
+    .service('localStorage', createService('localStorage'))
+    .service('sessionStorage', createService('sessionStorage'));
+});
\ No newline at end of file
diff --git a/src/ui/public/stringify/__tests__/_conformance.js b/src/ui/public/stringify/__tests__/_conformance.js
new file mode 100644
index 0000000000000..d2488bb89725d
--- /dev/null
+++ b/src/ui/public/stringify/__tests__/_conformance.js
@@ -0,0 +1,114 @@
+var _ = require('lodash');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+var fieldFormats;
+var FieldFormat;
+var config;
+
+var formatIds = [
+  'bytes',
+  'date',
+  'ip',
+  'number',
+  'percent',
+  'string',
+  'url',
+  '_source'
+];
+
+module.exports = describe('conformance', function () {
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private, $injector) {
+    fieldFormats = Private(require('ui/registry/field_formats'));
+    FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
+    config = $injector.get('config');
+  }));
+
+  formatIds.forEach(function (id) {
+    var instance;
+    var Type;
+
+    beforeEach(function () {
+      Type = fieldFormats.getType(id);
+      instance = fieldFormats.getInstance(id);
+    });
+
+    describe(id + ' Type', function () {
+      it('has an id', function () {
+        expect(Type.id).to.be.a('string');
+      });
+
+      it('has a title', function () {
+        expect(Type.title).to.be.a('string');
+      });
+
+      it('declares compatible field formats as a string or array', function () {
+        expect(Type.fieldType).to.be.ok();
+        expect(_.isString(Type.fieldType) || _.isArray(Type.fieldType)).to.be(true);
+      });
+    });
+
+    describe(id + ' Instance', function () {
+      it('extends FieldFormat', function () {
+        expect(instance).to.be.a(FieldFormat);
+      });
+    });
+  });
+
+  it('registers all of the fieldFormats', function () {
+    expect(_.difference(fieldFormats.raw, formatIds.map(fieldFormats.getType))).to.eql([]);
+  });
+
+  describe('Bytes format', basicPatternTests('bytes', require('numeral')));
+  describe('Percent Format', basicPatternTests('percent', require('numeral')));
+  describe('Date Format', basicPatternTests('date', require('moment')));
+
+  describe('Number Format', function () {
+    basicPatternTests('number', require('numeral'))();
+
+    it('tries to parse strings', function () {
+      var number = new (fieldFormats.getType('number'))({ pattern: '0.0b' });
+      expect(number.convert(123.456)).to.be('123.5B');
+      expect(number.convert('123.456')).to.be('123.5B');
+    });
+
+  });
+
+  function basicPatternTests(id, lib) {
+    var confKey = id === 'date' ? 'dateFormat' : 'format:' + id + ':defaultPattern';
+
+    return function () {
+      it('converts using the format:' + id + ':defaultPattern config', function () {
+        var inst = fieldFormats.getInstance(id);
+        [
+          '0b',
+          '0 b',
+          '0.[000] b',
+          '0.[000]b',
+          '0.[0]b'
+        ].forEach(function (pattern) {
+          var num = _.random(-10000, 10000, true);
+          config.set(confKey, pattern);
+          expect(inst.convert(num)).to.be(lib(num).format(pattern));
+        });
+      });
+
+      it('uses the pattern param if available', function () {
+        var num = _.random(-10000, 10000, true);
+        var defFormat = '0b';
+        var customFormat = '0.00000%';
+
+        config.set(confKey, defFormat);
+        var defInst = fieldFormats.getInstance(id);
+
+        var Type = fieldFormats.getType(id);
+        var customInst = new Type({ pattern: customFormat });
+
+        expect(defInst.convert(num)).to.not.be(customInst.convert(num));
+        expect(defInst.convert(num)).to.be(lib(num).format(defFormat));
+        expect(customInst.convert(num)).to.be(lib(num).format(customFormat));
+      });
+    };
+  }
+});
diff --git a/src/ui/public/stringify/__tests__/_ip.js b/src/ui/public/stringify/__tests__/_ip.js
new file mode 100644
index 0000000000000..b8964bca664ff
--- /dev/null
+++ b/src/ui/public/stringify/__tests__/_ip.js
@@ -0,0 +1,16 @@
+describe('IP Address Format', function () {
+  var fieldFormats;
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    fieldFormats = Private(require('ui/registry/field_formats'));
+  }));
+
+  it('convers a value from a decimal to a string', function () {
+    var ip = fieldFormats.getInstance('ip');
+    expect(ip.convert(1186489492)).to.be('70.184.100.148');
+  });
+
+});
diff --git a/src/ui/public/stringify/__tests__/_source.js b/src/ui/public/stringify/__tests__/_source.js
new file mode 100644
index 0000000000000..41c989258487a
--- /dev/null
+++ b/src/ui/public/stringify/__tests__/_source.js
@@ -0,0 +1,34 @@
+describe('_source formatting', function () {
+  var $ = require('jquery');
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var fieldFormats;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    fieldFormats = Private(require('ui/registry/field_formats'));
+  }));
+
+  describe('Source format', function () {
+    var indexPattern;
+    var hits;
+    var format;
+    var convertHtml;
+
+    beforeEach(ngMock.inject(function (Private) {
+      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+      hits = Private(require('fixtures/hits'));
+      format = fieldFormats.getInstance('_source');
+      convertHtml = format.getConverterFor('html');
+    }));
+
+    it('uses the _source, field, and hit to create a <dl>', function () {
+      var hit = _.first(hits);
+      var $dl = $(convertHtml(hit._source, indexPattern.fields.byName._source, hit));
+      expect($dl.is('dl')).to.be.ok();
+      expect($dl.find('dt')).to.have.length(_.keys(indexPattern.flattenHit(hit)).length);
+    });
+  });
+});
diff --git a/src/ui/public/stringify/__tests__/_string.js b/src/ui/public/stringify/__tests__/_string.js
new file mode 100644
index 0000000000000..c2a7a2276b6d7
--- /dev/null
+++ b/src/ui/public/stringify/__tests__/_string.js
@@ -0,0 +1,19 @@
+describe('String Format', function () {
+  var fieldFormats;
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    fieldFormats = Private(require('ui/registry/field_formats'));
+  }));
+
+  it('decode a base64 string', function () {
+    var StringFormat = fieldFormats.getType('string');
+    var string = new StringFormat({
+      transform: 'base64'
+    });
+    expect(string.convert('Zm9vYmFy')).to.be('foobar');
+  });
+
+});
diff --git a/src/ui/public/stringify/__tests__/_url.js b/src/ui/public/stringify/__tests__/_url.js
new file mode 100644
index 0000000000000..ca5752bc9af30
--- /dev/null
+++ b/src/ui/public/stringify/__tests__/_url.js
@@ -0,0 +1,120 @@
+describe('Url Format', function () {
+  var $ = require('jquery');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var fieldFormats;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    fieldFormats = Private(require('ui/registry/field_formats'));
+  }));
+
+  describe('Url Format', function () {
+    var Url;
+
+    beforeEach(function () {
+      Url = fieldFormats.getType('url');
+    });
+
+    it('ouputs a simple <a> tab by default', function () {
+      var url = new Url();
+
+      var $a = $(url.convert('http://elastic.co', 'html'));
+      expect($a.is('a')).to.be(true);
+      expect($a.size()).to.be(1);
+      expect($a.attr('href')).to.be('http://elastic.co');
+      expect($a.attr('target')).to.be('_blank');
+      expect($a.children().size()).to.be(0);
+    });
+
+    it('outputs an <image> if type === "img"', function () {
+      var url = new Url({ type: 'img' });
+
+      var $img = $(url.convert('http://elastic.co', 'html'));
+      expect($img.is('img')).to.be(true);
+      expect($img.attr('src')).to.be('http://elastic.co');
+    });
+
+    describe('url template', function () {
+      it('accepts a template', function () {
+        var url = new Url({ urlTemplate: 'url: {{ value }}' });
+        var $a = $(url.convert('url', 'html'));
+        expect($a.is('a')).to.be(true);
+        expect($a.size()).to.be(1);
+        expect($a.attr('href')).to.be('url: url');
+        expect($a.attr('target')).to.be('_blank');
+        expect($a.children().size()).to.be(0);
+      });
+
+      it('only outputs the url if the contentType === "text"', function () {
+        var url = new Url();
+        expect(url.convert('url', 'text')).to.be('url');
+      });
+    });
+
+    describe('label template', function () {
+      it('accepts a template', function () {
+        var url = new Url({ labelTemplate: 'extension: {{ value }}' });
+        var $a = $(url.convert('php', 'html'));
+        expect($a.is('a')).to.be(true);
+        expect($a.size()).to.be(1);
+        expect($a.attr('href')).to.be('php');
+        expect($a.html()).to.be('extension: php');
+      });
+
+      it('uses the label template for text formating', function () {
+        var url = new Url({ labelTemplate: 'external {{value }}'});
+        expect(url.convert('url', 'text')).to.be('external url');
+      });
+
+      it('can use the raw value', function () {
+        var url = new Url({
+          labelTemplate: 'external {{value}}'
+        });
+        expect(url.convert('url?', 'text')).to.be('external url?');
+      });
+
+      it('can use the url', function () {
+        var url = new Url({
+          urlTemplate: 'http://google.com/{{value}}',
+          labelTemplate: 'external {{url}}'
+        });
+        expect(url.convert('url?', 'text')).to.be('external http://google.com/url%3F');
+      });
+    });
+
+    describe('templating', function () {
+      it('ignores unknown variables', function () {
+        var url = new Url({ urlTemplate: '{{ not really a var }}' });
+        expect(url.convert('url', 'text')).to.be('');
+      });
+
+      it('does not allow executing code in variable expressions', function () {
+        window.SHOULD_NOT_BE_TRUE = false;
+        var url = new Url({ urlTemplate: '{{ (window.SHOULD_NOT_BE_TRUE = true) && value }}' });
+        expect(url.convert('url', 'text')).to.be('');
+      });
+
+      describe('', function () {
+        before(function () {
+          Object.prototype.cantStopMeNow = {
+            toString: function () {
+              return 'fail';
+            },
+            cantStopMeNow: null
+          };
+        });
+
+        it('does not get values from the prototype chain', function () {
+          var url = new Url({ urlTemplate: '{{ cantStopMeNow }}' });
+          expect(url.convert('url', 'text')).to.be('');
+        });
+
+        after(function () {
+          delete Object.prototype.cantStopMeNow;
+        });
+      });
+    });
+  });
+});
diff --git a/src/ui/public/stringify/__tests__/index.js b/src/ui/public/stringify/__tests__/index.js
new file mode 100644
index 0000000000000..4a1cb93ffb721
--- /dev/null
+++ b/src/ui/public/stringify/__tests__/index.js
@@ -0,0 +1,7 @@
+describe('Stringify Component', function () {
+  require('./_conformance');
+  require('./_ip');
+  require('./_source');
+  require('./_string');
+  require('./_url');
+});
diff --git a/src/kibana/components/stringify/editors/date.html b/src/ui/public/stringify/editors/date.html
similarity index 100%
rename from src/kibana/components/stringify/editors/date.html
rename to src/ui/public/stringify/editors/date.html
diff --git a/src/kibana/components/stringify/editors/string.html b/src/ui/public/stringify/editors/string.html
similarity index 100%
rename from src/kibana/components/stringify/editors/string.html
rename to src/ui/public/stringify/editors/string.html
diff --git a/src/kibana/components/stringify/editors/url.html b/src/ui/public/stringify/editors/url.html
similarity index 100%
rename from src/kibana/components/stringify/editors/url.html
rename to src/ui/public/stringify/editors/url.html
diff --git a/src/kibana/components/stringify/icons/cv.png b/src/ui/public/stringify/icons/cv.png
similarity index 100%
rename from src/kibana/components/stringify/icons/cv.png
rename to src/ui/public/stringify/icons/cv.png
diff --git a/src/kibana/components/stringify/icons/de.png b/src/ui/public/stringify/icons/de.png
similarity index 100%
rename from src/kibana/components/stringify/icons/de.png
rename to src/ui/public/stringify/icons/de.png
diff --git a/src/kibana/components/stringify/icons/flag-icon.LICENSE b/src/ui/public/stringify/icons/flag-icon.LICENSE
similarity index 100%
rename from src/kibana/components/stringify/icons/flag-icon.LICENSE
rename to src/ui/public/stringify/icons/flag-icon.LICENSE
diff --git a/src/kibana/components/stringify/icons/go.png b/src/ui/public/stringify/icons/go.png
similarity index 100%
rename from src/kibana/components/stringify/icons/go.png
rename to src/ui/public/stringify/icons/go.png
diff --git a/src/kibana/components/stringify/icons/ne.png b/src/ui/public/stringify/icons/ne.png
similarity index 100%
rename from src/kibana/components/stringify/icons/ne.png
rename to src/ui/public/stringify/icons/ne.png
diff --git a/src/kibana/components/stringify/icons/ni.png b/src/ui/public/stringify/icons/ni.png
similarity index 100%
rename from src/kibana/components/stringify/icons/ni.png
rename to src/ui/public/stringify/icons/ni.png
diff --git a/src/kibana/components/stringify/icons/stop.png b/src/ui/public/stringify/icons/stop.png
similarity index 100%
rename from src/kibana/components/stringify/icons/stop.png
rename to src/ui/public/stringify/icons/stop.png
diff --git a/src/kibana/components/stringify/icons/us.png b/src/ui/public/stringify/icons/us.png
similarity index 100%
rename from src/kibana/components/stringify/icons/us.png
rename to src/ui/public/stringify/icons/us.png
diff --git a/src/ui/public/stringify/register.js b/src/ui/public/stringify/register.js
new file mode 100644
index 0000000000000..678217e8b5ce7
--- /dev/null
+++ b/src/ui/public/stringify/register.js
@@ -0,0 +1,11 @@
+define(function (require) {
+  var fieldFormats = require('ui/registry/field_formats');
+  fieldFormats.register(require('ui/stringify/types/Url'));
+  fieldFormats.register(require('ui/stringify/types/Bytes'));
+  fieldFormats.register(require('ui/stringify/types/Date'));
+  fieldFormats.register(require('ui/stringify/types/Ip'));
+  fieldFormats.register(require('ui/stringify/types/Number'));
+  fieldFormats.register(require('ui/stringify/types/Percent'));
+  fieldFormats.register(require('ui/stringify/types/String'));
+  fieldFormats.register(require('ui/stringify/types/Source'));
+});
diff --git a/src/ui/public/stringify/types/Bytes.js b/src/ui/public/stringify/types/Bytes.js
new file mode 100644
index 0000000000000..a164545ab08bb
--- /dev/null
+++ b/src/ui/public/stringify/types/Bytes.js
@@ -0,0 +1,10 @@
+define(function (require) {
+  return function BytesFormatProvider(Private) {
+    var Numeral = Private(require('ui/stringify/types/_Numeral'));
+    return Numeral.factory({
+      id: 'bytes',
+      title: 'Bytes',
+      sampleInputs: [1024, 5150000, 1990000000]
+    });
+  };
+});
diff --git a/src/kibana/components/stringify/types/Date.js b/src/ui/public/stringify/types/Date.js
similarity index 81%
rename from src/kibana/components/stringify/types/Date.js
rename to src/ui/public/stringify/types/Date.js
index 63e219a6b24d0..e33c9425c5c6e 100644
--- a/src/kibana/components/stringify/types/Date.js
+++ b/src/ui/public/stringify/types/Date.js
@@ -1,11 +1,11 @@
 define(function (require) {
   return function DateTimeFormatProvider(Private) {
     var _ = require('lodash');
-    var FieldFormat = Private(require('components/index_patterns/_field_format/FieldFormat'));
-    var BoundToConfigObj = Private(require('components/bound_to_config_obj'));
+    var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
+    var BoundToConfigObj = Private(require('ui/bound_to_config_obj'));
     var moment = require('moment');
 
-    require('components/field_format_editor/pattern/pattern');
+    require('ui/field_format_editor/pattern/pattern');
 
     _.class(DateTime).inherits(FieldFormat);
     function DateTime(params) {
@@ -21,7 +21,7 @@ define(function (require) {
     });
 
     DateTime.editor = {
-      template: require('text!components/stringify/editors/date.html'),
+      template: require('ui/stringify/editors/date.html'),
       controllerAs: 'cntrl',
       controller: function ($interval, $scope) {
         var self = this;
diff --git a/src/kibana/components/stringify/types/Ip.js b/src/ui/public/stringify/types/Ip.js
similarity index 84%
rename from src/kibana/components/stringify/types/Ip.js
rename to src/ui/public/stringify/types/Ip.js
index aef43c0990e86..29dbc6333afa0 100644
--- a/src/kibana/components/stringify/types/Ip.js
+++ b/src/ui/public/stringify/types/Ip.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function IpFormatProvider(Private) {
     var _ = require('lodash');
-    var FieldFormat = Private(require('components/index_patterns/_field_format/FieldFormat'));
+    var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
 
     _.class(Ip).inherits(FieldFormat);
     function Ip(params) {
diff --git a/src/kibana/components/stringify/types/Number.js b/src/ui/public/stringify/types/Number.js
similarity index 76%
rename from src/kibana/components/stringify/types/Number.js
rename to src/ui/public/stringify/types/Number.js
index 62acce3d109ea..84bb74d236234 100644
--- a/src/kibana/components/stringify/types/Number.js
+++ b/src/ui/public/stringify/types/Number.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function NumberFormatProvider(Private) {
-    var Numeral = Private(require('components/stringify/types/_Numeral'));
+    var Numeral = Private(require('ui/stringify/types/_Numeral'));
     return Numeral.factory({
       id: 'number',
       title: 'Number',
diff --git a/src/kibana/components/stringify/types/Percent.js b/src/ui/public/stringify/types/Percent.js
similarity index 78%
rename from src/kibana/components/stringify/types/Percent.js
rename to src/ui/public/stringify/types/Percent.js
index c42d726f076f9..093899fba6c77 100644
--- a/src/kibana/components/stringify/types/Percent.js
+++ b/src/ui/public/stringify/types/Percent.js
@@ -1,8 +1,8 @@
 define(function (require) {
   return function NumberFormatProvider(Private) {
     var _ = require('lodash');
-    var BoundToConfigObj = Private(require('components/bound_to_config_obj'));
-    var Numeral = Private(require('components/stringify/types/_Numeral'));
+    var BoundToConfigObj = Private(require('ui/bound_to_config_obj'));
+    var Numeral = Private(require('ui/stringify/types/_Numeral'));
 
     return Numeral.factory({
       id: 'percent',
diff --git a/src/kibana/components/stringify/types/Source.js b/src/ui/public/stringify/types/Source.js
similarity index 81%
rename from src/kibana/components/stringify/types/Source.js
rename to src/ui/public/stringify/types/Source.js
index 3fd38fb9f0c43..20d778ec350fa 100644
--- a/src/kibana/components/stringify/types/Source.js
+++ b/src/ui/public/stringify/types/Source.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function _SourceProvider(Private, shortDotsFilter) {
     var _ = require('lodash');
-    var FieldFormat = Private(require('components/index_patterns/_field_format/FieldFormat'));
-    var noWhiteSpace = require('utils/no_white_space');
-    var template = _.template(noWhiteSpace(require('text!components/stringify/types/_source.html')));
+    var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
+    var noWhiteSpace = require('ui/utils/no_white_space');
+    var template = _.template(noWhiteSpace(require('ui/stringify/types/_source.html')));
     var angular = require('angular');
 
     _.class(Source).inherits(FieldFormat);
diff --git a/src/kibana/components/stringify/types/String.js b/src/ui/public/stringify/types/String.js
similarity index 86%
rename from src/kibana/components/stringify/types/String.js
rename to src/ui/public/stringify/types/String.js
index 63d0fe88cf464..98702a5db173e 100644
--- a/src/kibana/components/stringify/types/String.js
+++ b/src/ui/public/stringify/types/String.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function _StringProvider(Private) {
     var _ = require('lodash');
-    var FieldFormat = Private(require('components/index_patterns/_field_format/FieldFormat'));
+    var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
 
-    require('components/field_format_editor/samples/samples');
+    require('ui/field_format_editor/samples/samples');
 
     _.class(_String).inherits(FieldFormat);
     function _String(params) {
@@ -30,7 +30,7 @@ define(function (require) {
       transform: false
     };
 
-    _String.editor = require('text!components/stringify/editors/string.html');
+    _String.editor = require('ui/stringify/editors/string.html');
 
     _String.transformOpts = [
       { id: false, name: '- none -' },
diff --git a/src/kibana/components/stringify/types/Url.js b/src/ui/public/stringify/types/Url.js
similarity index 91%
rename from src/kibana/components/stringify/types/Url.js
rename to src/ui/public/stringify/types/Url.js
index 2ef788142948d..74820c9d9562f 100644
--- a/src/kibana/components/stringify/types/Url.js
+++ b/src/ui/public/stringify/types/Url.js
@@ -2,8 +2,8 @@ define(function (require) {
   return function UrlFormatProvider(Private, highlightFilter) {
     var _ = require('lodash');
 
-    var FieldFormat = Private(require('components/index_patterns/_field_format/FieldFormat'));
-    require('components/field_format_editor/pattern/pattern');
+    var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
+    require('ui/field_format_editor/pattern/pattern');
 
     _.class(Url).inherits(FieldFormat);
     function Url(params) {
@@ -25,10 +25,10 @@ define(function (require) {
     ];
 
     Url.editor = {
-      template: require('text!components/stringify/editors/url.html'),
+      template: require('ui/stringify/editors/url.html'),
       controllerAs: 'url',
       controller: function ($scope) {
-        var iconPattern = 'components/stringify/icons/{{value}}.png';
+        var iconPattern = 'ui/stringify/icons/{{value}}.png';
 
         this.samples = {
           a: [ 'john', '/some/pathname/asset.png', 1234 ],
diff --git a/src/kibana/components/stringify/types/_Numeral.js b/src/ui/public/stringify/types/_Numeral.js
similarity index 77%
rename from src/kibana/components/stringify/types/_Numeral.js
rename to src/ui/public/stringify/types/_Numeral.js
index 30579b4d1352c..4e9ba049f4ce3 100644
--- a/src/kibana/components/stringify/types/_Numeral.js
+++ b/src/ui/public/stringify/types/_Numeral.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function AbstractNumeralFormatProvider(Private) {
     var _ = require('lodash');
-    var FieldFormat = Private(require('components/index_patterns/_field_format/FieldFormat'));
-    var BoundToConfigObj = Private(require('components/bound_to_config_obj'));
+    var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
+    var BoundToConfigObj = Private(require('ui/bound_to_config_obj'));
     var numeral = require('numeral')();
-    require('components/field_format_editor/numeral/numeral');
+    require('ui/field_format_editor/numeral/numeral');
 
     _.class(Numeral).inherits(FieldFormat);
     function Numeral(params) {
@@ -37,7 +37,7 @@ define(function (require) {
       });
 
       Class.editor = {
-        template: opts.editorTemplate || require('text!components/field_format_editor/numeral/numeral.html'),
+        template: opts.editorTemplate || require('ui/field_format_editor/numeral/numeral.html'),
         controllerAs: 'cntrl',
         controller: opts.controller || function () {
           this.sampleInputs = opts.sampleInputs;
diff --git a/src/kibana/components/stringify/types/_source.html b/src/ui/public/stringify/types/_source.html
similarity index 100%
rename from src/kibana/components/stringify/types/_source.html
rename to src/ui/public/stringify/types/_source.html
diff --git a/src/ui/public/styleCompile/__tests__/styleCompile.js b/src/ui/public/styleCompile/__tests__/styleCompile.js
new file mode 100644
index 0000000000000..0b51ff35c9d67
--- /dev/null
+++ b/src/ui/public/styleCompile/__tests__/styleCompile.js
@@ -0,0 +1,42 @@
+describe('styleCompile directive', function () {
+  var $ = require('jquery');
+  var expect = require('expect.js');
+  var ngMock = require('ngMock');
+
+  var config;
+  var $rootScope;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function ($injector) {
+    config = $injector.get('config');
+    $rootScope = $injector.get('$rootScope');
+  }));
+
+  it('exports a few config values as css', function () {
+    var $style = $('#style-compile');
+
+    config.set('truncate:maxHeight', 0);
+    $rootScope.$apply();
+    expect($style.html().trim()).to.be([
+      '.truncate-by-height {',
+      '  max-height: none;',
+      '  display: inline-block;',
+      '}',
+      '.truncate-by-height:before {',
+      '  top: -15px;',
+      '}'
+    ].join('\n'));
+
+    config.set('truncate:maxHeight', 15);
+    $rootScope.$apply();
+    expect($style.html().trim()).to.be([
+      '.truncate-by-height {',
+      '  max-height: 15px !important;',
+      '  display: inline-block;',
+      '}',
+      '.truncate-by-height:before {',
+      '  top: 0px;',
+      '}'
+    ].join('\n'));
+  });
+});
diff --git a/src/ui/public/styleCompile/styleCompile.css.tmpl b/src/ui/public/styleCompile/styleCompile.css.tmpl
new file mode 100644
index 0000000000000..943b459acc565
--- /dev/null
+++ b/src/ui/public/styleCompile/styleCompile.css.tmpl
@@ -0,0 +1,7 @@
+.truncate-by-height {
+  max-height: <%= truncateMaxHeight %>;
+  display: inline-block;
+}
+.truncate-by-height:before {
+  top: <%= truncateGradientTop %>;
+}
diff --git a/src/ui/public/styleCompile/styleCompile.js b/src/ui/public/styleCompile/styleCompile.js
new file mode 100644
index 0000000000000..f318ec8e4b7c8
--- /dev/null
+++ b/src/ui/public/styleCompile/styleCompile.js
@@ -0,0 +1,30 @@
+define(function (require) {
+  var _ = require('lodash');
+  var $ = require('jquery');
+  var $style = $('<style>').appendTo('head').attr('id', 'style-compile');
+
+  require('ui/config');
+
+  require('ui/modules')
+  .get('kibana')
+  .run(function ($rootScope, $compile, config) {
+    var truncateGradientHeight = 15;
+    var template = _.template(require('./styleCompile.css.tmpl'));
+    var locals = {};
+
+    // watch the value of the truncate:maxHeight config param
+    $rootScope.$watch(function () {
+      return config.get('truncate:maxHeight');
+    }, function (maxHeight) {
+      if (maxHeight > 0) {
+        locals.truncateMaxHeight = maxHeight + 'px !important';
+        locals.truncateGradientTop = maxHeight - truncateGradientHeight + 'px';
+      } else {
+        locals.truncateMaxHeight = 'none';
+        locals.truncateGradientTop = '-' + truncateGradientHeight + 'px';
+      }
+
+      $style.html(template(locals));
+    });
+  });
+});
diff --git a/src/ui/public/styles/base.less b/src/ui/public/styles/base.less
new file mode 100644
index 0000000000000..5e08690140b6b
--- /dev/null
+++ b/src/ui/public/styles/base.less
@@ -0,0 +1,455 @@
+// generic mixins
+@import (reference) "./mixins";
+@import (reference) "./variables";
+@import (reference) "~bootstrap/less/bootstrap";
+
+html,
+body {
+  .flex-parent();
+  height: 100%;
+  margin: 0px;
+}
+
+label > small {
+  font-weight: normal;
+}
+
+button {
+  // buttons have a stupid 1990's default look which should be disabled
+  .btn();
+}
+
+.small {
+  font-size: 0.9em !important;
+}
+.smaller {
+  font-size: 0.8em !important;
+}
+.smallest {
+  font-size: 0.7em !important;
+}
+
+// Colors available for font awesome icons, these might not look good with normal text
+.text-color-primary {
+  color: @brand-primary;
+}
+
+.text-color-info {
+  color: @brand-info;
+}
+
+.text-color-success {
+  color: @brand-success;
+}
+
+.text-color-warning {
+  color: @brand-warning;
+}
+
+.text-color-danger {
+  color: @brand-danger;
+}
+
+.text-monospace {
+  font-family: @font-family-monospace;
+}
+
+code {
+  word-break: break-all;
+  word-wrap: break-word;
+}
+
+ul.navbar-inline li {
+  display: inline;
+}
+
+.tooltip {
+  font-size: 8pt;
+  font-weight: normal;
+  opacity: 90%;
+
+  &-inner {
+    word-break: normal;
+    word-wrap: break-word;
+    white-space: normal;
+  }
+}
+
+.content {
+  .flex-parent();
+  position: relative;
+  z-index: 0;
+
+  > nav {
+    position: relative;
+    z-index: 1;
+
+    .navbar-right {
+      margin-right: 0;
+    }
+  }
+}
+
+.application {
+  .flex-parent();
+  position: relative;
+  z-index: 0;
+}
+
+.top-fixed {
+  position: fixed;
+  bottom: 0px;
+}
+
+.checkbox label {
+  display: flex;
+  align-items: center;
+  padding-left: 0;
+
+  input[type="checkbox"] {
+    float: none;
+    margin: 0 4px;
+    position: static;
+  }
+}
+
+notifications {
+  z-index: 1;
+}
+
+//== Subnav
+//
+// Use for adding a subnav to your app
+.navbar {
+  margin-bottom: 0px!important;
+}
+
+a {
+  // overriden by next rule for a tags that actually have an href
+  cursor: default;
+}
+
+[ng-click], [clip-copy], [href], [confirm-click] {
+  cursor: pointer;
+}
+
+.app-container {
+  > * {
+    position: relative;
+    z-index: 0;
+  }
+
+  > config {
+    z-index: 1;
+  }
+
+  > nav,
+  > navbar {
+    z-index: 2 !important;
+  }
+}
+
+//== Nav tweaks
+.nav-condensed > li > a {
+  padding-top: 2px;
+  padding-bottom: 2px;
+}
+
+.navbar > .container-fluid {
+  > .navbar-nav,
+  > .navbar-form {
+    &:not(.pull-right):first-child {
+      // This is how .navbar-brand accomplishes it's solid placement
+      margin-left: -15px;
+    }
+  }
+}
+
+.navbtn {
+  .button-variant(@navbar-default-color; @navbar-default-bg; @navbar-default-border);
+}
+
+.navbtn-inverse {
+  .button-variant(@navbar-default-color; @navbar-default-bg; @navbar-default-border);
+}
+
+// right section of the main nav base
+.navbar-static-top .navbar-right {
+  font-size: @font-size-small;
+
+  .loading-spinner {
+    color: @navbar-inverse-brand-hover-color;
+    vertical-align: middle;
+  }
+}
+
+.navbar-timepicker {
+  > li > a {
+    padding-left: 7px !important;
+    padding-right: 7px !important;
+  }
+
+  &-time-desc > .fa-clock-o {
+    padding-right: 5px;
+  }
+
+  .fa {
+    font-size: 16px;
+    vertical-align: middle;
+  }
+}
+
+kbn-info i {
+  cursor: help;
+}
+
+.kbn-timepicker .btn-default {
+  background: transparent;
+  color: @text-color;
+  border: 0px;
+  box-shadow: none;
+  text-shadow: none;
+}
+
+.kbn-timepicker .btn-info {
+  .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);
+  text-shadow: none;
+}
+
+.kbn-timepicker .refresh-interval {
+  padding: 0.2em 0.4em;
+  border-radius: @border-radius-small;
+}
+
+.kbn-timepicker .refresh-interval-active {
+  background-color: @btn-info-bg;
+  color: @btn-info-color;
+}
+
+//== Table
+
+kbn-table, .kbn-table {
+  font-size: @font-size-small;
+
+  th {
+    white-space: nowrap;
+    padding-right: 10px;
+
+    .table-header-move, .table-header-sortchange {
+      visibility: hidden;
+    }
+
+    .fa {
+      font-size: 1.1em;
+    }
+
+  }
+
+  th:hover {
+    .table-header-move, .table-header-sortchange {
+      visibility: visible;
+    }
+  }
+
+}
+
+//== Generic Table
+table {
+  td .fa {
+    // font-awesome's override of the line-height usually doesn't
+    // cauase problems, but in the table it pushes the icon to the
+    // top of the row
+    line-height: @line-height-base;
+  }
+}
+
+//== SavedObjectFinder
+saved-object-finder {
+  .form-group {
+    margin-bottom: 0;
+    input {
+      .border-bottom-radius(0);
+    }
+  }
+
+  .list-group-item {
+    &:first-child {
+      .border-top-radius(0) !important;
+    }
+
+    &.list-group-no-results p {
+      margin-bottom: 0 !important;
+    }
+  }
+
+  div.finder-form {
+    position: relative;
+
+    &-options {
+      .flex-parent();
+      flex-direction: row;
+      justify-content: flex-end;
+    }
+  }
+
+  span.finder-hit-count {
+    position: absolute;
+    right: 10px;
+    top: 25px;
+    font-size: 0.85em;
+  }
+
+  .finder-options {
+    max-height: 300px;
+    overflow: auto;
+    padding: 0;
+    .border-top-radius(0);
+
+    // replace the padding that was originally on the outer well
+    > * {
+      padding: @padding-base-vertical @padding-base-horizontal;
+      margin: 0;
+    }
+
+    // enable bigger backgrounds for "active" elements
+    > li {
+      margin-top: -ceil(@padding-base-vertical / 2);
+
+      &:first-child {
+        margin: 0;
+      }
+      &.active {
+        background-color: @component-active-bg;
+        color: @component-active-color;
+        a {
+          color: @component-active-color;
+        }
+      }
+    }
+  }
+}
+
+// when rendered within a config dropdown, don't use a bottom margin
+.config saved-object-finder .finder-options {
+  margin-bottom: 0;
+  background: @body-bg;
+}
+
+//== Generic Media List
+.media-object {
+  // image in result list
+  width: 65px;
+  height: 65px;
+}
+
+
+//== inputDatetime
+.input-datetime-format {
+  font-size: @font-size-small;
+  color: @text-muted;
+  padding: @padding-base-vertical @padding-base-horizontal;
+}
+
+//== clicking disabled buttons should not cause the whole page to get selected
+button[disabled] {
+  user-select: none;
+}
+
+//== override the disabled cursor that doesn't work everywhere
+.form-control{
+  &[disabled],
+  &[readonly],
+  fieldset[disabled] & {
+    cursor: default;
+    opacity: .8;
+  }
+}
+
+.fatal-body {
+  white-space: pre-wrap;
+}
+
+.ng-dirty, .ng-touched {
+  input.ng-invalid&,
+  textarea.ng-invalid&,
+  select.ng-invalid& {
+    border-color: @state-danger-bg !important;
+  }
+}
+
+
+input[type="radio"],
+input[type="checkbox"],
+.radio,
+.radio-inline,
+.checkbox,
+.checkbox-inline {
+  &[disabled],
+  fieldset[disabled] & {
+    cursor: default;
+    opacity: .8;
+  }
+}
+
+textarea {
+  resize: vertical;
+}
+
+.initial-load {
+  margin-top: 60px;
+}
+
+.field-collapse-toggle {
+  color: #999;
+  margin-left: 10px !important;
+}
+
+style-compile {
+  display: none;
+}
+
+.tooltip-inner {
+  white-space: pre-wrap !important;
+}
+
+@import '../filter_bar/filter_bar.less';
+
+
+.cell-hover {
+  background-color: white;
+  &-show {
+    // so that the cell doesn't change size on hover
+    visibility: hidden;
+  }
+}
+.cell-hover:hover {
+  background-color: @gray-lighter;
+  cursor: cell;
+
+  .cell-hover-show {
+    visibility: visible;
+  }
+}
+
+mark, .mark {
+  background-color: rgba(252, 229, 113, 1);
+}
+
+fieldset {
+  margin: @form-group-margin-bottom;
+  padding: @form-group-margin-bottom;
+  border: 1px solid @input-border;
+  border-radius: @input-border-radius;
+}
+
+[fixed-scroll] {
+  overflow-x: auto;
+  padding-bottom: 0px;
+
+  + .fixed-scroll-scroller {
+    position: fixed;
+    bottom: 0px;
+    overflow-x: auto;
+    overflow-y: hidden;
+  }
+}
diff --git a/src/ui/public/styles/callout.less b/src/ui/public/styles/callout.less
new file mode 100644
index 0000000000000..859c8b43511f2
--- /dev/null
+++ b/src/ui/public/styles/callout.less
@@ -0,0 +1,39 @@
+@import "~ui/styles/variables";
+
+.bs-callout(@color, @bgcolor: lighten(@color, 35%)) {
+  display: block;
+  margin: 20px 0;
+  padding: 15px 30px 15px 15px;
+  border-left: 5px solid @color;
+  background-color: @bgcolor;
+  h1, h2, h3, h4, h5, h6 {
+    margin-top: 0;
+    color: @color;
+  }
+  p:last-child {
+    margin-bottom: 0;
+  }
+  code, .highlight {
+    background-color: #fff;
+  }
+}
+
+.bs-callout-primary {
+  .bs-callout(@brand-primary, lighten(@brand-primary, 45%));
+}
+
+.bs-callout-danger {
+  .bs-callout(@brand-danger);
+}
+
+.bs-callout-warning {
+  .bs-callout(@brand-warning, lighten(@brand-warning, 30%));
+}
+
+.bs-callout-info {
+  .bs-callout(@brand-info);
+}
+
+.bs-callout-success {
+  .bs-callout(@brand-success);
+}
diff --git a/src/ui/public/styles/config.less b/src/ui/public/styles/config.less
new file mode 100644
index 0000000000000..3f66670f88916
--- /dev/null
+++ b/src/ui/public/styles/config.less
@@ -0,0 +1,22 @@
+@import (reference) "~ui/styles/theme";
+
+.config {
+  .navbar;
+  .navbar-default();
+  .navbar-static-top;
+  border-bottom: 1px solid darken(@body-bg, 10%);
+
+  .config-close {
+    width: 100%;
+    background-color: @well-bg;
+    border-radius: 0;
+    @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
+    .box-shadow(@shadow);
+    text-align: center;
+  }
+
+  .container-fluid {
+    padding: 10px 10px;
+    background-color: @body-bg;
+  }
+}
diff --git a/src/ui/public/styles/control_group.less b/src/ui/public/styles/control_group.less
new file mode 100644
index 0000000000000..7185319c79d21
--- /dev/null
+++ b/src/ui/public/styles/control_group.less
@@ -0,0 +1,109 @@
+@import "~ui/styles/variables";
+@import "~ui/styles/mixins";
+
+.control-group {
+  display: flex;
+  flex: 0 0 auto;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items: stretch;
+
+  padding: @padding-base-vertical @padding-base-horizontal;
+
+  /***
+   * components
+   ***/
+
+  > * {
+    padding-right: @padding-base-horizontal;
+    flex: 0 0 auto;
+
+    &:last-child {
+      padding-right: 0;
+    }
+  }
+
+  // the element should take up an even share of available space
+  > .fill {
+    flex: 1 1 1%;
+  }
+
+  button {
+    padding: @padding-base-vertical @padding-base-horizontal;
+    font-size: @font-size-base;
+    color: @control-group-link-color;
+    background-color: @control-group-bg;
+
+    &:hover {
+      color: @control-group-link-hover-color;
+      background-color: @control-group-link-hover-bg;
+    }
+
+    .active, &:active, &:focus {
+      color: @control-group-link-active-color;
+      background-color: @control-group-link-active-bg;
+    }
+
+    &[disabled] {
+      color: @control-group-link-disabled-color;
+      background-color: @control-group-link-disabled-bg;
+    }
+
+    &:focus {
+      // because some buttons are all side-to-side, the browser's outline
+      // is cut off by the next button. This causes the outline to be
+      // drawn inside the button. Appplied to all buttons so that it's
+      // uniform within this widget
+      outline-offset: -4px;
+    }
+  }
+
+
+  // horizontal group of buttons/form elements
+  .button-group,
+  .inline-form .input-group {
+    margin-bottom: 0px;
+    display: flex;
+
+    > * {
+      border-radius: 0;
+    }
+
+    > :first-child {
+      .border-left-radius(@input-border-radius);
+    }
+
+    > :last-child {
+      .border-right-radius(@input-border-radius);
+    }
+  }
+
+  .inline-form {
+    .flex-parent();
+    display: flex;
+
+    > .typeahead {
+      .flex-parent();
+
+      > .input-group {
+        display: flex;
+        flex: 1 0 auto;
+
+        > * {
+          float: none;
+          height: auto;
+          width: auto;
+          flex: 0 0 auto;
+        }
+
+        input[type="text"] {
+          flex: 1 1 100%;
+        }
+      }
+    }
+  }
+}
+
+.nav-controls .column {
+  flex-direction: column;
+}
diff --git a/src/ui/public/styles/hintbox.less b/src/ui/public/styles/hintbox.less
new file mode 100644
index 0000000000000..916759dd333e7
--- /dev/null
+++ b/src/ui/public/styles/hintbox.less
@@ -0,0 +1,65 @@
+@import "~ui/styles/variables";
+
+@hintbox-background-color: @gray-lighter;
+@hintbox-spacing-vertical: 10px;
+@hintbox-spacing-horizontal: 12px;
+@hintbox-table-border-color: #BFC9CA;
+
+.hintbox {
+  padding: @hintbox-spacing-vertical @hintbox-spacing-horizontal;
+  border-radius: 5px;
+  margin-bottom: @hintbox-spacing-vertical;
+  background-color: @hintbox-background-color;
+
+  a {
+    color: @link-color !important;
+
+    &:hover {
+      color: @text-color !important;
+    }
+  }
+
+  pre {
+    background-color: white;
+  }
+
+  &-label,
+  &-label[ng-click] {
+    cursor: help;
+  }
+
+  ul, ol {
+    padding-left: 25px;
+  }
+
+  // inspired by Bootstrap alerts component
+  // https://github.com/twbs/bootstrap/blob/063c1b0780ea0240e4adce4c88d57fc23e099475/less/alerts.less#L27-L35
+  > * {
+    margin: 0;
+  }
+
+  > * + * {
+    margin-top: @hintbox-spacing-vertical;
+  }
+
+  // https://github.com/twbs/bootstrap/blob/2aa102bfd40859d15790febed1939e0111a6fb1a/less/tables.less#L88-L106
+  .table-bordered {
+    border: 1px solid @hintbox-table-border-color;
+    > thead,
+    > tbody,
+    > tfoot {
+      > tr {
+        > th,
+        > td {
+          border: 1px solid @hintbox-table-border-color;
+        }
+      }
+    }
+    > thead > tr {
+      > th,
+      > td {
+        border-bottom-width: 2px;
+      }
+    }
+  }
+}
diff --git a/src/ui/public/styles/input.less b/src/ui/public/styles/input.less
new file mode 100644
index 0000000000000..01baf428fa2be
--- /dev/null
+++ b/src/ui/public/styles/input.less
@@ -0,0 +1,9 @@
+@import "~ui/styles/variables";
+
+i.input-error {
+  position: absolute;
+  margin-left: -25px;
+  color: @brand-danger;
+  margin-top: 10px;
+  z-index: 5;
+}
diff --git a/src/ui/public/styles/list-group-menu.less b/src/ui/public/styles/list-group-menu.less
new file mode 100644
index 0000000000000..868b1ef5ec069
--- /dev/null
+++ b/src/ui/public/styles/list-group-menu.less
@@ -0,0 +1,26 @@
+@import (reference) "~ui/styles/theme";
+
+.list-group-menu {
+
+  &.select-mode a{
+     outline: none;
+     color: @link-color;
+  }
+
+  .list-group-menu-item {
+    list-style: none;
+    color: @link-color;
+
+    &.active {
+      font-weight: bold;
+      background-color: @well-bg;
+    }
+    &:hover {
+      background-color: @well-bg;
+    }
+    li {
+      list-style: none;
+      color: @link-color;
+    }
+  }
+}
diff --git a/src/ui/public/styles/mixins.less b/src/ui/public/styles/mixins.less
new file mode 100644
index 0000000000000..568f9dd03dada
--- /dev/null
+++ b/src/ui/public/styles/mixins.less
@@ -0,0 +1,18 @@
+@import "~ui/styles/variables";
+@import (reference) "~bootstrap/less/mixins";
+
+.flex-parent(@grow: 1, @shrink: 1, @basis: auto) {
+  flex: @grow @shrink @basis;
+  display: flex;
+  flex-direction: column;
+
+  > * {
+    flex-shrink: 0;
+  }
+}
+
+.ellipsis() {
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
diff --git a/src/ui/public/styles/navbar.less b/src/ui/public/styles/navbar.less
new file mode 100644
index 0000000000000..a00dad63c66fa
--- /dev/null
+++ b/src/ui/public/styles/navbar.less
@@ -0,0 +1,91 @@
+@import "./control_group";
+
+navbar {
+  .control-group();
+
+  max-height: @navbar-collapse-max-height;
+  margin-bottom: @navbar-margin-bottom;
+  // top and bottom padding are normally calcuated and stored in @navbar-padding-vertical, but flexbox
+  padding: @padding-base-vertical @navbar-padding-horizontal;
+  color: @navbar-default-color;
+  background-color: @navbar-default-bg;
+  border-style: solid;
+  border-color: @navbar-default-border;
+  border-width: 0 0 1px;
+  z-index: @zindex-navbar;
+
+  /***
+   * components
+   ***/
+
+  > * {
+    padding-right: @navbar-padding-horizontal;
+  }
+
+  // the "brand" that is displayed, usually on the left of the navbar
+  > .name {
+    align-self: center;
+
+    font-size: @font-size-large;
+    .ellipsis();
+  }
+
+  button {
+    color: @navbar-default-link-color;
+    background-color: transparent;
+
+    &:hover {
+      color: @navbar-default-link-hover-color;
+      background-color: @navbar-default-link-hover-bg;
+    }
+
+    &:focus {
+      color: @navbar-default-link-color;
+      background-color: transparent;
+    }
+
+    &:active, &.active {
+      color: @navbar-default-link-active-color;
+      background-color: @navbar-default-link-active-bg;
+    }
+
+    &[disabled] {
+      color: @navbar-default-link-disabled-color;
+      background-color: @navbar-default-link-disabled-bg;
+    }
+  }
+
+  .inline-form .input-group {
+    button {
+      color: @brand-primary;
+      background-color: @input-group-addon-bg;
+      border: 1px solid @input-group-addon-border-color;
+    }
+  }
+
+  /***
+   * responsive modifications
+   ***/
+
+  // desktop
+  @media (min-width: @screen-md-min) {
+    > .name {
+      // 500px is sort of arbitrary, not sure how to deal with lots of buttons
+      max-width: 500px;
+    }
+  }
+
+  // tablets/phones
+  @media (max-width: @screen-md-min) {
+    > .fill {
+      flex: 1 1 @screen-md;
+    }
+  }
+
+  // phones
+  @media (max-width: @screen-sm-min) {
+    > .name {
+      max-width: 100%;
+    }
+  }
+}
diff --git a/src/ui/public/styles/notify.less b/src/ui/public/styles/notify.less
new file mode 100644
index 0000000000000..30476796b3d46
--- /dev/null
+++ b/src/ui/public/styles/notify.less
@@ -0,0 +1,75 @@
+@import "~ui/styles/mixins";
+
+.toaster-container {
+  visibility: visible;
+  width: 100%;
+
+  .toaster {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+  }
+
+  .alert {
+    padding: 0 15px;
+    margin: 0;
+    border-radius: 0;
+    border: 0px;
+  }
+
+  .toast {
+    display: flex;
+    align-items: center;
+
+    > * {
+      flex: 0 0 auto;
+      &:not(:last-child) {
+        margin-right: 4px;
+      }
+    }
+
+    &-message {
+      flex: 1 1 auto;
+      .ellipsis();
+      line-height: normal;
+    }
+
+    &-stack {
+      padding-bottom: 10px;
+
+      pre {
+        display: inline-block;
+        width: 100%;
+        margin: 10px 0;
+        word-break: normal;
+        word-wrap: normal;
+        white-space: pre-wrap;
+      }
+    }
+
+    &-controls {
+      display: flex;
+
+      button {
+        flex: 0 0 auto;
+        border: 0;
+        border-radius: 0;
+        padding: 10px 15px;
+      }
+    }
+  }
+
+  // add darkened background to the different badges
+  .alert-success .badge {
+    background: darken(@alert-success-bg, 25%);
+  }
+  .alert-info .badge {
+    background: darken(@alert-info-bg, 25%);
+  }
+  .alert-warning .badge {
+    background: darken(@alert-warning-bg, 25%);
+  }
+  .alert-danger .badge {
+    background: darken(@alert-danger-bg, 25%);
+  }
+}
diff --git a/src/ui/public/styles/pagination.less b/src/ui/public/styles/pagination.less
new file mode 100644
index 0000000000000..2409f113805a2
--- /dev/null
+++ b/src/ui/public/styles/pagination.less
@@ -0,0 +1,55 @@
+@import "~ui/styles/variables";
+
+paginate {
+  display: block;
+
+  paginate-controls {
+    display: flex;
+    align-items: center;
+
+    padding: 5px 5px 10px;
+    text-align: center;
+
+    .pagination-other-pages {
+      flex: 1 0 auto;
+      display: flex;
+      justify-content: center;
+
+      &-list {
+        flex: 0 0 auto;
+        display: flex;
+        justify-content: center;
+        padding: 0;
+        margin: 0;
+        list-style: none;
+
+        > li {
+          flex: 0 0 auto;
+          user-select: none;
+
+          a {
+            text-decoration: none;
+          }
+
+          a:hover {
+            text-decoration: underline;
+          }
+
+          &.active a {
+            text-decoration: none !important;
+            font-weight: bold;
+            color: @text-color;
+          }
+        }
+      }
+    }
+
+    .pagination-size {
+      flex: 0 0 auto;
+
+      input[type=number] {
+        width: 3em;
+      }
+    }
+  }
+}
diff --git a/src/ui/public/styles/sidebar.less b/src/ui/public/styles/sidebar.less
new file mode 100644
index 0000000000000..afc1dbc113f1f
--- /dev/null
+++ b/src/ui/public/styles/sidebar.less
@@ -0,0 +1,139 @@
+@import (reference) "~ui/styles/variables";
+@import (reference) "~ui/styles/mixins";
+
+.sidebar-container {
+  padding-left: 0px !important;
+  padding-right: 0px !important;
+  background-color: @sidebar-bg;
+  border-right: 1px solid @sidebar-border;
+  border-bottom: 1px solid @sidebar-border;
+
+  .sidebar-well {
+    background-color: darken(@sidebar-bg, 5%);
+  }
+
+  .sidebar-list {
+    ul {
+      list-style: none;
+      margin-bottom: 0px;
+    }
+
+    &-header {
+      padding-left: 10px;
+      padding-right: 10px;
+      color: @sidebar-header-color;
+      border: 1px solid rgba(0, 0, 0, 0);
+    }
+
+    .sidebar-item {
+      border-top: 1px solid @sidebar-border;
+      font-size: @sidebar-item-font-size;
+
+      a {
+        color: @text-color;
+
+        &:hover {
+          color: @text-color;
+          text-decoration: none;
+        }
+      }
+
+      &-title,
+      &-text,
+      &-button {
+        margin: 0;
+        padding: 5px 10px;
+        text-align: center;
+        width: 100%;
+        border: none;
+        border-radius: 0;
+      }
+
+      &-title {
+        text-align: left;
+        white-space: nowrap;
+        .ellipsis();
+
+        &.full-title {
+          white-space: normal;
+        }
+
+        &:hover,
+        &:hover .text-muted {
+          color: @sidebar-hover-color;
+          background-color: @sidebar-hover-bg;
+        }
+      }
+
+      &-text {
+        background: white;
+      }
+
+      &-button {
+        font-size: inherit;
+
+        &[disabled] {
+          opacity: 0.65;
+          cursor: default;
+        }
+
+        &.primary {
+          background-color: @btn-primary-bg;
+          color: @btn-primary-color
+        }
+
+        &.info {
+          background-color: @btn-info-bg;
+          color: @btn-info-color
+        }
+
+        &.success {
+          background-color: @btn-success-bg;
+          color: @btn-success-color
+        }
+
+        &.warning {
+          background-color: @btn-warning-bg;
+          color: @btn-warning-color
+        }
+
+        &.danger {
+          background-color: @btn-danger-bg;
+          color: @btn-danger-color
+        }
+
+        &.default {
+          .button-variant(@btn-default-color; @btn-default-bg; @btn-default-border);
+        }
+      }
+
+      .active {
+        background-color: @sidebar-active-bg !important;
+        color: @sidebar-active-color;
+
+        &:hover,
+        &:hover .text-muted {
+          color: @sidebar-active-hover-color;
+          background-color: @sidebar-active-hover-bg;
+        }
+      }
+    }
+  }
+
+  .index-pattern {
+    background-color: @sidebar-active-bg;
+    font-weight: bold;
+    padding: 5px 10px;
+    color: @sidebar-active-color;
+    display: flex;
+    justify-content: space-between;
+
+    > * {
+      flex: 0 1 auto;
+    }
+  }
+
+  .index-pattern-selection .sidebar-item-title {
+    background-color: white;
+  }
+}
diff --git a/src/ui/public/styles/spinner.less b/src/ui/public/styles/spinner.less
new file mode 100644
index 0000000000000..9d4e8f79ee5cf
--- /dev/null
+++ b/src/ui/public/styles/spinner.less
@@ -0,0 +1,55 @@
+@import "~ui/styles/variables";
+
+.spinner {
+  margin: 0px auto 0;
+  white-space: nowrap;
+  text-align: center;
+  display: inline;
+}
+
+.spinner > div {
+  width: 10px;
+  height: 10px;
+  background-color: @text-color;
+  border-radius: 100%;
+  display: inline-block;
+  -webkit-animation: bouncedelay 1s infinite ease-in-out;
+  animation: bouncedelay 1s infinite ease-in-out;
+  /* Prevent first frame from flickering when animation starts */
+  -webkit-animation-fill-mode: both;
+  animation-fill-mode: both;
+}
+
+.navbar .spinner > div {
+  background-color: @navbar-default-link-color;
+}
+
+.spinner.large > div {
+  width: 24px;
+  height: 24px;
+}
+
+.spinner .bounce1 {
+  -webkit-animation-delay: -0.32s;
+  animation-delay: -0.32s;
+}
+
+.spinner .bounce2 {
+  -webkit-animation-delay: -0.16s;
+  animation-delay: -0.16s;
+}
+
+@-webkit-keyframes bouncedelay {
+  0%, 80%, 100% { -webkit-transform: scale(0.0) }
+  40% { -webkit-transform: scale(1.0) }
+}
+
+@keyframes bouncedelay {
+  0%, 80%, 100% {
+    transform: scale(0.0);
+    -webkit-transform: scale(0.0);
+  } 40% {
+    transform: scale(1.0);
+    -webkit-transform: scale(1.0);
+  }
+}
diff --git a/src/ui/public/styles/table.less b/src/ui/public/styles/table.less
new file mode 100644
index 0000000000000..7790cd780e47f
--- /dev/null
+++ b/src/ui/public/styles/table.less
@@ -0,0 +1,35 @@
+@import "~ui/styles/variables";
+
+kbn-table, .kbn-table, tbody[kbn-rows] {
+  // sub tables should not have a leading border
+  .table .table {
+    margin-bottom: 0px;
+
+    tr:first-child > td {
+      border-top: none;
+    }
+
+    td.field-name {
+      font-weight: bold;
+    }
+  }
+
+  dl.source {
+    margin-bottom: 0;
+    line-height: 2em;
+    word-break: break-all;
+
+    dt, dd {
+      display: inline;
+    }
+
+    dt {
+      background: @gray-lighter;
+      padding: @padding-xs-vertical @padding-xs-horizontal;
+      margin-right: @padding-xs-horizontal;
+      font-family: monospace;
+      word-break: normal;
+    }
+  }
+
+}
diff --git a/src/ui/public/styles/theme.less b/src/ui/public/styles/theme.less
new file mode 100644
index 0000000000000..0dacdfbd48fc5
--- /dev/null
+++ b/src/ui/public/styles/theme.less
@@ -0,0 +1,330 @@
+// Flatly 3.1.1
+// Bootswatch
+// -----------------------------------------------------
+
+//@import url("//fonts.googleapis.com/css?family=Lato:400,700,400italic");
+
+@import "~ui/styles/mixins";
+@import "~ui/styles/variables";
+@import "~ui/styles/theme/bootstrap";
+@import "~ui/styles/theme/font-awesome";
+
+
+// Navbar =====================================================================
+
+.navbar {
+  border-width: 0;
+
+  box-shadow: inset 0 -10px 10px -12px #333;
+  -moz-box-shadow: inset 0 -10px 10px -12px #333;
+  -webkit-box-shadow: inset 0 -10px 10px -12px #333;
+
+  &-btn-link {
+    height: @navbar-height;
+    margin: 0;
+    border-radius: 0;
+
+    @media (max-width: @screen-sm-min) {
+      width: 100%;
+      text-align: left;
+    }
+  }
+
+  &-default {
+    .badge {
+      background-color: #fff;
+      color: @navbar-default-bg;
+    }
+  }
+
+  &-inverse {
+    .logo {
+      height: @navbar-height;
+      width: 252px;
+      background-color: @navbar-inverse-brand-bg;
+    }
+
+    .logo-small {
+      height: @navbar-height;
+      width: 45px;
+      background-color: @navbar-inverse-brand-bg;
+    }
+
+    .badge {
+      background-color: #fff;
+      color: lighten(@navbar-inverse-bg, 10%);
+    }
+  }
+
+  .navbar-nav > .active > a {
+    border-bottom-color: @body-bg; // active-arrow-color
+
+    // navbar active arrow base styles
+    &:before {
+      content: "";
+      display: inline-block;
+      position: absolute;
+      border: @navbar-arrow-size solid transparent;
+      border-bottom-color: inherit;
+      top: (@navbar-height - @navbar-arrow-size*2);
+      left: 0;
+      right: 0;
+      margin: 0 auto;
+      width: 0;
+      height: 0;
+    }
+
+    @media (max-width: @screen-sm-min) {
+      &:before {
+        display: none !important;
+      }
+    }
+  }
+
+  &-brand {
+    cursor: default;
+    font-size: 1.8em;
+    background-color: @navbar-inverse-brand-bg;
+    user-select: none;
+  }
+
+  &-nav {
+    font-size: @font-size-small;
+  }
+
+  &-toggle {
+    margin-top: 4px;
+  }
+}
+
+// Buttons ====================================================================
+
+.btn:active {
+  .box-shadow(none);
+}
+
+.btn-group.open .dropdown-toggle {
+  .box-shadow(none);
+}
+
+/* Small devices (tablets, 768px and smaller) */
+@media (max-width: @screen-sm-min) {
+  .btn {
+    /* Fixes an issue with buttons not respecting the bounds of the screen */
+    white-space: normal;
+  }
+}
+
+// Typography =================================================================
+
+.text-primary,
+.text-primary:hover {
+  color: @brand-primary;
+}
+
+.text-success,
+.text-success:hover {
+  color: @brand-success;
+}
+
+.text-danger,
+.text-danger:hover {
+  color: @brand-danger;
+}
+
+.text-warning,
+.text-warning:hover {
+  color: @brand-warning;
+}
+
+.text-info,
+.text-info:hover {
+  color: @brand-info;
+}
+
+// Tables =====================================================================
+
+table,
+.table {
+
+  a {
+    text-decoration: underline;
+  }
+
+  .success,
+  .warning,
+  .danger,
+  .info {
+    color: #fff;
+
+    a {
+      color: #fff;
+    }
+  }
+
+  // > thead > tr > th,
+  // > tbody > tr > th,
+  // > tfoot > tr > th,
+  // > thead > tr > td,
+  // > tbody > tr > td,
+  // > tfoot > tr > td {
+  //   border: none;
+  // }
+
+  &-bordered > thead > tr > th,
+  &-bordered > tbody > tr > th,
+  &-bordered > tfoot > tr > th,
+  &-bordered > thead > tr > td,
+  &-bordered > tbody > tr > td,
+  &-bordered > tfoot > tr > td {
+    border: 1px solid @table-border-color;
+  }
+}
+
+// Forms ======================================================================
+
+.form-control,
+input, {
+  border-width: @input-border-width;
+  .box-shadow(none);
+
+  &:focus {
+    .box-shadow(none);
+  }
+}
+
+.has-warning {
+  .help-block,
+  .control-label,
+  .radio,
+  .checkbox,
+  .radio-inline,
+  .checkbox-inline,
+  .form-control-feedback {
+    color: @brand-warning;
+  }
+
+  .form-control,
+  .form-control:focus {
+    border: @input-border-width solid @brand-warning;
+  }
+
+  .input-group-addon {
+    border-color: @brand-warning;
+  }
+}
+
+.has-error {
+  .help-block,
+  .control-label,
+  .radio,
+  .checkbox,
+  .radio-inline,
+  .checkbox-inline,
+  .form-control-feedback {
+    color: @brand-danger;
+  }
+
+  .form-control,
+  .form-control:focus {
+    border: @input-border-width solid @brand-danger;
+  }
+
+  .input-group-addon {
+    border-color: @brand-danger;
+  }
+}
+
+.has-success {
+  .help-block,
+  .control-label,
+  .radio,
+  .checkbox,
+  .radio-inline,
+  .checkbox-inline,
+  .form-control-feedback {
+    color: @brand-success;
+  }
+
+  .form-control,
+  .form-control:focus {
+    border: solid @brand-success;
+  }
+
+  .input-group-addon {
+    border-color: @brand-success;
+  }
+}
+
+// Navs =======================================================================
+
+.nav {
+  .open > a,
+  .open > a:hover,
+  .open > a:focus {
+    border-color: transparent;
+  }
+}
+
+.pager {
+  a,
+  a:hover {
+    color: #fff;
+  }
+
+  .disabled {
+    &>a,
+    &>a:hover,
+    &>a:focus,
+    &>span {
+      background-color: @pagination-disabled-bg;
+    }
+  }
+}
+
+
+// Panel =================================================================
+
+.panel {
+  border-radius: 0;
+  .box-shadow(0 0 0 rgba(0,0,0,0));
+}
+
+// Indicators =================================================================
+
+.alert {
+
+  a,
+  .alert-link {
+    color: #fff;
+    text-decoration: underline;
+  }
+
+  .close {
+    color: #fff;
+    text-decoration: none;
+    opacity: 0.4;
+
+    &:hover,
+    &:focus {
+      color: #fff;
+      opacity: 1;
+    }
+  }
+}
+
+// Progress bars ==============================================================
+
+.progress {
+  .box-shadow(none);
+  .progress-bar {
+    font-size: 10px;
+    line-height: 10px;
+  }
+}
+
+// Containers =================================================================
+
+.well {
+  .box-shadow(none);
+}
diff --git a/src/ui/public/styles/theme/bootstrap.less b/src/ui/public/styles/theme/bootstrap.less
new file mode 100644
index 0000000000000..9b10b8e7c5003
--- /dev/null
+++ b/src/ui/public/styles/theme/bootstrap.less
@@ -0,0 +1,53 @@
+@import "~bootstrap/less/variables.less";
+@import "~ui/styles/variables/bootstrap-mods.less";
+@import "~ui/styles/variables/for-theme.less";
+
+// Core variables and mixins
+@import "~bootstrap/less/mixins.less";
+
+// Reset and dependencies
+@import "~bootstrap/less/normalize.less";
+@import "~bootstrap/less/print.less";
+@import "~bootstrap/less/glyphicons.less";
+
+// Core CSS
+@import "~bootstrap/less/scaffolding.less";
+@import "~bootstrap/less/type.less";
+@import "~bootstrap/less/code.less";
+@import "~bootstrap/less/grid.less";
+@import "~bootstrap/less/tables.less";
+@import "~bootstrap/less/forms.less";
+@import "~bootstrap/less/buttons.less";
+
+// Components
+@import "~bootstrap/less/component-animations.less";
+@import "~bootstrap/less/dropdowns.less";
+@import "~bootstrap/less/button-groups.less";
+@import "~bootstrap/less/input-groups.less";
+@import "~bootstrap/less/navs.less";
+@import "~bootstrap/less/navbar.less";
+@import "~bootstrap/less/breadcrumbs.less";
+@import "~bootstrap/less/pagination.less";
+@import "~bootstrap/less/pager.less";
+@import "~bootstrap/less/labels.less";
+@import "~bootstrap/less/badges.less";
+@import "~bootstrap/less/jumbotron.less";
+@import "~bootstrap/less/thumbnails.less";
+@import "~bootstrap/less/alerts.less";
+@import "~bootstrap/less/progress-bars.less";
+@import "~bootstrap/less/media.less";
+@import "~bootstrap/less/list-group.less";
+@import "~bootstrap/less/panels.less";
+@import "~bootstrap/less/responsive-embed.less";
+@import "~bootstrap/less/wells.less";
+@import "~bootstrap/less/close.less";
+
+// Components w/ JavaScript
+@import "~bootstrap/less/modals.less";
+@import "~bootstrap/less/tooltip.less";
+@import "~bootstrap/less/popovers.less";
+@import "~bootstrap/less/carousel.less";
+
+// Utility classes
+@import "~bootstrap/less/utilities.less";
+@import "~bootstrap/less/responsive-utilities.less";
diff --git a/src/ui/public/styles/theme/font-awesome.less b/src/ui/public/styles/theme/font-awesome.less
new file mode 100644
index 0000000000000..cc62487d3be80
--- /dev/null
+++ b/src/ui/public/styles/theme/font-awesome.less
@@ -0,0 +1,9 @@
+@import "~font-awesome/less/font-awesome";
+
+// new file icon
+.@{fa-css-prefix}-file-new-o:before { content: @fa-var-file-o; }
+.@{fa-css-prefix}-file-new-o:after { content: @fa-var-plus; position: relative; margin-left: -1.0em; font-size: 0.5em; }
+
+// alias for alert types - allows class="fa fa-{{alertType}}"
+.fa-success:before { content: @fa-var-check; }
+.fa-danger:before { content: @fa-var-exclamation-circle; }
diff --git a/src/ui/public/styles/truncate.less b/src/ui/public/styles/truncate.less
new file mode 100644
index 0000000000000..a30dccf5be111
--- /dev/null
+++ b/src/ui/public/styles/truncate.less
@@ -0,0 +1,19 @@
+.truncate-by-height {
+  position: relative;
+  overflow: hidden;
+
+  &:before {
+    content: " ";
+    width: 100%;
+    height: 15px; // copied into index.html!
+    position: absolute;
+    left: 0;
+
+    background: -moz-linear-gradient(top,  rgba(255,255,255,0) 0%, rgba(255,255,255,0.01) 1%, rgba(255,255,255,0.99) 99%, rgba(255,255,255,1) 100%); /* FF3.6+ */
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,0)), color-stop(1%,rgba(255,255,255,0.01)), color-stop(99%,rgba(255,255,255,0.99)), color-stop(100%,rgba(255,255,255,1))); /* Chrome,Safari4+ */
+    background: -webkit-linear-gradient(top,  rgba(255,255,255,0) 0%,rgba(255,255,255,0.01) 1%,rgba(255,255,255,0.99) 99%,rgba(255,255,255,1) 100%); /* Chrome10+,Safari5.1+ */
+    background: -o-linear-gradient(top,  rgba(255,255,255,0) 0%,rgba(255,255,255,0.01) 1%,rgba(255,255,255,0.99) 99%,rgba(255,255,255,1) 100%); /* Opera 11.10+ */
+    background: -ms-linear-gradient(top,  rgba(255,255,255,0) 0%,rgba(255,255,255,0.01) 1%,rgba(255,255,255,0.99) 99%,rgba(255,255,255,1) 100%); /* IE10+ */
+    background: linear-gradient(to bottom,  rgba(255,255,255,0) 0%,rgba(255,255,255,0.01) 1%,rgba(255,255,255,0.99) 99%,rgba(255,255,255,1) 100%); /* W3C */
+  }
+}
diff --git a/src/ui/public/styles/variables.less b/src/ui/public/styles/variables.less
new file mode 100644
index 0000000000000..b38a8d7f9f2d7
--- /dev/null
+++ b/src/ui/public/styles/variables.less
@@ -0,0 +1,3 @@
+@import "~bootstrap/less/variables.less";
+@import "~ui/styles/variables/bootstrap-mods.less";
+@import "~ui/styles/variables/for-theme.less";
diff --git a/src/ui/public/styles/variables/bootstrap-mods.less b/src/ui/public/styles/variables/bootstrap-mods.less
new file mode 100644
index 0000000000000..319c4e2294da6
--- /dev/null
+++ b/src/ui/public/styles/variables/bootstrap-mods.less
@@ -0,0 +1,874 @@
+//== Colors
+//
+//## Gray and brand colors for use across Bootstrap.
+
+@gray-base:              #000;
+@gray-darker:            lighten(@gray-base, 13.5%);
+@gray-dark:              #7b8a8b;
+@gray:                   #95a5a6;
+@gray-light:             #b4bcc2;
+@gray-lighter:           #ecf0f1;
+
+@brand-primary:         #444444;
+@brand-success:         #31C471; // #18BC9C
+@brand-info:            #1F6B7A;
+@brand-warning:         #F39C12;
+@brand-danger:          #E74C3C;
+
+
+//== Scaffolding
+//
+// ## Settings for some of the most global styles.
+
+//** Background color for `<body>`.
+@body-bg:               #fff;
+//** Global text color on `<body>`.
+@text-color:            @brand-primary;
+
+//** Global textual link color.
+@link-color:            #1F6B7A;
+//** Link hover color set via `darken()` function.
+@link-hover-color:      lighten(@link-color, 10%);
+@link-hover-decoration: none;
+
+
+@dl-horizontal-offset:        @component-offset-horizontal;
+
+//** Disabled cursor for form controls and buttons.
+@cursor-disabled:                not-allowed;
+
+//== Typography
+//
+//## Font, line-height, and color for body text, headings, and more.
+
+@font-family-sans-serif:  "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
+@font-family-serif:       Georgia, "Times New Roman", Times, serif;
+//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
+@font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
+@font-family-base:        @font-family-sans-serif;
+
+@font-size-base:          13px;
+@font-size-large:         ceil((@font-size-base * 1.25)); // ~18px
+@font-size-small:         ceil((@font-size-base * 0.85)); // ~12px
+
+@font-size-h1:            floor((@font-size-base * 2.6)); // ~36px
+@font-size-h2:            floor((@font-size-base * 2.15)); // ~30px
+@font-size-h3:            ceil((@font-size-base * 1.7)); // ~24px
+@font-size-h4:            ceil((@font-size-base * 1.25)); // ~18px
+@font-size-h5:            @font-size-base;
+@font-size-h6:            ceil((@font-size-base * 0.85)); // ~12px
+
+//** Unit-less `line-height` for use in components like buttons.
+@line-height-base:        1.428571429; // 20/14
+//@line-height-base: 1;
+//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+@line-height-computed:    floor((@font-size-base * @line-height-base)); // ~20px
+
+//** By default, this inherits from the `<body>`.
+@headings-font-family:    @font-family-base;
+@headings-font-weight:    400;
+@headings-line-height:    1.1;
+@headings-color:          inherit;
+
+
+//-- Iconography
+//
+//## Specify custom locations of the include Glyphicons icon font. Useful for those including Bootstrap via Bower.
+
+@icon-font-path:          "../fonts/";
+@icon-font-name:          "glyphicons-halflings-regular";
+@icon-font-svg-id:        "glyphicons_halflingsregular";
+
+//== Components
+//
+//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
+
+@padding-base-vertical:     5px;
+@padding-base-horizontal:   15px;
+
+@padding-large-vertical:    18px;
+@padding-large-horizontal:  27px;
+
+@padding-small-vertical:    6px;
+@padding-small-horizontal:  9px;
+
+@padding-xs-vertical:       1px;
+@padding-xs-horizontal:     5px;
+
+@line-height-large:         1.33;
+@line-height-small:         1.5;
+
+@border-radius-base:        4px;
+@border-radius-large:       6px;
+@border-radius-small:       3px;
+
+//** Global color for active items (e.g., navs or dropdowns).
+@component-active-color:    #fff;
+//** Global background color for active items (e.g., navs or dropdowns).
+@component-active-bg:       @brand-primary;
+
+//** Width of the `border` for generating carets that indicator dropdowns.
+@caret-width-base:          4px;
+//** Carets increase slightly in size for larger components.
+@caret-width-large:         5px;
+
+
+//== Tables
+//
+//## Customizes the `.table` component with basic values, each used across all table variations.
+
+//** Padding for `<th>`s and `<td>`s.
+@table-cell-padding:            8px;
+//** Padding for cells in `.table-condensed`.
+@table-condensed-cell-padding:  5px;
+
+//** Default background color used for all tables.
+@table-bg:                      transparent;
+//** Background color used for `.table-striped`.
+@table-bg-accent:               #f9f9f9;
+//** Background color used for `.table-hover`.
+@table-bg-hover:                @gray-lighter;
+@table-bg-active:               @table-bg-hover;
+
+//** Border color for table and cell borders.
+@table-border-color:            @gray-lighter;
+
+
+//== Buttons
+//
+//## For each of Bootstrap's buttons, define text, background and border color.
+
+@btn-font-weight:                normal;
+
+@btn-default-color:              #fff;
+@btn-default-bg:                 @gray;
+@btn-default-border:             @btn-default-bg;
+
+@btn-primary-color:              @btn-default-color;
+@btn-primary-bg:                 @brand-primary;
+@btn-primary-border:             @btn-primary-bg;
+
+@btn-success-color:              @btn-default-color;
+@btn-success-bg:                 @brand-success;
+@btn-success-border:             @btn-success-bg;
+
+@btn-info-color:                 @btn-default-color;
+@btn-info-bg:                    @brand-info;
+@btn-info-border:                @btn-info-bg;
+
+@btn-warning-color:              @btn-default-color;
+@btn-warning-bg:                 @brand-warning;
+@btn-warning-border:             @btn-warning-bg;
+
+@btn-danger-color:               @btn-default-color;
+@btn-danger-bg:                  @brand-danger;
+@btn-danger-border:              @btn-danger-bg;
+
+@btn-link-disabled-color:        @gray-light;
+
+
+//== Forms
+//
+//##
+
+//** `<input>` background color
+@input-bg:                       #fff;
+//** `<input disabled>` background color
+@input-bg-disabled:              @gray-lighter;
+
+//** Text color for `<input>`s
+@input-color:                    @text-color;
+//** `<input>` border color
+@input-border:                   @gray-lighter;
+
+// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
+//** Default `.form-control` border radius
+@input-border-radius:            @border-radius-base;
+//** Large `.form-control` border radius
+@input-border-radius-large:      @border-radius-large;
+//** Small `.form-control` border radius
+@input-border-radius-small:      @border-radius-small;
+
+//** Border color for inputs on focus
+@input-border-focus:             @gray-light;
+
+//** Placeholder text color
+@input-color-placeholder:        #acb6c0;
+
+//** Default `.form-control` height
+@input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);
+//** Large `.form-control` height
+@input-height-large:             (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
+//** Small `.form-control` height
+@input-height-small:             (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
+
+//** `.form-group` margin
+@form-group-margin-bottom:       15px;
+
+@legend-color:                   @text-color;
+@legend-border-color:            transparent;
+
+//** Background color for textual input addons
+@input-group-addon-bg:           @gray-lighter;
+//** Border color for textual input addons
+@input-group-addon-border-color: @input-border;
+
+
+//== Dropdowns
+//
+//## Dropdown menu container and contents.
+
+//** Background for the dropdown menu.
+@dropdown-bg:                    #fff;
+//** Dropdown menu `border-color`.
+@dropdown-border:                rgba(0,0,0,.15);
+//** Dropdown menu `border-color` **for IE8**.
+@dropdown-fallback-border:       #ccc;
+//** Divider color for between dropdown items.
+@dropdown-divider-bg:            #e5e5e5;
+
+//** Dropdown link text color.
+@dropdown-link-color:            @gray-dark;
+//** Hover color for dropdown links.
+@dropdown-link-hover-color:      #fff;
+//** Hover background for dropdown links.
+@dropdown-link-hover-bg:         @dropdown-link-active-bg;
+
+//** Active dropdown menu item text color.
+@dropdown-link-active-color:     #fff;
+//** Active dropdown menu item background color.
+@dropdown-link-active-bg:        @component-active-bg;
+
+//** Disabled dropdown menu item background color.
+@dropdown-link-disabled-color:   @text-muted;
+
+//** Text color for headers within dropdown menus.
+@dropdown-header-color:          @text-muted;
+
+// Note: Deprecated @dropdown-caret-color as of v3.1.0
+@dropdown-caret-color:           #000;
+
+
+//-- Z-index master list
+//
+// Warning: Avoid customizing these values. They're used for a bird's eye view
+// of components dependent on the z-axis and are designed to all work together.
+//
+// Note: These variables are not generated into the Customizer.
+
+@zindex-navbar:            1000;
+@zindex-dropdown:          1000;
+@zindex-popover:           1010;
+@zindex-tooltip:           1020;
+@zindex-typeahead:         1030;
+@zindex-tooltip:           1040;
+@zindex-navbar-fixed:      1050;
+@zindex-modal-background:  1060;
+@zindex-modal:             1070;
+
+
+//== Media queries breakpoints
+//
+//## Define the breakpoints at which your layout will change, adapting to different screen sizes.
+
+// Extra small screen / phone
+// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1
+@screen-xs:                  480px;
+@screen-xs-min:              @screen-xs;
+@screen-phone:               @screen-xs-min;
+
+// Small screen / tablet
+// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1
+@screen-sm:                  768px;
+@screen-sm-min:              @screen-sm;
+@screen-tablet:              @screen-sm-min;
+
+// Medium screen / desktop
+// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1
+@screen-md:                  992px;
+@screen-md-min:              @screen-md;
+@screen-desktop:             @screen-md-min;
+
+// Large screen / wide desktop
+// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1
+@screen-lg:                  1200px;
+@screen-lg-min:              @screen-lg;
+@screen-lg-desktop:          @screen-lg-min;
+
+// So media queries don't overlap when required, provide a maximum
+@screen-xs-max:              (@screen-sm-min - 1);
+@screen-sm-max:              (@screen-md-min - 1);
+@screen-md-max:              (@screen-lg-min - 1);
+
+
+//== Grid system
+//
+//## Define your custom responsive grid.
+
+//** Number of columns in the grid.
+@grid-columns:              12;
+//** Padding between columns. Gets divided in half for the left and right.
+@grid-gutter-width:         30px;
+// Navbar collapse
+//** Point at which the navbar becomes uncollapsed.
+@grid-float-breakpoint:     @screen-sm-min;
+//** Point at which the navbar begins collapsing.
+@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
+
+
+//== Container sizes
+//
+//## Define the maximum width of `.container` for different screen sizes.
+
+// Small screen / tablet
+@container-tablet:             ((720px + @grid-gutter-width));
+//** For `@screen-sm-min` and up.
+@container-sm:                 @container-tablet;
+
+// Medium screen / desktop
+@container-desktop:            ((940px + @grid-gutter-width));
+//** For `@screen-md-min` and up.
+@container-md:                 @container-desktop;
+
+// Large screen / wide desktop
+@container-large-desktop:      ((1140px + @grid-gutter-width));
+//** For `@screen-lg-min` and up.
+@container-lg:                 @container-large-desktop;
+
+
+//== Control Group
+@control-group-color:                  @text-color;
+@control-group-bg:                     inherit;
+@control-group-border:                 @gray-dark;
+@control-group-link-color:             @link-color;
+@control-group-link-hover-color:       @gray-lighter;
+@control-group-link-hover-bg:          lighten(@brand-primary, 10%);
+@control-group-link-active-color:      @gray-light;
+@control-group-link-active-bg:         lighten(@brand-primary, 10%);
+@control-group-link-disabled-color:    @gray-light;
+@control-group-link-disabled-bg:       transparent;
+
+//== Navbar
+//
+//##
+
+// Basics of a navbar
+@navbar-height:                    45px;
+@navbar-margin-bottom:             0px;
+@navbar-border-radius:             @border-radius-base;
+@navbar-padding-horizontal:        floor((@grid-gutter-width / 2));
+@navbar-padding-vertical:          ((@navbar-height - @line-height-computed) / 2);
+@navbar-collapse-max-height:       340px;
+
+@navbar-arrow-size:                7px;
+
+// Default theme
+@navbar-default-color:               #fff;
+@navbar-default-bg:                  #656A76;
+@navbar-default-border:              darken(@navbar-default-bg, 10%);
+@navbar-default-link-color:          @gray-lighter;
+@navbar-default-link-hover-color:    #fff;
+@navbar-default-link-hover-bg:       transparent;
+@navbar-default-link-active-color:   #fff;
+@navbar-default-link-active-bg:      darken(@navbar-default-bg, 10%);
+@navbar-default-link-disabled-color: #ccc;
+@navbar-default-link-disabled-bg:    transparent;
+
+// Navbar brand label
+@navbar-default-brand-color:               @navbar-default-link-color;
+@navbar-default-brand-hover-color:         @navbar-default-link-hover-color;
+@navbar-default-brand-hover-bg:            transparent;
+
+// Navbar toggle
+@navbar-default-toggle-hover-bg:           darken(@navbar-default-bg, 10%);
+@navbar-default-toggle-icon-bar-bg:        #fff;
+@navbar-default-toggle-border-color:       darken(@navbar-default-bg, 10%);
+
+
+// Inverted navbar
+// Reset inverted navbar basics
+@navbar-inverse-color:                      #fff;
+@navbar-inverse-bg:                         @gray-darker;
+@navbar-inverse-border:                     darken(@navbar-inverse-bg, 10%);
+
+// Inverted navbar links
+@navbar-inverse-link-color:                 @gray-lighter;
+@navbar-inverse-link-hover-color:           #fff;
+@navbar-inverse-link-hover-bg:              lighten(@navbar-inverse-bg, 20%);
+@navbar-inverse-link-active-color:          #fff;
+@navbar-inverse-link-active-bg:             #41454c;
+@navbar-inverse-link-disabled-color:        @gray-light;
+@navbar-inverse-link-disabled-bg:           transparent;
+
+// Inverted navbar brand label
+@navbar-inverse-brand-color:                white;
+@navbar-inverse-brand-bg:                   lighten(@navbar-inverse-bg, 10%);
+@navbar-inverse-brand-hover-color:          @navbar-inverse-brand-color;
+@navbar-inverse-brand-hover-bg:             @navbar-inverse-brand-bg;
+
+// Inverted navbar toggle
+@navbar-inverse-toggle-hover-bg:            darken(@navbar-inverse-bg, 10%);
+@navbar-inverse-toggle-icon-bar-bg:         #fff;
+@navbar-inverse-toggle-border-color:        darken(@navbar-inverse-bg, 10%);
+
+
+//== Navs
+//
+//##
+
+//=== Shared nav styles
+@nav-link-padding:                          10px 15px;
+@nav-link-hover-bg:                         @gray-lighter;
+
+@nav-disabled-link-color:                   @gray-light;
+@nav-disabled-link-hover-color:             @gray-light;
+
+@nav-open-link-hover-color:                 #fff;
+
+//== Tabs
+@nav-tabs-border-color:                     @gray-lighter;
+
+@nav-tabs-link-hover-border-color:          @gray-lighter;
+
+@nav-tabs-active-link-hover-bg:             @body-bg;
+@nav-tabs-active-link-hover-color:          @brand-primary;
+@nav-tabs-active-link-hover-border-color:   @gray-lighter;
+
+@nav-tabs-justified-link-border-color:            @gray-lighter;
+@nav-tabs-justified-active-link-border-color:     @body-bg;
+
+//== Pills
+@nav-pills-border-radius:                   @border-radius-base;
+@nav-pills-active-link-hover-bg:            @component-active-bg;
+@nav-pills-active-link-hover-color:         @component-active-color;
+
+
+//== Pagination
+//
+//##
+
+@pagination-color:                     @link-color;
+@pagination-bg:                        transparent;
+@pagination-border:                    transparent;
+
+@pagination-hover-color:               @link-color;
+@pagination-hover-bg:                  darken(transparent, 15%);
+@pagination-hover-border:              transparent;
+
+@pagination-active-color:              @text-color;
+@pagination-active-bg:                 darken(transparent, 15%);
+@pagination-active-border:             transparent;
+
+@pagination-disabled-color:            @gray-darker;
+@pagination-disabled-bg:               lighten(transparent, 15%);;
+@pagination-disabled-border:           transparent;
+
+
+//== Pager
+//
+//##
+
+@pager-bg:                             @pagination-bg;
+@pager-border:                         @pagination-border;
+@pager-border-radius:                  0px;
+
+@pager-hover-bg:                       @pagination-hover-bg;
+
+@pager-active-bg:                      @pagination-active-bg;
+@pager-active-color:                   @pagination-active-color;
+
+@pager-disabled-color:                 #fff;
+
+
+//== Jumbotron
+//
+//##
+
+@jumbotron-padding:              30px;
+@jumbotron-color:                inherit;
+@jumbotron-bg:                   @gray-lighter;
+@jumbotron-heading-color:        inherit;
+@jumbotron-font-size:            ceil((@font-size-base * 1.5));
+
+
+//== Form states and alerts
+//
+//## Define colors for form feedback states and, by default, alerts.
+
+@state-success-text:             #fff;
+@state-success-bg:               @brand-success;
+@state-success-border:           darken(@brand-success, 10%);
+
+@state-info-text:                #fff;
+@state-info-bg:                  @brand-info;
+@state-info-border:              darken(@brand-info, 10%);
+
+@state-warning-text:             #fff;
+@state-warning-bg:               @brand-warning;
+@state-warning-border:           darken(@brand-warning, 10%);
+
+@state-danger-text:              #fff;
+@state-danger-bg:                @brand-danger;
+@state-danger-border:            darken(@brand-danger, 10%);
+
+
+//== Tooltips
+//
+//##
+
+//** Tooltip max width
+@tooltip-max-width:           200px;
+//** Tooltip text color
+@tooltip-color:               #fff;
+//** Tooltip background color
+@tooltip-bg:                  rgba(0,0,0,.9);
+@tooltip-opacity:             .9;
+
+//** Tooltip arrow width
+@tooltip-arrow-width:         5px;
+//** Tooltip arrow color
+@tooltip-arrow-color:         @tooltip-bg;
+
+
+//== Popovers
+//
+//##
+
+//** Popover body background color
+@popover-bg:                          #fff;
+//** Popover maximum width
+@popover-max-width:                   276px;
+//** Popover border color
+@popover-border-color:                rgba(0,0,0,.2);
+//** Popover fallback border color
+@popover-fallback-border-color:       #ccc;
+
+//** Popover title background color
+@popover-title-bg:                    darken(@popover-bg, 3%);
+
+//** Popover arrow width
+@popover-arrow-width:                 10px;
+//** Popover arrow color
+@popover-arrow-color:                 #fff;
+
+//** Popover outer arrow width
+@popover-arrow-outer-width:           (@popover-arrow-width + 1);
+//** Popover outer arrow color
+@popover-arrow-outer-color:           fadein(@popover-border-color, 5%);
+//** Popover outer arrow fallback color
+@popover-arrow-outer-fallback-color:  darken(@popover-fallback-border-color, 20%);
+
+
+//== Labels
+//
+//##
+
+//** Default label background color
+@label-default-bg:            @btn-default-bg;
+//** Primary label background color
+@label-primary-bg:            @brand-primary;
+//** Success label background color
+@label-success-bg:            @brand-success;
+//** Info label background color
+@label-info-bg:               @brand-info;
+//** Warning label background color
+@label-warning-bg:            @brand-warning;
+//** Danger label background color
+@label-danger-bg:             @brand-danger;
+
+//** Default label text color
+@label-color:                 #fff;
+//** Default text color of a linked label
+@label-link-hover-color:      #fff;
+
+
+//== Modals
+//
+//##
+
+//** Padding applied to the modal body
+@modal-inner-padding:         20px;
+
+//** Padding applied to the modal title
+@modal-title-padding:         15px;
+//** Modal title line-height
+@modal-title-line-height:     @line-height-base;
+
+//** Background color of modal content area
+@modal-content-bg:                             #fff;
+//** Modal content border color
+@modal-content-border-color:                   rgba(0,0,0,.2);
+//** Modal content border color **for IE8**
+@modal-content-fallback-border-color:          #999;
+
+//** Modal backdrop background color
+@modal-backdrop-bg:           #000;
+//** Modal backdrop opacity
+@modal-backdrop-opacity:      .5;
+//** Modal header border color
+@modal-header-border-color:   #e5e5e5;
+//** Modal footer border color
+@modal-footer-border-color:   @modal-header-border-color;
+
+@modal-lg:                    900px;
+@modal-md:                    600px;
+@modal-sm:                    300px;
+
+
+//== Alerts
+//
+//## Define alert colors, border radius, and padding.
+
+@alert-padding:               15px;
+@alert-border-radius:         @border-radius-base;
+@alert-link-font-weight:      bold;
+
+@alert-success-bg:            @state-success-bg;
+@alert-success-text:          @state-success-text;
+@alert-success-border:        @state-success-border;
+
+@alert-info-bg:               @state-info-bg;
+@alert-info-text:             @state-info-text;
+@alert-info-border:           @state-info-border;
+
+@alert-warning-bg:            @state-warning-bg;
+@alert-warning-text:          @state-warning-text;
+@alert-warning-border:        @state-warning-border;
+
+@alert-danger-bg:             @state-danger-bg;
+@alert-danger-text:           @state-danger-text;
+@alert-danger-border:         @state-danger-border;
+
+
+//== Progress bars
+//
+//##
+
+//** Background color of the whole progress component
+@progress-bg:                 @gray-lighter;
+//** Progress bar text color
+@progress-bar-color:          #fff;
+
+//** Variable for setting rounded corners on progress bar.
+@progress-border-radius:      @border-radius-base;
+
+//** Default progress bar color
+@progress-bar-bg:             @brand-primary;
+//** Success progress bar color
+@progress-bar-success-bg:     @brand-success;
+//** Warning progress bar color
+@progress-bar-warning-bg:     @brand-warning;
+//** Danger progress bar color
+@progress-bar-danger-bg:      @brand-danger;
+//** Info progress bar color
+@progress-bar-info-bg:        @brand-info;
+
+
+//== List group
+//
+//##
+
+//** Background color on `.list-group-item`
+@list-group-bg:                 #fff;
+//** `.list-group-item` border color
+@list-group-border:             #ddd;
+//** List group border radius
+@list-group-border-radius:      @border-radius-base;
+
+//** Background color of single list items on hover
+@list-group-hover-bg:           #f5f5f5;
+//** Text color of active list items
+@list-group-active-color:       @text-color;
+//** Background color of active list items
+@list-group-active-bg:          @component-active-bg;
+//** Border color of active list elements
+@list-group-active-border:      @list-group-active-bg;
+//** Text color for content within active list items
+@list-group-active-text-color:  lighten(@list-group-active-bg, 40%);
+
+//** Text color of disabled list items
+@list-group-disabled-color:      @gray-light;
+//** Background color of disabled list items
+@list-group-disabled-bg:         @gray-lighter;
+//** Text color for content within disabled list items
+@list-group-disabled-text-color: @list-group-disabled-color;
+
+@list-group-link-color:         #555;
+@list-group-link-hover-color:   @list-group-link-color;
+@list-group-link-heading-color: #333;
+
+
+//== Panels
+//
+//##
+
+@panel-bg:                    #fff;
+@panel-body-padding:          15px;
+@panel-heading-padding:       10px 15px;
+@panel-footer-padding:        @panel-heading-padding;
+@panel-border-radius:         @border-radius-base;
+
+//** Border color for elements within panels
+@panel-inner-border:          #ddd;
+@panel-footer-bg:             #f5f5f5;
+
+@panel-default-text:          @gray-dark;
+@panel-default-border:        #ddd;
+@panel-default-heading-bg:    #f5f5f5;
+
+@panel-primary-text:          #fff;
+@panel-primary-border:        @brand-primary;
+@panel-primary-heading-bg:    @brand-primary;
+
+@panel-success-text:          @state-success-text;
+@panel-success-border:        @state-success-border;
+@panel-success-heading-bg:    @state-success-bg;
+
+@panel-info-text:             @state-info-text;
+@panel-info-border:           @state-info-border;
+@panel-info-heading-bg:       @state-info-bg;
+
+@panel-warning-text:          @state-warning-text;
+@panel-warning-border:        @state-warning-border;
+@panel-warning-heading-bg:    @state-warning-bg;
+
+@panel-danger-text:           @state-danger-text;
+@panel-danger-border:         @state-danger-border;
+@panel-danger-heading-bg:     @state-danger-bg;
+
+
+//== Thumbnails
+//
+//##
+
+//** Padding around the thumbnail image
+@thumbnail-padding:           4px;
+//** Thumbnail background color
+@thumbnail-bg:                @body-bg;
+//** Thumbnail border color
+@thumbnail-border:            @gray-lighter;
+//** Thumbnail border radius
+@thumbnail-border-radius:     @border-radius-base;
+
+//** Custom text color for thumbnail captions
+@thumbnail-caption-color:     @text-color;
+//** Padding around the thumbnail caption
+@thumbnail-caption-padding:   9px;
+
+
+//== Wells
+//
+//##
+
+@well-bg:                     @gray-lighter;
+@well-border:                 transparent;
+
+
+//== Badges
+//
+//##
+
+@badge-color:                 #fff;
+//** Linked badge text color on hover
+@badge-link-hover-color:      #fff;
+@badge-bg:                    @brand-primary;
+
+//** Badge text color in active nav link
+@badge-active-color:          @brand-primary;
+//** Badge background color in active nav link
+@badge-active-bg:             #fff;
+
+@badge-font-weight:           bold;
+@badge-line-height:           1;
+@badge-border-radius:         10px;
+
+
+//== Breadcrumbs
+//
+//##
+
+@breadcrumb-padding-vertical:   8px;
+@breadcrumb-padding-horizontal: 15px;
+//** Breadcrumb background color
+@breadcrumb-bg:                 @gray-lighter;
+//** Breadcrumb text color
+@breadcrumb-color:              #ccc;
+//** Text color of current page in the breadcrumb
+@breadcrumb-active-color:       @gray;
+//** Textual separator for between breadcrumb elements
+@breadcrumb-separator:          "/";
+
+
+//== Carousel
+//
+//##
+
+@carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6);
+
+@carousel-control-color:                      #fff;
+@carousel-control-width:                      15%;
+@carousel-control-opacity:                    .5;
+@carousel-control-font-size:                  20px;
+
+@carousel-indicator-active-bg:                #fff;
+@carousel-indicator-border-color:             #fff;
+
+@carousel-caption-color:                      #fff;
+
+
+//== Close
+//
+//##
+
+@close-font-weight:           bold;
+@close-color:                 #000;
+@close-text-shadow:           none;
+
+
+//== Code
+//
+//##
+
+@code-color:                  #c7254e;
+@code-bg:                     #f9f2f4;
+
+@kbd-color:                   #fff;
+@kbd-bg:                      #333;
+
+@pre-bg:                      @gray-lighter;
+@pre-color:                   @gray-dark;
+@pre-border-color:            #ccc;
+@pre-scrollable-max-height:   340px;
+
+
+//== Type
+//
+//##
+
+//** Text muted color
+@text-muted:                  @gray-light;
+//** Abbreviations and acronyms border color
+@abbr-border-color:           @gray-light;
+//** Headings small color
+@headings-small-color:        @gray-light;
+//** Blockquote small color
+@blockquote-small-color:      @gray-light;
+//** Blockquote font size
+@blockquote-font-size:        (@font-size-base * 1.25);
+//** Blockquote border color
+@blockquote-border-color:     @gray-lighter;
+//** Page header border color
+@page-header-border-color:    transparent;
+
+
+//== Miscellaneous
+//
+//##
+
+//** Horizontal line color.
+@hr-border:                   @gray-lighter;
+
+//** Horizontal offset for forms and lists.
+@component-offset-horizontal: 180px;
+
+@loading-opacity:             0.5;
diff --git a/src/ui/public/styles/variables/for-theme.less b/src/ui/public/styles/variables/for-theme.less
new file mode 100644
index 0000000000000..33bb76e8ab2da
--- /dev/null
+++ b/src/ui/public/styles/variables/for-theme.less
@@ -0,0 +1,20 @@
+@font-size-smaller: ceil((@font-size-base * 0.75));
+@input-border-width: 2px;
+
+@sidebar-color: @text-color;
+@sidebar-bg: @well-bg;
+@sidebar-border: @well-border;
+@sidebar-header-color: @brand-primary;
+@sidebar-item-font-size: @font-size-small;
+
+@sidebar-hover-color: @sidebar-color;
+@sidebar-hover-bg: darken(@sidebar-bg, 10%);
+
+@sidebar-active-color: @component-active-color;
+@sidebar-active-bg: @component-active-bg;
+@sidebar-active-hover-bg: @component-active-bg;
+@sidebar-active-hover-color: @component-active-color;
+
+@action-add: desaturate(@btn-success-bg, 30%);
+@action-remove: desaturate(@btn-danger-bg, 30%);
+
diff --git a/src/kibana/components/template_vis_type/TemplateRenderbot.js b/src/ui/public/template_vis_type/TemplateRenderbot.js
similarity index 91%
rename from src/kibana/components/template_vis_type/TemplateRenderbot.js
rename to src/ui/public/template_vis_type/TemplateRenderbot.js
index a2c586aca7bce..104036a37d696 100644
--- a/src/kibana/components/template_vis_type/TemplateRenderbot.js
+++ b/src/ui/public/template_vis_type/TemplateRenderbot.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function TemplateRenderbotFactory(Private, $compile, $rootScope) {
     var _ = require('lodash');
-    var Renderbot = Private(require('components/vis/Renderbot'));
+    var Renderbot = Private(require('ui/Vis/Renderbot'));
 
     _.class(TemplateRenderbot).inherits(Renderbot);
     function TemplateRenderbot(vis, $el) {
diff --git a/src/kibana/components/template_vis_type/TemplateVisType.js b/src/ui/public/template_vis_type/TemplateVisType.js
similarity index 77%
rename from src/kibana/components/template_vis_type/TemplateVisType.js
rename to src/ui/public/template_vis_type/TemplateVisType.js
index caaff435389fe..d4419d2eba969 100644
--- a/src/kibana/components/template_vis_type/TemplateVisType.js
+++ b/src/ui/public/template_vis_type/TemplateVisType.js
@@ -1,8 +1,8 @@
 define(function (require) {
   return function TemplateVisTypeFactory(Private) {
     var _ = require('lodash');
-    var VisType = Private(require('components/vis/VisType'));
-    var TemplateRenderbot = Private(require('components/template_vis_type/TemplateRenderbot'));
+    var VisType = Private(require('ui/Vis/VisType'));
+    var TemplateRenderbot = Private(require('ui/template_vis_type/TemplateRenderbot'));
 
     _.class(TemplateVisType).inherits(VisType);
     function TemplateVisType(opts) {
diff --git a/src/ui/public/testHarness/testHarness.js b/src/ui/public/testHarness/testHarness.js
new file mode 100644
index 0000000000000..71d184f69d085
--- /dev/null
+++ b/src/ui/public/testHarness/testHarness.js
@@ -0,0 +1,62 @@
+/* global mocha */
+var Nonsense = require('Nonsense');
+var sinon = require('sinon');
+var $ = require('jquery');
+var _ = require('lodash');
+var parse = require('url').parse;
+
+var StackTraceMapper = require('ui/StackTraceMapper');
+var chrome = require('ui/chrome');
+
+
+/*** the vislib tests have certain style requirements, so lets make sure they are met ***/
+$('body').attr('id', 'test-harness-body'); // so we can make high priority selectors
+require('./testHarness.less');
+
+
+/*** Setup seeded random ***/
+var seedInput = parse(window.location.href, true).query.seed;
+var seed = _.add(seedInput, 0) || Date.now();
+Math.random = _.bindKey(new Nonsense(seed), 'frac');
+Math.random.nonsense = new Nonsense(seed);
+console.log('Random-ness seed: ' + seed);
+
+
+/*** Setup auto releasing stubs and spys ***/
+require('auto-release-sinon').setupAutoRelease(sinon, window.afterEach);
+
+
+/*** Make sure that angular-mocks gets setup in the global suite **/
+require('ngMock');
+
+
+/*** manually map error stack traces using the sourcemap ***/
+before(function () {
+  // before the tests start, load the sourcemap and hook into error generation for the mocha reporter
+  this.timeout(30000);
+
+  var mapper;
+  var Runner = window.Mocha.Runner;
+
+  Runner.prototype.emit = _.wrap(Runner.prototype.emit, function (emit, event, test, err) {
+    if (err && mapper) err = mapper.mapError(err);
+    return emit.call(this, event, test, err);
+  });
+
+  return StackTraceMapper.getInstance({
+    '/bundles/tests.bundle.js': '/bundles/tests.bundle.js.map'
+  }).then(function (instance) {
+    mapper = instance;
+  });
+});
+
+
+before(function () {
+  sinon.useFakeXMLHttpRequest();
+});
+
+
+/*** Kick off mocha, called at the end of test entry files ***/
+exports.bootstrap = function () {
+  chrome.setupAngular();
+};
diff --git a/src/ui/public/testHarness/testHarness.less b/src/ui/public/testHarness/testHarness.less
new file mode 100644
index 0000000000000..cf7566de61bde
--- /dev/null
+++ b/src/ui/public/testHarness/testHarness.less
@@ -0,0 +1,26 @@
+body#test-harness-body {
+  // now that tests include the kibana styles, we have
+  // to override the body { display: flex; } rule as it
+  // prevents the visualizations from properly testing
+  // their sizing
+  display: block;
+
+  #mocha-stats .progress {
+    // bootstrap thinks it is the only one who will use ".progress"
+    height: auto;
+    background-color: transparent;
+    overflow: auto;
+    border-radius: 0;
+  }
+
+
+  #vislib-vis-fixtures {
+    height: 500px;
+    width: 1024px;
+    display: flex;
+    position: fixed;
+    top: 0;
+    left: 0;
+    overflow: hidden;
+  }
+}
diff --git a/src/kibana/components/time_buckets/calc_auto_interval.js b/src/ui/public/time_buckets/calc_auto_interval.js
similarity index 100%
rename from src/kibana/components/time_buckets/calc_auto_interval.js
rename to src/ui/public/time_buckets/calc_auto_interval.js
diff --git a/src/kibana/components/time_buckets/calc_es_interval.js b/src/ui/public/time_buckets/calc_es_interval.js
similarity index 92%
rename from src/kibana/components/time_buckets/calc_es_interval.js
rename to src/ui/public/time_buckets/calc_es_interval.js
index 9de279cb85c39..5f19f05d4da5b 100644
--- a/src/kibana/components/time_buckets/calc_es_interval.js
+++ b/src/ui/public/time_buckets/calc_es_interval.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function () {
     var moment = require('moment');
-    var datemath = require('utils/datemath');
+    var dateMath = require('ui/utils/dateMath');
 
-    var unitsDesc = datemath.unitsDesc;
+    var unitsDesc = dateMath.unitsDesc;
     var largeMax = unitsDesc.indexOf('M');
 
     /**
@@ -47,4 +47,4 @@ define(function (require) {
 
     return esDuration;
   };
-});
\ No newline at end of file
+});
diff --git a/src/kibana/components/time_buckets/time_buckets.js b/src/ui/public/time_buckets/time_buckets.js
similarity index 96%
rename from src/kibana/components/time_buckets/time_buckets.js
rename to src/ui/public/time_buckets/time_buckets.js
index 7f8d458e3667c..dba8bd6d58388 100644
--- a/src/kibana/components/time_buckets/time_buckets.js
+++ b/src/ui/public/time_buckets/time_buckets.js
@@ -3,10 +3,10 @@ define(function (require) {
     var _ = require('lodash');
     var moment = require('moment');
 
-    var datemath = require('utils/datemath');
-    var parseInterval = require('utils/parse_interval');
-    var calcAuto = Private(require('components/time_buckets/calc_auto_interval'));
-    var calcEsInterval = Private(require('components/time_buckets/calc_es_interval'));
+    var dateMath = require('ui/utils/dateMath');
+    var parseInterval = require('ui/utils/parse_interval');
+    var calcAuto = Private(require('ui/time_buckets/calc_auto_interval'));
+    var calcEsInterval = Private(require('ui/time_buckets/calc_es_interval'));
     var tzOffset = moment().format('Z');
 
     function isValidMoment(m) {
@@ -124,7 +124,7 @@ define(function (require) {
      * generated.
      *
      * Input can be one of the following:
-     *  - Any object from src/kibana/components/agg_types/buckets/_interval_options.js
+     *  - Any object from src/ui/agg_types/buckets/_interval_options.js
      *  - "auto"
      *  - Pass a valid moment unit
      *  - a moment.duration object.
diff --git a/src/ui/public/timefilter/__tests__/diff_interval.js b/src/ui/public/timefilter/__tests__/diff_interval.js
new file mode 100644
index 0000000000000..b493bcf5227b7
--- /dev/null
+++ b/src/ui/public/timefilter/__tests__/diff_interval.js
@@ -0,0 +1,77 @@
+
+var sinon = require('auto-release-sinon');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+describe('Timefilter service', function () {
+  describe('Refresh interval diff watcher', function () {
+
+    var fn, update, fetch, timefilter;
+    beforeEach(ngMock.module('kibana'));
+
+    beforeEach(ngMock.inject(function (Private) {
+      update = sinon.spy();
+      fetch = sinon.spy();
+      timefilter = {
+        refreshInterval: {
+          pause: false,
+          value: 0
+        },
+        emit: function (eventType) {
+          if (eventType === 'update') update();
+          if (eventType === 'fetch') fetch();
+        }
+      };
+
+      fn = Private(require('ui/timefilter/lib/diff_interval'))(timefilter);
+    }));
+
+    it('not emit anything if nothing has changed', function () {
+      timefilter.refreshInterval = {pause: false, value: 0};
+      fn();
+      expect(update.called).to.be(false);
+      expect(fetch.called).to.be(false);
+    });
+
+    it('emit only an update when paused', function () {
+      timefilter.refreshInterval = {pause: true, value: 5000};
+      fn();
+      expect(update.called).to.be(true);
+      expect(fetch.called).to.be(false);
+    });
+
+    it('emit update, not fetch, when switching to value: 0', function () {
+      timefilter.refreshInterval = {pause: false, value: 5000};
+      fn();
+      expect(update.calledOnce).to.be(true);
+      expect(fetch.calledOnce).to.be(true);
+      timefilter.refreshInterval = {pause: false, value: 0};
+      fn();
+      expect(update.calledTwice).to.be(true);
+      expect(fetch.calledTwice).to.be(false);
+    });
+
+    it('should emit update, not fetch, when moving from unpaused to paused', function () {
+      timefilter.refreshInterval = {pause: false, value: 5000};
+      fn();
+      expect(update.calledOnce).to.be(true);
+      expect(fetch.calledOnce).to.be(true);
+      timefilter.refreshInterval = {pause: true, value: 5000};
+      fn();
+      expect(update.calledTwice).to.be(true);
+      expect(fetch.calledTwice).to.be(false);
+    });
+
+    it('should emit update and fetch when unpaused', function () {
+      timefilter.refreshInterval = {pause: true, value: 5000};
+      fn();
+      expect(update.calledOnce).to.be(true);
+      expect(fetch.calledOnce).to.be(false);
+      timefilter.refreshInterval = {pause: false, value: 5000};
+      fn();
+      expect(update.calledTwice).to.be(true);
+      expect(fetch.calledOnce).to.be(true);
+    });
+
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/timefilter/__tests__/diff_time.js b/src/ui/public/timefilter/__tests__/diff_time.js
new file mode 100644
index 0000000000000..ea15d8610789f
--- /dev/null
+++ b/src/ui/public/timefilter/__tests__/diff_time.js
@@ -0,0 +1,44 @@
+
+var sinon = require('auto-release-sinon');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+describe('Timefilter service', function () {
+  describe('time diff watcher', function () {
+
+    var fn, update, fetch, timefilter;
+    beforeEach(ngMock.module('kibana'));
+
+    beforeEach(ngMock.inject(function (Private) {
+      update = sinon.spy();
+      fetch = sinon.spy();
+      timefilter = {
+        time: {
+          from: 0,
+          to: 1
+        },
+        emit: function (eventType) {
+          if (eventType === 'update') update();
+          if (eventType === 'fetch') fetch();
+        }
+      };
+
+      fn = Private(require('ui/timefilter/lib/diff_time'))(timefilter);
+    }));
+
+    it('not emit anything if the time has not changed', function () {
+      timefilter.time = {from: 0, to: 1};
+      fn();
+      expect(update.called).to.be(false);
+      expect(fetch.called).to.be(false);
+    });
+
+    it('emit update and fetch if the time has changed', function () {
+      timefilter.time = {from: 5, to: 10};
+      fn();
+      expect(update.called).to.be(true);
+      expect(fetch.called).to.be(true);
+    });
+
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/timefilter/lib/diff_interval.js b/src/ui/public/timefilter/lib/diff_interval.js
new file mode 100644
index 0000000000000..f345066d7a4a3
--- /dev/null
+++ b/src/ui/public/timefilter/lib/diff_interval.js
@@ -0,0 +1,21 @@
+define(function (require) {
+  var _ = require('lodash');
+  return function diffTimeProvider(Private) {
+    var diff = Private(require('ui/utils/diff_time_picker_vals'));
+
+    return function (self) {
+      var oldRefreshInterval = _.clone(self.refreshInterval);
+
+      return function () {
+        if (diff(self.refreshInterval, oldRefreshInterval)) {
+          self.emit('update');
+          if (!self.refreshInterval.pause && self.refreshInterval.value !== 0) {
+            self.emit('fetch');
+          }
+        }
+
+        oldRefreshInterval = _.clone(self.refreshInterval);
+      };
+    };
+  };
+});
diff --git a/src/ui/public/timefilter/lib/diff_time.js b/src/ui/public/timefilter/lib/diff_time.js
new file mode 100644
index 0000000000000..daf66f417d177
--- /dev/null
+++ b/src/ui/public/timefilter/lib/diff_time.js
@@ -0,0 +1,17 @@
+define(function (require) {
+  var _ = require('lodash');
+  return function diffTimeProvider(Private) {
+    var diff = Private(require('ui/utils/diff_time_picker_vals'));
+
+    return function (self) {
+        var oldTime = _.clone(self.time);
+        return function () {
+          if (diff(self.time, oldTime)) {
+            self.emit('update');
+            self.emit('fetch');
+          }
+          oldTime = _.clone(self.time);
+        };
+      };
+  };
+});
diff --git a/src/kibana/components/timefilter/timefilter.js b/src/ui/public/timefilter/timefilter.js
similarity index 83%
rename from src/kibana/components/timefilter/timefilter.js
rename to src/ui/public/timefilter/timefilter.js
index 6ef890c995dba..cb6adc9115804 100644
--- a/src/kibana/components/timefilter/timefilter.js
+++ b/src/ui/public/timefilter/timefilter.js
@@ -1,16 +1,16 @@
   define(function (require) {
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .service('timefilter', function (Private, globalState, $rootScope, config) {
 
     var _ = require('lodash');
     var angular = require('angular');
     var moment = require('moment');
-    var datemath = require('utils/datemath');
-    var Events = Private(require('factories/events'));
-    var diff = Private(require('utils/diff_time_picker_vals'));
+    var dateMath = require('ui/utils/dateMath');
+    var Events = Private(require('ui/events'));
+    var diff = Private(require('ui/utils/diff_time_picker_vals'));
 
-    require('components/state_management/global_state');
+    require('ui/state_management/global_state');
 
     function convertISO8601(stringTime) {
       var obj = moment(stringTime, 'YYYY-MM-DDTHH:mm:ss.SSSZ', true);
@@ -22,8 +22,8 @@
       Timefilter.Super.call(this);
 
       var self = this;
-      var diffTime = Private(require('components/timefilter/lib/diff_time'))(self);
-      var diffInterval = Private(require('components/timefilter/lib/diff_interval'))(self);
+      var diffTime = Private(require('ui/timefilter/lib/diff_time'))(self);
+      var diffInterval = Private(require('ui/timefilter/lib/diff_interval'))(self);
 
       self.enabled = false;
 
@@ -89,8 +89,8 @@
 
     Timefilter.prototype.getBounds = function (timefield) {
       return {
-        min: datemath.parse(this.time.from),
-        max: datemath.parse(this.time.to, true)
+        min: dateMath.parse(this.time.from),
+        max: dateMath.parse(this.time.to, true)
       };
     };
 
diff --git a/src/kibana/components/timepicker/quick_ranges.js b/src/ui/public/timepicker/quick_ranges.js
similarity index 97%
rename from src/kibana/components/timepicker/quick_ranges.js
rename to src/ui/public/timepicker/quick_ranges.js
index 9e1f0641996bc..d9c57ebeb5fb6 100644
--- a/src/kibana/components/timepicker/quick_ranges.js
+++ b/src/ui/public/timepicker/quick_ranges.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
 
   module.constant('quickRanges', [
     { from: 'now/d',    to: 'now/d',    display: 'Today',                 section: 0 },
diff --git a/src/kibana/components/timepicker/refresh_intervals.js b/src/ui/public/timepicker/refresh_intervals.js
similarity index 93%
rename from src/kibana/components/timepicker/refresh_intervals.js
rename to src/ui/public/timepicker/refresh_intervals.js
index dd40a6388d91d..baf4ec0d4fbd6 100644
--- a/src/kibana/components/timepicker/refresh_intervals.js
+++ b/src/ui/public/timepicker/refresh_intervals.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
 
   module.constant('refreshIntervals', [
     { value : 0, display: 'Off', section: 0},
diff --git a/src/kibana/components/timepicker/time_units.js b/src/ui/public/timepicker/time_units.js
similarity index 77%
rename from src/kibana/components/timepicker/time_units.js
rename to src/ui/public/timepicker/time_units.js
index bd4390309e85f..0d6cce14b0eb1 100644
--- a/src/kibana/components/timepicker/time_units.js
+++ b/src/ui/public/timepicker/time_units.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('modules').get('kibana');
+  var module = require('ui/modules').get('kibana');
 
   module.constant('timeUnits', {
     s: 'second',
diff --git a/src/kibana/components/timepicker/timepicker.html b/src/ui/public/timepicker/timepicker.html
similarity index 100%
rename from src/kibana/components/timepicker/timepicker.html
rename to src/ui/public/timepicker/timepicker.html
diff --git a/src/ui/public/timepicker/timepicker.js b/src/ui/public/timepicker/timepicker.js
new file mode 100644
index 0000000000000..750bb87748a97
--- /dev/null
+++ b/src/ui/public/timepicker/timepicker.js
@@ -0,0 +1,156 @@
+define(function (require) {
+  var html = require('ui/timepicker/timepicker.html');
+  var module = require('ui/modules').get('ui/timepicker');
+  var _ = require('lodash');
+  var dateMath = require('ui/utils/dateMath');
+  var moment = require('moment');
+
+  require('ui/directives/input_datetime');
+  require('ui/directives/inequality');
+  require('ui/timepicker/quick_ranges');
+  require('ui/timepicker/refresh_intervals');
+  require('ui/timepicker/time_units');
+
+  module.directive('kbnTimepicker', function (quickRanges, timeUnits, refreshIntervals) {
+    return {
+      restrict: 'E',
+      scope: {
+        from: '=',
+        to: '=',
+        mode: '=',
+        interval: '=',
+        activeTab: '='
+      },
+      template: html,
+      controller: function ($scope) {
+        var init = function () {
+          $scope.setMode($scope.mode);
+        };
+
+        $scope.format = 'MMMM Do YYYY, HH:mm:ss.SSS';
+        $scope.modes = ['quick', 'relative', 'absolute'];
+        $scope.activeTab = $scope.activeTab || 'filter';
+
+        if (_.isUndefined($scope.mode)) $scope.mode = 'quick';
+
+        $scope.quickLists = _(quickRanges).groupBy('section').values().value();
+        $scope.refreshLists = _(refreshIntervals).groupBy('section').values().value();
+
+        $scope.relative = {
+          count: 1,
+          unit: 'm',
+          preview: undefined,
+          round: false
+        };
+
+        $scope.absolute = {
+          from: moment(),
+          to: moment()
+        };
+
+        $scope.units = timeUnits;
+
+        $scope.relativeOptions = [
+          {text: 'Seconds ago', value: 's'},
+          {text: 'Minutes ago', value: 'm'},
+          {text: 'Hours ago', value: 'h'},
+          {text: 'Days ago', value: 'd'},
+          {text: 'Weeks ago', value: 'w'},
+          {text: 'Months ago', value: 'M'},
+          {text: 'Years ago', value: 'y'},
+        ];
+
+        $scope.$watch('absolute.from', function (date) {
+          if (_.isDate(date)) $scope.absolute.from = moment(date);
+        });
+
+        $scope.$watch('absolute.to', function (date) {
+          if (_.isDate(date)) $scope.absolute.to = moment(date);
+        });
+
+        $scope.setMode = function (thisMode) {
+          switch (thisMode) {
+          case 'quick':
+            break;
+          case 'relative':
+            var fromParts = $scope.from.toString().split('-');
+            var relativeParts = [];
+
+            // Try to parse the relative time, if we can't use moment duration to guestimate
+            if ($scope.to.toString() === 'now' && fromParts[0] === 'now' && fromParts[1]) {
+              relativeParts = fromParts[1].match(/([0-9]+)([smhdwMy]).*/);
+            }
+            if (relativeParts[1] && relativeParts[2]) {
+              $scope.relative.count = parseInt(relativeParts[1], 10);
+              $scope.relative.unit = relativeParts[2];
+            } else {
+              var duration = moment.duration(moment().diff(dateMath.parse($scope.from)));
+              var units = _.pluck(_.clone($scope.relativeOptions).reverse(), 'value');
+              if ($scope.from.toString().split('/')[1]) $scope.relative.round = true;
+              for (var i = 0; i < units.length; i++) {
+                var as = duration.as(units[i]);
+                if (as > 1) {
+                  $scope.relative.count = Math.round(as);
+                  $scope.relative.unit = units[i];
+                  break;
+                }
+              }
+            }
+
+            if ($scope.from.toString().split('/')[1]) $scope.relative.round = true;
+            $scope.formatRelative();
+
+            break;
+          case 'absolute':
+            $scope.absolute.from = dateMath.parse($scope.from || moment().subtract('minutes', 15));
+            $scope.absolute.to = dateMath.parse($scope.to || moment(), true);
+            break;
+          }
+
+          $scope.mode = thisMode;
+        };
+
+        $scope.setQuick = function (from, to, description) {
+          $scope.from = from;
+          $scope.to = to;
+        };
+
+        $scope.setToNow = function () {
+          $scope.absolute.to = moment();
+        };
+
+        $scope.formatRelative = function () {
+          var parsed = dateMath.parse(getRelativeString());
+          $scope.relative.preview =  parsed ? parsed.format($scope.format) : undefined;
+          return parsed;
+        };
+
+        $scope.applyRelative = function () {
+          $scope.from = getRelativeString();
+          $scope.to = 'now';
+        };
+
+        var getRelativeString = function () {
+          return 'now-' + $scope.relative.count + $scope.relative.unit + ($scope.relative.round ? '/' + $scope.relative.unit : '');
+        };
+
+        $scope.applyAbsolute = function () {
+          $scope.from = moment($scope.absolute.from);
+          $scope.to = moment($scope.absolute.to);
+        };
+
+        $scope.setRefreshInterval = function (interval) {
+          interval = _.clone(interval);
+          console.log('before: ' + interval.pause);
+          interval.pause = (interval.pause == null || interval.pause === false) ? false : true;
+
+          console.log('after: ' + interval.pause);
+          $scope.interval = interval;
+        };
+
+        init();
+      }
+    };
+  });
+
+});
diff --git a/src/kibana/components/tooltip/tooltip.html b/src/ui/public/tooltip/tooltip.html
similarity index 100%
rename from src/kibana/components/tooltip/tooltip.html
rename to src/ui/public/tooltip/tooltip.html
diff --git a/src/ui/public/tooltip/tooltip.js b/src/ui/public/tooltip/tooltip.js
new file mode 100644
index 0000000000000..058239f396fec
--- /dev/null
+++ b/src/ui/public/tooltip/tooltip.js
@@ -0,0 +1,28 @@
+define(function (require) {
+  var html = require('ui/tooltip/tooltip.html');
+
+  require('ui-bootstrap')
+  .config(function ($tooltipProvider) {
+    $tooltipProvider.options({
+      placement: 'bottom',
+      animation: true,
+      popupDelay: 150,
+      appendToBody: false
+    });
+  })
+  .directive('kbnTooltip', function () {
+    return {
+      restrict: 'E',
+      template: html,
+      transclude: true,
+      replace: true,
+      scope: true,
+      link: function ($scope, $el, attr) {
+        $scope.text = attr.text;
+        $scope.placement = attr.placement || 'top';
+        $scope.delay = attr.delay || 400;
+        $scope.appendToBody = attr.appendToBody || 0;
+      }
+    };
+  });
+});
diff --git a/src/kibana/components/typeahead/_input.js b/src/ui/public/typeahead/_input.js
similarity index 91%
rename from src/kibana/components/typeahead/_input.js
rename to src/ui/public/typeahead/_input.js
index 8d2761fc84f24..809893c6481a2 100644
--- a/src/kibana/components/typeahead/_input.js
+++ b/src/ui/public/typeahead/_input.js
@@ -1,8 +1,8 @@
 define(function (require) {
   var _ = require('lodash');
-  var typeahead = require('modules').get('kibana/typeahead');
+  var typeahead = require('ui/modules').get('kibana/typeahead');
 
-  require('components/notify/directives');
+  require('ui/notify/directives');
 
   typeahead.directive('kbnTypeaheadInput', function ($rootScope) {
 
diff --git a/src/ui/public/typeahead/_items.js b/src/ui/public/typeahead/_items.js
new file mode 100644
index 0000000000000..1445fe344fdd0
--- /dev/null
+++ b/src/ui/public/typeahead/_items.js
@@ -0,0 +1,20 @@
+define(function (require) {
+  var _ = require('lodash');
+  var typeahead = require('ui/modules').get('kibana/typeahead');
+  var listTemplate = require('ui/typeahead/partials/typeahead-items.html');
+
+  require('ui/notify/directives');
+
+  typeahead.directive('kbnTypeaheadItems', function () {
+    return {
+      restrict: 'E',
+      require: '^kbnTypeahead',
+      replace: true,
+      template: listTemplate,
+
+      link: function ($scope, $el, attr, typeaheadCtrl) {
+        $scope.typeahead = typeaheadCtrl;
+      }
+    };
+  });
+});
diff --git a/src/kibana/components/typeahead/partials/typeahead-items.html b/src/ui/public/typeahead/partials/typeahead-items.html
similarity index 100%
rename from src/kibana/components/typeahead/partials/typeahead-items.html
rename to src/ui/public/typeahead/partials/typeahead-items.html
diff --git a/src/ui/public/typeahead/typeahead.js b/src/ui/public/typeahead/typeahead.js
new file mode 100644
index 0000000000000..48c65279ab8ec
--- /dev/null
+++ b/src/ui/public/typeahead/typeahead.js
@@ -0,0 +1,241 @@
+define(function (require) {
+  var _ = require('lodash');
+  var typeahead = require('ui/modules').get('kibana/typeahead');
+
+  require('ui/typeahead/typeahead.less');
+  require('ui/typeahead/_input');
+  require('ui/typeahead/_items');
+
+  typeahead.directive('kbnTypeahead', function () {
+    var keyMap = {
+      ESC: 27,
+      UP: 38,
+      DOWN: 40,
+      TAB: 9,
+      ENTER: 13
+    };
+
+    return {
+      restrict: 'A',
+      scope: {
+        historyKey: '@kbnTypeahead'
+      },
+      controllerAs: 'typeahead',
+
+      controller: function ($scope, $element, $timeout, PersistedLog, config) {
+        var self = this;
+        self.form = $element.closest('form');
+        self.query = '';
+        self.hidden = true;
+        self.focused = false;
+        self.mousedOver = false;
+
+        // instantiate history and add items to the scope
+        self.history = new PersistedLog('typeahead:' + $scope.historyKey, {
+          maxLength: config.get('history:limit'),
+          filterDuplicates: true
+        });
+
+        $scope.items = self.history.get();
+        $scope.filteredItems = [];
+
+        self.setInputModel = function (model) {
+          $scope.inputModel = model;
+
+          // watch for changes to the query parameter, delegate to typeaheadCtrl
+          $scope.$watch('inputModel.$viewValue', self.filterItemsByQuery);
+        };
+
+        self.setHidden = function (hidden) {
+          self.hidden = !!(hidden);
+        };
+
+        self.setFocused = function (focused) {
+          self.focused = !!(focused);
+        };
+
+        self.setMouseover = function (mousedOver) {
+          self.mousedOver = !!(mousedOver);
+        };
+
+        // activation methods
+        self.activateItem = function (item) {
+          self.active = item;
+        };
+
+        self.getActiveIndex = function () {
+          if (!self.active) {
+            return;
+          }
+
+          return $scope.filteredItems.indexOf(self.active);
+        };
+
+        self.getItems = function () {
+          return $scope.filteredItems;
+        };
+
+        self.activateNext = function () {
+          var index = self.getActiveIndex();
+          if (index == null) {
+            index = 0;
+          } else if (index < $scope.filteredItems.length - 1) {
+            ++index;
+          }
+
+          self.activateItem($scope.filteredItems[index]);
+        };
+
+        self.activatePrev = function () {
+          var index = self.getActiveIndex();
+
+          if (index > 0 && index != null) {
+            --index;
+          } else if (index === 0) {
+            self.active = false;
+            return;
+          }
+
+          self.activateItem($scope.filteredItems[index]);
+        };
+
+        self.isActive = function (item) {
+          return item === self.active;
+        };
+
+        // selection methods
+        self.selectItem = function (item, ev) {
+          self.hidden = true;
+          self.active = false;
+          $scope.inputModel.$setViewValue(item);
+          $scope.inputModel.$render();
+          self.persistEntry();
+
+          if (ev && ev.type === 'click') {
+            $timeout(function () {
+              self.submitForm();
+            });
+          }
+        };
+
+        self.submitForm = function () {
+          if (self.form.length) {
+            self.form.submit();
+          }
+        };
+
+        self.persistEntry = function () {
+          if ($scope.inputModel.$viewValue.length) {
+            // push selection into the history
+            $scope.items = self.history.add($scope.inputModel.$viewValue);
+          }
+        };
+
+        self.selectActive = function () {
+          if (self.active) {
+            self.selectItem(self.active);
+          }
+        };
+
+        self.keypressHandler = function (ev) {
+          var keyCode = ev.which || ev.keyCode;
+
+          if (self.focused) {
+            self.hidden = false;
+          }
+
+          // hide on escape
+          if (_.contains([keyMap.ESC], keyCode)) {
+            self.hidden = true;
+            self.active = false;
+          }
+
+          // change selection with arrow up/down
+          // on down key, attempt to load all items if none are loaded
+          if (_.contains([keyMap.DOWN], keyCode) && $scope.filteredItems.length === 0) {
+            $scope.filteredItems = $scope.items;
+            $scope.$digest();
+          } else if (_.contains([keyMap.UP, keyMap.DOWN], keyCode)) {
+            if (self.isVisible() && $scope.filteredItems.length) {
+              ev.preventDefault();
+
+              if (keyCode === keyMap.DOWN) {
+                self.activateNext();
+              } else {
+                self.activatePrev();
+              }
+            }
+          }
+
+          // persist selection on enter, when not selecting from the list
+          if (_.contains([keyMap.ENTER], keyCode)) {
+            if (!self.active) {
+              self.persistEntry();
+            }
+          }
+
+          // select on enter or tab
+          if (_.contains([keyMap.ENTER, keyMap.TAB], keyCode)) {
+            self.selectActive();
+            self.hidden = true;
+          }
+        };
+
+        self.filterItemsByQuery = function (query) {
+          // cache query so we can call it again if needed
+          if (query) {
+            self.query = query;
+          }
+
+          // if the query is empty, clear the list items
+          if (!self.query.length) {
+            $scope.filteredItems = [];
+            return;
+          }
+
+          // update the filteredItems using the query
+          var beginningMatches = $scope.items.filter(function (item) {
+            return item.indexOf(query) === 0;
+          });
+
+          var otherMatches = $scope.items.filter(function (item) {
+            return item.indexOf(query) > 0;
+          });
+
+          $scope.filteredItems = beginningMatches.concat(otherMatches);
+        };
+
+        self.isVisible = function () {
+          return !self.hidden && ($scope.filteredItems.length > 0) && (self.focused || self.mousedOver);
+        };
+
+        // handle updates to parent scope history
+        $scope.$watch('items', function (items) {
+          if (self.query) {
+            self.filterItemsByQuery(self.query);
+          }
+        });
+
+        // watch for changes to the filtered item list
+        $scope.$watch('filteredItems', function (filteredItems) {
+
+          // if list is empty, or active item is missing, unset active item
+          if (!filteredItems.length || !_.contains(filteredItems, self.active)) {
+            self.active = false;
+          }
+        });
+      },
+
+      link: function ($scope, $el, attr) {
+        // should be defined via setInput() method
+        if (!$scope.inputModel) {
+          throw new Error('kbn-typeahead-input must be defined');
+        }
+
+        $scope.$watch('typeahead.isVisible()', function (vis) {
+          $el.toggleClass('visible', vis);
+        });
+      }
+    };
+  });
+});
diff --git a/src/kibana/components/typeahead/typeahead.less b/src/ui/public/typeahead/typeahead.less
similarity index 82%
rename from src/kibana/components/typeahead/typeahead.less
rename to src/ui/public/typeahead/typeahead.less
index c5c7a2644a33d..88c13a80aba9f 100644
--- a/src/kibana/components/typeahead/typeahead.less
+++ b/src/ui/public/typeahead/typeahead.less
@@ -1,6 +1,5 @@
-@import (reference) "../../styles/_bootstrap.less";
-@import (reference) "../../styles/theme/_theme.less";
-@import (reference) "../../styles/_variables.less";
+@import (reference) "~ui/styles/variables";
+@import (reference) "~ui/styles/mixins";
 
 .typeahead {
   position: relative;
diff --git a/src/ui/public/url/__tests__/url.js b/src/ui/public/url/__tests__/url.js
new file mode 100644
index 0000000000000..321bb94718401
--- /dev/null
+++ b/src/ui/public/url/__tests__/url.js
@@ -0,0 +1,475 @@
+
+var sinon = require('auto-release-sinon');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+var faker = require('faker');
+var _ = require('lodash');
+var MockState = require('fixtures/mock_state');
+
+// global vars, injected and mocked in init()
+var kbnUrl;
+var $route;
+var $location;
+var $rootScope;
+var globalStateMock;
+var appState;
+
+require('ui/url');
+
+function init() {
+  ngMock.module('kibana/url', 'kibana', function ($provide) {
+    $provide.service('$route', function () {
+      return {
+        reload: _.noop
+      };
+    });
+
+    appState = { destroy: sinon.stub() };
+    $provide.service('getAppState', function () {
+      return function () {
+        return appState;
+      };
+    });
+
+    $provide.service('globalState', function () {
+      globalStateMock = new MockState();
+      globalStateMock.removeFromUrl = function (url) {
+        return url;
+      };
+
+      return globalStateMock;
+    });
+  });
+
+  ngMock.inject(function ($injector) {
+    $route = $injector.get('$route');
+    $location = $injector.get('$location');
+    $rootScope = $injector.get('$rootScope');
+    kbnUrl = $injector.get('kbnUrl');
+  });
+}
+
+describe('kbnUrl', function () {
+
+  beforeEach(function () {
+    init();
+  });
+
+  describe('forcing reload', function () {
+    it('schedules a listener for $locationChangeSuccess on the $rootScope', function () {
+      $location.url('/url');
+      $route.current = {
+        $$route: {
+          regex: /.*/
+        }
+      };
+
+      sinon.stub($rootScope, '$on');
+
+      expect($rootScope.$on.callCount).to.be(0);
+      kbnUrl.change('/url');
+      sinon.assert.calledOnce(appState.destroy);
+      expect($rootScope.$on.callCount).to.be(1);
+      expect($rootScope.$on.firstCall.args[0]).to.be('$locationChangeSuccess');
+    });
+
+    it('handler unbinds the listener and calls reload', function () {
+      $location.url('/url');
+      $route.current = {
+        $$route: {
+          regex: /.*/
+        }
+      };
+
+      var unbind = sinon.stub();
+      sinon.stub($rootScope, '$on').returns(unbind);
+      $route.reload = sinon.stub();
+
+      expect($rootScope.$on.callCount).to.be(0);
+      kbnUrl.change('/url');
+      expect($rootScope.$on.callCount).to.be(1);
+
+      var handler = $rootScope.$on.firstCall.args[1];
+      handler();
+      expect(unbind.callCount).to.be(1);
+      expect($route.reload.callCount).to.be(1);
+    });
+
+    it('reloads requested before the first are ignored', function () {
+      $location.url('/url');
+      $route.current = {
+        $$route: {
+          regex: /.*/
+        }
+      };
+      $route.reload = sinon.stub();
+
+      sinon.stub($rootScope, '$on').returns(sinon.stub());
+
+      expect($rootScope.$on.callCount).to.be(0);
+      kbnUrl.change('/url');
+      expect($rootScope.$on.callCount).to.be(1);
+
+      // don't call the first handler
+
+      kbnUrl.change('/url');
+      expect($rootScope.$on.callCount).to.be(1);
+    });
+
+    it('one reload can happen once the first has completed', function () {
+      $location.url('/url');
+      $route.current = {
+        $$route: {
+          regex: /.*/
+        }
+      };
+      $route.reload = sinon.stub();
+
+      sinon.stub($rootScope, '$on').returns(sinon.stub());
+
+      expect($rootScope.$on.callCount).to.be(0);
+      kbnUrl.change('/url');
+      expect($rootScope.$on.callCount).to.be(1);
+
+      // call the first handler
+      $rootScope.$on.firstCall.args[1]();
+      expect($route.reload.callCount).to.be(1);
+
+      expect($rootScope.$on.callCount).to.be(1);
+      kbnUrl.change('/url');
+      expect($rootScope.$on.callCount).to.be(2);
+    });
+  });
+
+  describe('change', function () {
+    it('should set $location.url', function () {
+      sinon.stub($location, 'url');
+
+      expect($location.url.callCount).to.be(0);
+      kbnUrl.change('/some-url');
+      expect($location.url.callCount).to.be(1);
+    });
+
+    it('should uri encode replaced params', function () {
+      var url = '/some/path/';
+      var params = { replace: faker.Lorem.words(3).join(' ') };
+      var check = encodeURIComponent(params.replace);
+      sinon.stub($location, 'url');
+
+      kbnUrl.change(url + '{{replace}}', params);
+
+      expect($location.url.firstCall.args[0]).to.be(url + check);
+    });
+
+    it('should parse angular expression in substitutions and uri encode the results', function () {
+      // build url by piecing together these parts
+      var urlParts = ['/', '/', '?', '&', '#'];
+      // make sure it can parse templates with weird spacing
+      var wrappers = [ ['{{', '}}'], ['{{ ', ' }}'], ['{{', '  }}'], ['{{    ', '}}'], ['{{    ', '         }}']];
+      // make sure filters are evaluated via angular expressions
+      var objIndex = 4; // used to case one replace as an object
+      var filters = ['', 'uppercase', '', 'uppercase', 'rison'];
+
+      // the words (template keys) used must all be unique
+      var words = _.uniq(faker.Lorem.words(10)).slice(0, urlParts.length).map(function (word, i) {
+        if (filters[i].length) {
+          return word + '|' + filters[i];
+        }
+        return word;
+      });
+
+      var replacements = faker.Lorem.words(urlParts.length).map(function (word, i) {
+        // make selected replacement into an object
+        if (i === objIndex) {
+          return { replace: word };
+        }
+
+        return word;
+      });
+
+      // build the url and test url
+      var url = '';
+      var testUrl = '';
+      urlParts.forEach(function (part, i) {
+        url += part + wrappers[i][0] + words[i] + wrappers[i][1];
+        var locals = {};
+        locals[words[i].split('|')[0]] = replacements[i];
+        testUrl += part + encodeURIComponent($rootScope.$eval(words[i], locals));
+      });
+
+      // create the locals replacement object
+      var params = {};
+      replacements.forEach(function (replacement, i) {
+        var word = words[i].split('|')[0];
+        params[word] = replacement;
+      });
+
+      sinon.stub($location, 'url');
+
+      kbnUrl.change(url, params);
+
+      expect($location.url.firstCall.args[0]).to.not.be(url);
+      expect($location.url.firstCall.args[0]).to.be(testUrl);
+    });
+
+    it('should handle dot notation', function () {
+      var url = '/some/thing/{{that.is.substituted}}';
+
+      kbnUrl.change(url, {
+        that: {
+          is: {
+            substituted: 'test'
+          }
+        }
+      });
+
+      expect($location.url()).to.be('/some/thing/test');
+    });
+
+    it('should throw when params are missing', function () {
+      var url = '/{{replace_me}}';
+      var params = {};
+
+      try {
+        kbnUrl.change(url, params);
+        throw new Error('this should not run');
+      } catch (err) {
+        expect(err).to.be.an(Error);
+        expect(err.message).to.match(/replace_me/);
+      }
+    });
+
+    it('should throw when filtered params are missing', function () {
+      var url = '/{{replace_me|number}}';
+      var params = {};
+
+      try {
+        kbnUrl.change(url, params);
+        throw new Error('this should not run');
+      } catch (err) {
+        expect(err).to.be.an(Error);
+        expect(err.message).to.match(/replace_me\|number/);
+      }
+    });
+
+    it('should change the entire url', function () {
+      var path = '/test/path';
+      var search = {search: 'test'};
+      var hash = 'hash';
+      var newPath = '/new/location';
+
+      $location.path(path).search(search).hash(hash);
+
+      // verify the starting state
+      expect($location.path()).to.be(path);
+      expect($location.search()).to.eql(search);
+      expect($location.hash()).to.be(hash);
+
+      kbnUrl.change(newPath);
+
+      // verify the ending state
+      expect($location.path()).to.be(newPath);
+      expect($location.search()).to.eql({});
+      expect($location.hash()).to.be('');
+    });
+  });
+
+  describe('changePath', function () {
+    it('should change just the path', function () {
+      var path = '/test/path';
+      var search = {search: 'test'};
+      var hash = 'hash';
+      var newPath = '/new/location';
+
+      $location.path(path).search(search).hash(hash);
+
+      // verify the starting state
+      expect($location.path()).to.be(path);
+      expect($location.search()).to.eql(search);
+      expect($location.hash()).to.be(hash);
+
+      kbnUrl.changePath(newPath);
+
+      // verify the ending state
+      expect($location.path()).to.be(newPath);
+      expect($location.search()).to.eql(search);
+      expect($location.hash()).to.be(hash);
+    });
+  });
+
+  describe('redirect', function () {
+    it('should change the entire url', function () {
+      var path = '/test/path';
+      var search = {search: 'test'};
+      var hash = 'hash';
+      var newPath = '/new/location';
+
+      $location.path(path).search(search).hash(hash);
+
+      // verify the starting state
+      expect($location.path()).to.be(path);
+      expect($location.search()).to.eql(search);
+      expect($location.hash()).to.be(hash);
+
+      kbnUrl.redirect(newPath);
+
+      // verify the ending state
+      expect($location.path()).to.be(newPath);
+      expect($location.search()).to.eql({});
+      expect($location.hash()).to.be('');
+    });
+
+    it('should replace the current history entry', function () {
+      sinon.stub($location, 'replace');
+      $location.url('/some/path');
+
+      expect($location.replace.callCount).to.be(0);
+      kbnUrl.redirect('/new/path/');
+      expect($location.replace.callCount).to.be(1);
+    });
+
+    it('should call replace on $location', function () {
+      sinon.stub(kbnUrl, '_shouldAutoReload').returns(false);
+      sinon.stub($location, 'replace');
+
+      expect($location.replace.callCount).to.be(0);
+      kbnUrl.redirect('/poop');
+      expect($location.replace.callCount).to.be(1);
+    });
+  });
+
+  describe('redirectPath', function () {
+    it('should only change the path', function () {
+      var path = '/test/path';
+      var search = {search: 'test'};
+      var hash = 'hash';
+      var newPath = '/new/location';
+
+      $location
+        .path(path)
+        .search(search)
+        .hash(hash);
+
+      // verify the starting state
+      expect($location.path()).to.be(path);
+      expect($location.search()).to.eql(search);
+      expect($location.hash()).to.be(hash);
+
+      kbnUrl.redirectPath(newPath);
+
+      // verify the ending state
+      expect($location.path()).to.be(newPath);
+      expect($location.search()).to.eql(search);
+      expect($location.hash()).to.be(hash);
+    });
+
+    it('should call replace on $location', function () {
+      sinon.stub(kbnUrl, '_shouldAutoReload').returns(false);
+      sinon.stub($location, 'replace');
+
+      expect($location.replace.callCount).to.be(0);
+      kbnUrl.redirectPath('/poop');
+      expect($location.replace.callCount).to.be(1);
+    });
+  });
+
+  describe('_shouldAutoReload', function () {
+    var next;
+    var prev;
+
+    beforeEach(function () {
+      $route.current = {
+        $$route: {
+          regexp: /^\/is-current-route\/(\d+)/,
+          reloadOnSearch: true
+        }
+      };
+
+      prev = { path: '/is-current-route/1', search: {} };
+      next = { path: '/is-current-route/1', search: {} };
+    });
+
+    it('returns false if the passed url doesn\'t match the current route', function () {
+      next.path = '/not current';
+      expect(kbnUrl._shouldAutoReload(next, prev)).to.be(false);
+    });
+
+    describe('if the passed url does match the route', function () {
+      describe('and the route reloads on search', function () {
+        describe('and the path is the same', function () {
+          describe('and the search params are the same', function () {
+            it('returns true', function () {
+              expect(kbnUrl._shouldAutoReload(next, prev)).to.be(true);
+            });
+          });
+          describe('but the search params are different', function () {
+            it('returns false', function () {
+              next.search = {};
+              prev.search = { q: 'search term' };
+              expect(kbnUrl._shouldAutoReload(next, prev)).to.be(false);
+            });
+          });
+        });
+
+        describe('and the path is different', function () {
+          beforeEach(function () {
+            next.path = '/not-same';
+          });
+
+          describe('and the search params are the same', function () {
+            it('returns false', function () {
+              expect(kbnUrl._shouldAutoReload(next, prev)).to.be(false);
+            });
+          });
+          describe('but the search params are different', function () {
+            it('returns false', function () {
+              next.search = {};
+              prev.search = { q: 'search term' };
+              expect(kbnUrl._shouldAutoReload(next, prev)).to.be(false);
+            });
+          });
+        });
+      });
+
+      describe('but the route does not reload on search', function () {
+        beforeEach(function () {
+          $route.current.$$route.reloadOnSearch = false;
+        });
+
+        describe('and the path is the same', function () {
+          describe('and the search params are the same', function () {
+            it('returns true', function () {
+              expect(kbnUrl._shouldAutoReload(next, prev)).to.be(true);
+            });
+          });
+          describe('but the search params are different', function () {
+            it('returns true', function () {
+              next.search = {};
+              prev.search = { q: 'search term' };
+              expect(kbnUrl._shouldAutoReload(next, prev)).to.be(true);
+            });
+          });
+        });
+
+        describe('and the path is different', function () {
+          beforeEach(function () {
+            next.path = '/not-same';
+          });
+
+          describe('and the search params are the same', function () {
+            it('returns false', function () {
+              expect(kbnUrl._shouldAutoReload(next, prev)).to.be(false);
+            });
+          });
+          describe('but the search params are different', function () {
+            it('returns false', function () {
+              next.search = {};
+              prev.search = { q: 'search term' };
+              expect(kbnUrl._shouldAutoReload(next, prev)).to.be(false);
+            });
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/src/ui/public/url/url.js b/src/ui/public/url/url.js
new file mode 100644
index 0000000000000..85d903717a626
--- /dev/null
+++ b/src/ui/public/url/url.js
@@ -0,0 +1,190 @@
+define(function (require) {
+  var _ = require('lodash');
+
+  require('ui/filters/uriescape');
+  require('ui/filters/rison');
+
+  require('ui/modules').get('kibana/url')
+  .service('kbnUrl', function (Private) { return Private(KbnUrlProvider); });
+
+  function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getAppState) {
+    var self = this;
+
+    /**
+     * Navigate to a url
+     *
+     * @param  {String} url - the new url, can be a template. See #eval
+     * @param  {Object} [paramObj] - optional set of parameters for the url template
+     * @return {undefined}
+     */
+    self.change = function (url, paramObj) {
+      self._changeLocation('url', url, paramObj);
+    };
+
+    /**
+     * Same as #change except only changes the url's path,
+     * leaving the search string and such intact
+     *
+     * @param  {String} path - the new path, can be a template. See #eval
+     * @param  {Object} [paramObj] - optional set of parameters for the path template
+     * @return {undefined}
+     */
+    self.changePath = function (path, paramObj) {
+      self._changeLocation('path', path, paramObj);
+    };
+
+    /**
+     * Same as #change except that it removes the current url from history
+     *
+     * @param  {String} url - the new url, can be a template. See #eval
+     * @param  {Object} [paramObj] - optional set of parameters for the url template
+     * @return {undefined}
+     */
+    self.redirect = function (url, paramObj) {
+      self._changeLocation('url', url, paramObj, true);
+    };
+
+    /**
+     * Same as #redirect except only changes the url's path,
+     * leaving the search string and such intact
+     *
+     * @param  {String} path - the new path, can be a template. See #eval
+     * @param  {Object} [paramObj] - optional set of parameters for the path template
+     * @return {undefined}
+     */
+    self.redirectPath = function (path, paramObj) {
+      self._changeLocation('path', path, paramObj, true);
+    };
+
+    /**
+     * Evaluate a url template. templates can contain double-curly wrapped
+     * expressions that are evaluated in the context of the paramObj
+     *
+     * @param  {String} template - the url template to evaluate
+     * @param  {Object} [paramObj] - the variables to expose to the template
+     * @return {String} - the evaluated result
+     * @throws {Error} If any of the expressions can't be parsed.
+     */
+    self.eval = function (template, paramObj) {
+      paramObj = paramObj || {};
+
+      return template.replace(/\{\{([^\}]+)\}\}/g, function (match, expr) {
+        // remove filters
+        var key = expr.split('|')[0].trim();
+
+        // verify that the expression can be evaluated
+        var p = $parse(key)(paramObj);
+
+        // if evaluation can't be made, throw
+        if (_.isUndefined(p)) {
+          throw new Error('Replacement failed, unresolved expression: ' + expr);
+        }
+
+        // append uriescape filter if not included
+        if (expr.indexOf('uriescape') === -1) {
+          expr += '|uriescape';
+        }
+
+        return $parse(expr)(paramObj);
+      });
+    };
+
+    /**
+     * convert an object's route to an href, compatible with
+     * window.location.href= and <a href="">
+     *
+     * @param  {Object} obj - any object that list's it's routes at obj.routes{}
+     * @param  {string} route - the route name
+     * @return {string} - the computed href
+     */
+    self.getRouteHref = function (obj, route) {
+      return '#' + self.getRouteUrl(obj, route);
+    };
+
+    /**
+     * convert an object's route to a url, compatible with url.change() or $location.url()
+     *
+     * @param  {Object} obj - any object that list's it's routes at obj.routes{}
+     * @param  {string} route - the route name
+     * @return {string} - the computed url
+     */
+    self.getRouteUrl = function (obj, route) {
+      var template = obj && obj.routes && obj.routes[route];
+      if (template) return self.eval(template, obj);
+    };
+
+    /**
+     * Similar to getRouteUrl, supports objects which list their routes,
+     * and redirects to the named route. See #redirect
+     *
+     * @param  {Object} obj - any object that list's it's routes at obj.routes{}
+     * @param  {string} route - the route name
+     * @return {undefined}
+     */
+    self.redirectToRoute = function (obj, route) {
+      self.redirect(self.getRouteUrl(obj, route));
+    };
+
+    /**
+     * Similar to getRouteUrl, supports objects which list their routes,
+     * and changes the url to the named route. See #change
+     *
+     * @param  {Object} obj - any object that list's it's routes at obj.routes{}
+     * @param  {string} route - the route name
+     * @return {undefined}
+     */
+    self.changeToRoute = function (obj, route) {
+      self.change(self.getRouteUrl(obj, route));
+    };
+
+    /////
+    // private api
+    /////
+    var reloading;
+
+    self._changeLocation = function (type, url, paramObj, replace) {
+      var prev = {
+        path: $location.path(),
+        search: $location.search()
+      };
+
+      url = self.eval(url, paramObj);
+      $location[type](url);
+      if (replace) $location.replace();
+
+      var next = {
+        path: $location.path(),
+        search: $location.search()
+      };
+
+      if (self._shouldAutoReload(next, prev)) {
+        var appState = getAppState();
+        if (appState) appState.destroy();
+
+        reloading = $rootScope.$on('$locationChangeSuccess', function () {
+          // call the "unlisten" function returned by $on
+          reloading();
+          reloading = false;
+
+          $route.reload();
+        });
+      }
+    };
+
+    self._shouldAutoReload = function (next, prev) {
+      if (reloading) return false;
+
+      var route = $route.current && $route.current.$$route;
+      if (!route) return false;
+
+      if (next.path !== prev.path) return false;
+
+      var reloadOnSearch = route.reloadOnSearch;
+      var searchSame = _.isEqual(next.search, prev.search);
+
+      return (reloadOnSearch && searchSame) || !reloadOnSearch;
+    };
+  }
+
+  return KbnUrlProvider;
+});
diff --git a/src/kibana/utils/BaseObject.js b/src/ui/public/utils/BaseObject.js
similarity index 95%
rename from src/kibana/utils/BaseObject.js
rename to src/ui/public/utils/BaseObject.js
index 5d73f0a326f59..dcecdb16b1e3c 100644
--- a/src/kibana/utils/BaseObject.js
+++ b/src/ui/public/utils/BaseObject.js
@@ -1,6 +1,6 @@
 define(function (require) {
   var _ = require('lodash');
-  var rison = require('utils/rison');
+  var rison = require('ui/utils/rison');
   var angular = require('angular');
 
   function BaseObject(attributes) {
diff --git a/src/ui/public/utils/CidrMask.js b/src/ui/public/utils/CidrMask.js
new file mode 100644
index 0000000000000..2ca30f3fb9091
--- /dev/null
+++ b/src/ui/public/utils/CidrMask.js
@@ -0,0 +1,32 @@
+define(function (require) {
+  var Ipv4Address = require('ui/utils/Ipv4Address');
+  var NUM_BITS = 32;
+
+  function throwError(mask) {
+    throw Error('Invalid CIDR mask: ' + mask);
+  }
+
+  function CidrMask(mask) {
+    var splits = mask.split('\/');
+    if (splits.length !== 2) throwError(mask);
+    this.initialAddress = new Ipv4Address(splits[0]);
+    this.prefixLength = Number(splits[1]);
+    if (this.prefixLength < 1 || this.prefixLength > NUM_BITS) throwError(mask);
+  }
+
+  CidrMask.prototype.getRange = function () {
+    var variableBits = NUM_BITS - this.prefixLength;
+    var fromAddress = this.initialAddress.valueOf() >> variableBits << variableBits >>> 0; // >>> 0 coerces to unsigned
+    var numAddresses = Math.pow(2, variableBits);
+    return {
+      from: new Ipv4Address(fromAddress).toString(),
+      to: new Ipv4Address(fromAddress + numAddresses - 1).toString()
+    };
+  };
+
+  CidrMask.prototype.toString = function () {
+    return this.initialAddress.toString() + '/' + this.prefixLength;
+  };
+
+  return CidrMask;
+});
diff --git a/src/kibana/utils/ipv4_address.js b/src/ui/public/utils/Ipv4Address.js
similarity index 100%
rename from src/kibana/utils/ipv4_address.js
rename to src/ui/public/utils/Ipv4Address.js
diff --git a/src/kibana/utils/obj_define.js b/src/ui/public/utils/ObjDefine.js
similarity index 100%
rename from src/kibana/utils/obj_define.js
rename to src/ui/public/utils/ObjDefine.js
diff --git a/src/ui/public/utils/SimpleEmitter.js b/src/ui/public/utils/SimpleEmitter.js
new file mode 100644
index 0000000000000..a82ce604ea9cd
--- /dev/null
+++ b/src/ui/public/utils/SimpleEmitter.js
@@ -0,0 +1,121 @@
+define(function (require) {
+  var _ = require('lodash');
+  var BaseObject = require('ui/utils/BaseObject');
+
+  /**
+   * Simple event emitter class used in the vislib. Calls
+   * handlers synchronously and implements a chainable api
+   *
+   * @class
+   */
+  _.class(SimpleEmitter).inherits(BaseObject);
+  function SimpleEmitter() {
+    this._listeners = {};
+  }
+
+  /**
+   * Add an event handler
+   *
+   * @param  {string} name
+   * @param  {function} handler
+   * @return {SimpleEmitter} - this, for chaining
+   */
+  SimpleEmitter.prototype.on = function (name, handler) {
+    var handlers = this._listeners[name];
+    if (!handlers) handlers = this._listeners[name] = [];
+
+    handlers.push(handler);
+
+    return this;
+  };
+
+  /**
+   * Remove an event handler
+   *
+   * @param  {string} name
+   * @param  {function} [handler] - optional handler to remove, if no handler is
+   *                              passed then all are removed
+   * @return {SimpleEmitter} - this, for chaining
+   */
+  SimpleEmitter.prototype.off = function (name, handler) {
+    if (!this._listeners[name]) {
+      return this;
+    }
+
+    // remove a specific handler
+    if (handler) _.pull(this._listeners[name], handler);
+    // or remove all listeners
+    else this._listeners[name] = null;
+
+    return this;
+  };
+
+  /**
+   * Remove all event listeners bound to this emitter.
+   *
+   * @return {SimpleEmitter} - this, for chaining
+   */
+  SimpleEmitter.prototype.removeAllListeners = function () {
+    this._listeners = {};
+    return this;
+  };
+
+  /**
+   * Emit an event and all arguments to all listeners for an event name
+   *
+   * @param  {string} name
+   * @param  {*} [arg...] - any number of arguments that will be applied to each handler
+   * @return {SimpleEmitter} - this, for chaining
+   */
+  SimpleEmitter.prototype.emit = _.restParam(function (name, args) {
+    if (!this._listeners[name]) return this;
+    var listeners = this.listeners(name);
+    var i = -1;
+
+    while (++i < listeners.length) {
+      listeners[i].apply(this, args);
+    }
+
+    return this;
+  });
+
+  /**
+   * Get a list of the event names that currently have listeners
+   *
+   * @return {array[string]}
+   */
+  SimpleEmitter.prototype.activeEvents = function () {
+    return _.reduce(this._listeners, function (active, listeners, name) {
+      return active.concat(_.size(listeners) ? name : []);
+    }, []);
+  };
+
+  /**
+   * Get a list of the handler functions for a specific event
+   *
+   * @param  {string} name
+   * @return {array[function]}
+   */
+  SimpleEmitter.prototype.listeners = function (name) {
+    return this._listeners[name] ? this._listeners[name].slice(0) : [];
+  };
+
+  /**
+   * Get the count of handlers for a specific event
+   *
+   * @param  {string} [name] - optional event name to filter by
+   * @return {number}
+   */
+  SimpleEmitter.prototype.listenerCount = function (name) {
+    if (name) {
+      return _.size(this._listeners[name]);
+    }
+
+    return _.reduce(this._listeners, function (count, handlers) {
+      return count + _.size(handlers);
+    }, 0);
+  };
+
+
+  return SimpleEmitter;
+});
diff --git a/src/ui/public/utils/__tests__/Ipv4Address.js b/src/ui/public/utils/__tests__/Ipv4Address.js
new file mode 100644
index 0000000000000..94b60b2bee354
--- /dev/null
+++ b/src/ui/public/utils/__tests__/Ipv4Address.js
@@ -0,0 +1,58 @@
+
+var Ipv4Address = require('ui/utils/Ipv4Address');
+var expect = require('expect.js');
+
+describe('Ipv4Address', function () {
+  it('should throw errors with invalid IP addresses', function () {
+    expect(function () {
+      new Ipv4Address();
+    }).to.throwError();
+
+    expect(function () {
+      new Ipv4Address('');
+    }).to.throwError();
+
+    expect(function () {
+      new Ipv4Address('hello, world');
+    }).to.throwError();
+
+    expect(function () {
+      new Ipv4Address('0.0.0');
+    }).to.throwError();
+
+    expect(function () {
+      new Ipv4Address('256.0.0.0');
+    }).to.throwError();
+
+    expect(function () {
+      new Ipv4Address('-1.0.0.0');
+    }).to.throwError();
+
+    expect(function () {
+      new Ipv4Address(Number.MAX_SAFE_INTEGER);
+    }).to.throwError();
+  });
+
+  it('should allow creation with an integer or string', function () {
+    expect(new Ipv4Address(2116932386).toString()).to.be(new Ipv4Address('126.45.211.34').toString());
+  });
+
+  it('should correctly calculate the decimal representation of an IP address', function () {
+    var ipAddress = new Ipv4Address('0.0.0.0');
+    expect(ipAddress.valueOf()).to.be(0);
+
+    ipAddress = new Ipv4Address('0.0.0.1');
+    expect(ipAddress.valueOf()).to.be(1);
+
+    ipAddress = new Ipv4Address('126.45.211.34');
+    expect(ipAddress.valueOf()).to.be(2116932386);
+  });
+
+  it('toString()', function () {
+    var ipAddress = new Ipv4Address('0.000.00000.1');
+    expect(ipAddress.toString()).to.be('0.0.0.1');
+
+    ipAddress = new Ipv4Address('123.123.123.123');
+    expect(ipAddress.toString()).to.be('123.123.123.123');
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/utils/__tests__/ObjDefine.js b/src/ui/public/utils/__tests__/ObjDefine.js
new file mode 100644
index 0000000000000..beca7f1934813
--- /dev/null
+++ b/src/ui/public/utils/__tests__/ObjDefine.js
@@ -0,0 +1,133 @@
+var expect = require('expect.js');
+
+describe('ObjDefine Utility', function () {
+  var ObjDefine = require('ui/utils/ObjDefine');
+
+  function flatten(obj) {
+    return JSON.parse(JSON.stringify(obj));
+  }
+
+  describe('#writ', function () {
+    it('creates writeable properties', function () {
+      var def = new ObjDefine();
+      def.writ('name', 'foo');
+
+      var obj = def.create();
+      expect(obj).to.have.property('name', 'foo');
+
+      obj.name = 'bar';
+      expect(obj).to.have.property('name', 'bar');
+    });
+
+    it('exports the property to JSON', function () {
+      var def = new ObjDefine();
+      def.writ('name', 'foo');
+      expect(flatten(def.create())).to.have.property('name', 'foo');
+    });
+
+    it('does not export property to JSON it it\'s undefined or null', function () {
+      var def = new ObjDefine();
+      def.writ('name');
+      expect(flatten(def.create())).to.not.have.property('name');
+
+      def.writ('name', null);
+      expect(flatten(def.create())).to.not.have.property('name');
+    });
+
+    it('switched to exporting if a value is written', function () {
+      var def = new ObjDefine();
+      def.writ('name');
+
+      var obj = def.create();
+      expect(flatten(obj)).to.not.have.property('name');
+
+      obj.name = null;
+      expect(flatten(obj)).to.not.have.property('name');
+
+      obj.name = 'foo';
+      expect(flatten(obj)).to.have.property('name', 'foo');
+    });
+
+    it('setting a writ value to null prevents it from exporting', function () {
+      var def = new ObjDefine();
+      def.writ('name', 'foo');
+
+      var obj = def.create();
+      expect(flatten(obj)).to.have.property('name', 'foo');
+
+      obj.name = null;
+      expect(flatten(obj)).to.not.have.property('name');
+    });
+
+  });
+
+  describe('#fact', function () {
+    it('creates an immutable field', function () {
+      var def = new ObjDefine();
+      var val = 'foo';
+      var notval = 'bar';
+      def.fact('name', val);
+      var obj = def.create();
+
+
+      obj.name = notval; // UPDATE SHOULD BE IGNORED
+      expect(obj).to.have.property('name', val);
+    });
+
+    it('exports the fact to JSON', function () {
+      var def = new ObjDefine();
+      def.fact('name', 'foo');
+      expect(flatten(def.create())).to.have.property('name', 'foo');
+    });
+  });
+
+  describe('#comp', function () {
+    it('creates an immutable field', function () {
+      var def = new ObjDefine();
+      var val = 'foo';
+      var notval = 'bar';
+      def.comp('name', val);
+      var obj = def.create();
+
+
+      obj.name = notval; // UPDATE SHOULD BE IGNORED
+      expect(obj).to.have.property('name', val);
+    });
+
+    it('does not export the computed value to JSON', function () {
+      var def = new ObjDefine();
+      def.comp('name', 'foo');
+      expect(flatten(def.create())).to.not.have.property('name');
+    });
+  });
+
+
+  describe('#create', function () {
+    it('creates object that inherits from the prototype', function () {
+      function SomeClass() {}
+
+      var def = new ObjDefine(null, SomeClass.prototype);
+      var obj = def.create();
+
+      expect(obj).to.be.a(SomeClass);
+    });
+
+    it('uses the defaults for property values', function () {
+      var def = new ObjDefine({ name: 'bar' });
+      def.fact('name');
+
+      var obj = def.create();
+
+      expect(obj).to.have.property('name', 'bar');
+    });
+
+    it('ignores default values that are not defined propertyes', function () {
+      var def = new ObjDefine({ name: 'foo', name2: 'bar' });
+      var obj = def.create();
+
+      expect(obj).to.not.have.property('name');
+      expect(obj).to.not.have.property('name2');
+    });
+  });
+
+});
diff --git a/src/ui/public/utils/__tests__/SimpleEmitter.js b/src/ui/public/utils/__tests__/SimpleEmitter.js
new file mode 100644
index 0000000000000..b588bd767f1a2
--- /dev/null
+++ b/src/ui/public/utils/__tests__/SimpleEmitter.js
@@ -0,0 +1,156 @@
+
+describe('SimpleEmitter class', function () {
+  var SimpleEmitter = require('ui/utils/SimpleEmitter');
+  var expect = require('expect.js');
+  var sinon = require('auto-release-sinon');
+  var emitter;
+
+  beforeEach(function () {
+    emitter = new SimpleEmitter();
+  });
+
+  it('constructs an event emitter', function () {
+    expect(emitter).to.have.property('on');
+    expect(emitter).to.have.property('off');
+    expect(emitter).to.have.property('emit');
+    expect(emitter).to.have.property('listenerCount');
+    expect(emitter).to.have.property('removeAllListeners');
+  });
+
+  describe('#listenerCount', function () {
+    it('counts all event listeners without any arg', function () {
+      expect(emitter.listenerCount()).to.be(0);
+      emitter.on('a', function () {});
+      expect(emitter.listenerCount()).to.be(1);
+      emitter.on('b', function () {});
+      expect(emitter.listenerCount()).to.be(2);
+    });
+
+    it('limits to the event that is passed in', function () {
+      expect(emitter.listenerCount()).to.be(0);
+      emitter.on('a', function () {});
+      expect(emitter.listenerCount('a')).to.be(1);
+      emitter.on('a', function () {});
+      expect(emitter.listenerCount('a')).to.be(2);
+      emitter.on('b', function () {});
+      expect(emitter.listenerCount('a')).to.be(2);
+      expect(emitter.listenerCount('b')).to.be(1);
+      expect(emitter.listenerCount()).to.be(3);
+    });
+  });
+
+  describe('#on', function () {
+    it('registers a handler', function () {
+      var handler = sinon.stub();
+      emitter.on('a', handler);
+      expect(emitter.listenerCount('a')).to.be(1);
+
+      expect(handler.callCount).to.be(0);
+      emitter.emit('a');
+      expect(handler.callCount).to.be(1);
+    });
+
+    it('allows multiple event handlers for the same event', function () {
+      emitter.on('a', function () {});
+      emitter.on('a', function () {});
+      expect(emitter.listenerCount('a')).to.be(2);
+    });
+
+    it('allows the same function to be registered multiple times', function () {
+      var handler = function () {};
+      emitter.on('a', handler);
+      expect(emitter.listenerCount()).to.be(1);
+      emitter.on('a', handler);
+      expect(emitter.listenerCount()).to.be(2);
+    });
+  });
+
+  describe('#off', function () {
+    it('removes a listener if it was registered', function () {
+      var handler = sinon.stub();
+      expect(emitter.listenerCount()).to.be(0);
+      emitter.on('a', handler);
+      expect(emitter.listenerCount('a')).to.be(1);
+      emitter.off('a', handler);
+      expect(emitter.listenerCount('a')).to.be(0);
+    });
+
+    it('clears all listeners if no handler is passed', function () {
+      emitter.on('a', function () {});
+      emitter.on('a', function () {});
+      expect(emitter.listenerCount()).to.be(2);
+      emitter.off('a');
+      expect(emitter.listenerCount()).to.be(0);
+    });
+
+    it('does not mind if the listener is not registered', function () {
+      emitter.off('a', function () {});
+    });
+
+    it('does not mind if the event has no listeners', function () {
+      emitter.off('a');
+    });
+  });
+
+  describe('#emit', function () {
+    it('calls the handlers in the order they were defined', function () {
+      var i = 0;
+      var incr = function () { return ++i; };
+      var one = sinon.spy(incr);
+      var two = sinon.spy(incr);
+      var three = sinon.spy(incr);
+      var four = sinon.spy(incr);
+
+      emitter
+      .on('a', one)
+      .on('a', two)
+      .on('a', three)
+      .on('a', four)
+      .emit('a');
+
+      expect(one).to.have.property('callCount', 1);
+      expect(one.returned(1)).to.be.ok();
+
+      expect(two).to.have.property('callCount', 1);
+      expect(two.returned(2)).to.be.ok();
+
+      expect(three).to.have.property('callCount', 1);
+      expect(three.returned(3)).to.be.ok();
+
+      expect(four).to.have.property('callCount', 1);
+      expect(four.returned(4)).to.be.ok();
+    });
+
+    it('always emits the handlers that were initially registered', function () {
+
+      var destructive = sinon.spy(function () {
+        emitter.removeAllListeners();
+        expect(emitter.listenerCount()).to.be(0);
+      });
+      var stub = sinon.stub();
+
+      emitter.on('run', destructive).on('run', stub).emit('run');
+
+      expect(destructive).to.have.property('callCount', 1);
+      expect(stub).to.have.property('callCount', 1);
+    });
+
+    it('applies all arguments except the first', function () {
+      emitter
+      .on('a', function (a, b, c) {
+        expect(a).to.be('foo');
+        expect(b).to.be('bar');
+        expect(c).to.be('baz');
+      })
+      .emit('a', 'foo', 'bar', 'baz');
+    });
+
+    it('uses the SimpleEmitter as the this context', function () {
+      emitter
+      .on('a', function () {
+        expect(this).to.be(emitter);
+      })
+      .emit('a');
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/utils/__tests__/add_word_breaks.js b/src/ui/public/utils/__tests__/add_word_breaks.js
new file mode 100644
index 0000000000000..cb7d6173b41c4
--- /dev/null
+++ b/src/ui/public/utils/__tests__/add_word_breaks.js
@@ -0,0 +1,26 @@
+
+var _ = require('lodash');
+var expect = require('expect.js');
+var addWordBreaks = require('ui/utils/add_word_breaks');
+
+describe('addWordBreaks', function () {
+
+  var fixtures = [
+    ['aaaaaaaaaaaaaaaaaaaa', 'aaaaaaaaaaa<wbr>aaaaaaaaa'],
+    ['aaaa aaaaaaaaaaaaaaa', 'aaaa aaaaaaaaaaa<wbr>aaaa'],
+    ['aaaa;aaaaaaaaaaaaaaa', 'aaaa;aaaaaaaaaaa<wbr>aaaa'],
+    ['aaaa:aaaaaaaaaaaaaaa', 'aaaa:aaaaaaaaaaa<wbr>aaaa'],
+    ['aaaa,aaaaaaaaaaaaaaa', 'aaaa,aaaaaaaaaaa<wbr>aaaa'],
+    ['aaaa aaaa', 'aaaa aaaa'],
+    ['aaaa <mark>aaaa</mark>aaaaaaaaaaaa', 'aaaa <mark>aaaa</mark>aaaaaaaaaaa<wbr>a'],
+    ['aaaa&quot;aaaaaaaaaaaa', 'aaaa&quot;aaaaaaaaaaa<wbr>a']
+  ];
+
+  _.each(fixtures, function (fixture) {
+    var msg = 'should convert ' + fixture[0] + ' to ' + fixture[1];
+    it(msg, function () {
+      var results = addWordBreaks(fixture[0], 10);
+      expect(results).to.be(fixture[1]);
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/utils/__tests__/cidr_mask.js b/src/ui/public/utils/__tests__/cidr_mask.js
new file mode 100644
index 0000000000000..9644a3eef9401
--- /dev/null
+++ b/src/ui/public/utils/__tests__/cidr_mask.js
@@ -0,0 +1,78 @@
+
+var CidrMask = require('ui/utils/CidrMask');
+var expect = require('expect.js');
+
+describe('CidrMask', function () {
+  it('should throw errors with invalid CIDR masks', function () {
+    expect(function () {
+      new CidrMask();
+    }).to.throwError();
+
+    expect(function () {
+      new CidrMask('');
+    }).to.throwError();
+
+    expect(function () {
+      new CidrMask('hello, world');
+    }).to.throwError();
+
+    expect(function () {
+      new CidrMask('0.0.0.0');
+    }).to.throwError();
+
+    expect(function () {
+      new CidrMask('0.0.0.0/0');
+    }).to.throwError();
+
+    expect(function () {
+      new CidrMask('0.0.0.0/33');
+    }).to.throwError();
+
+    expect(function () {
+      new CidrMask('256.0.0.0/32');
+    }).to.throwError();
+
+    expect(function () {
+      new CidrMask('0.0.0.0/32/32');
+    }).to.throwError();
+
+    expect(function () {
+      new CidrMask('1.2.3/1');
+    }).to.throwError();
+  });
+
+  it('should correctly grab IP address and prefix length', function () {
+    var mask = new CidrMask('0.0.0.0/1');
+    expect(mask.initialAddress.toString()).to.be('0.0.0.0');
+    expect(mask.prefixLength).to.be(1);
+
+    mask = new CidrMask('128.0.0.1/31');
+    expect(mask.initialAddress.toString()).to.be('128.0.0.1');
+    expect(mask.prefixLength).to.be(31);
+  });
+
+  it('should calculate a range of IP addresses', function () {
+    var mask = new CidrMask('0.0.0.0/1');
+    var range = mask.getRange();
+    expect(range.from.toString()).to.be('0.0.0.0');
+    expect(range.to.toString()).to.be('127.255.255.255');
+
+    mask = new CidrMask('1.2.3.4/2');
+    range = mask.getRange();
+    expect(range.from.toString()).to.be('0.0.0.0');
+    expect(range.to.toString()).to.be('63.255.255.255');
+
+    mask = new CidrMask('67.129.65.201/27');
+    range = mask.getRange();
+    expect(range.from.toString()).to.be('67.129.65.192');
+    expect(range.to.toString()).to.be('67.129.65.223');
+  });
+
+  it('toString()', function () {
+    var mask = new CidrMask('.../1');
+    expect(mask.toString()).to.be('0.0.0.0/1');
+
+    mask = new CidrMask('128.0.0.1/31');
+    expect(mask.toString()).to.be('128.0.0.1/31');
+  });
+});
diff --git a/src/ui/public/utils/__tests__/datemath.js b/src/ui/public/utils/__tests__/datemath.js
new file mode 100644
index 0000000000000..9331f2c2a9c2e
--- /dev/null
+++ b/src/ui/public/utils/__tests__/datemath.js
@@ -0,0 +1,137 @@
+var dateMath = require('ui/utils/dateMath');
+var expect = require('expect.js');
+var moment = require('moment');
+var _ = require('lodash');
+var sinon = require('auto-release-sinon');
+
+describe('dateMath', function () {
+  // Test each of these intervals when testing relative time
+  var spans = ['s', 'm', 'h', 'd', 'w', 'M', 'y'];
+  var anchor =  '2014-01-01T06:06:06.666Z';
+  var unix = moment(anchor).valueOf();
+  var format = 'YYYY-MM-DDTHH:mm:ss.SSSZ';
+  var clock;
+
+  describe('errors', function () {
+    it('should return undefined if passed something falsy', function () {
+      expect(dateMath.parse()).to.be(undefined);
+    });
+
+    it('should return undefined if I pass an operator besides [+-/]', function () {
+      expect(dateMath.parse('now&1d')).to.be(undefined);
+    });
+
+    it('should return undefined if I pass a unit besides' + spans.toString(), function () {
+      expect(dateMath.parse('now+5f')).to.be(undefined);
+    });
+
+    it('should return undefined if rounding unit is not 1', function () {
+      expect(dateMath.parse('now/2y')).to.be(undefined);
+      expect(dateMath.parse('now/0.5y')).to.be(undefined);
+    });
+
+    it('should not go into an infinite loop when missing a unit', function () {
+      expect(dateMath.parse('now-0')).to.be(undefined);
+      expect(dateMath.parse('now-00')).to.be(undefined);
+      expect(dateMath.parse('now-000')).to.be(undefined);
+    });
+
+  });
+
+  describe('objects and strings', function () {
+    var mmnt, date, string, now;
+
+    beforeEach(function () {
+      clock = sinon.useFakeTimers(unix);
+      now = moment();
+      mmnt = moment(anchor);
+      date = mmnt.toDate();
+      string = mmnt.format(format);
+    });
+
+    it('should return the same moment if passed a moment', function () {
+      expect(dateMath.parse(mmnt)).to.eql(mmnt);
+    });
+
+    it('should return a moment if passed a date', function () {
+      expect(dateMath.parse(date).format(format)).to.eql(mmnt.format(format));
+    });
+
+    it('should return a moment if passed an ISO8601 string', function () {
+      expect(dateMath.parse(string).format(format)).to.eql(mmnt.format(format));
+    });
+
+    it('should return the current time if passed now', function () {
+      expect(dateMath.parse('now').format(format)).to.eql(now.format(format));
+    });
+  });
+
+  describe('subtraction', function () {
+    var now, anchored;
+
+    beforeEach(function () {
+      clock = sinon.useFakeTimers(unix);
+      now = moment();
+      anchored = moment(anchor);
+    });
+
+    _.each(spans, function (span) {
+      var nowEx = 'now-5' + span;
+      var thenEx =  anchor + '||-5' + span;
+
+      it('should return 5' + span + ' ago', function () {
+        expect(dateMath.parse(nowEx).format(format)).to.eql(now.subtract(5, span).format(format));
+      });
+
+      it('should return 5' + span + ' before ' + anchor, function () {
+        expect(dateMath.parse(thenEx).format(format)).to.eql(anchored.subtract(5, span).format(format));
+      });
+    });
+  });
+
+  describe('addition', function () {
+    var now, anchored;
+
+    beforeEach(function () {
+      clock = sinon.useFakeTimers(unix);
+      now = moment();
+      anchored = moment(anchor);
+    });
+
+    _.each(spans, function (span) {
+      var nowEx = 'now+5' + span;
+      var thenEx =  anchor + '||+5' + span;
+
+      it('should return 5' + span + ' from now', function () {
+        expect(dateMath.parse(nowEx).format()).to.eql(now.add(5, span).format());
+      });
+
+      it('should return 5' + span + ' after ' + anchor, function () {
+        expect(dateMath.parse(thenEx).format()).to.eql(anchored.add(5, span).format());
+      });
+    });
+
+  });
+
+  describe('rounding', function () {
+    var now, anchored;
+
+    beforeEach(function () {
+      clock = sinon.useFakeTimers(unix);
+      now = moment();
+      anchored = moment(anchor);
+    });
+
+    _.each(spans, function (span) {
+      it('should round now to the beginning of the ' + span, function () {
+        expect(dateMath.parse('now/' + span).format(format)).to.eql(now.startOf(span).format(format));
+      });
+
+      it('should round now to the end of the ' + span, function () {
+        expect(dateMath.parse('now/' + span, true).format(format)).to.eql(now.endOf(span).format(format));
+      });
+    });
+
+  });
+
+});
diff --git a/src/ui/public/utils/__tests__/diff_object.js b/src/ui/public/utils/__tests__/diff_object.js
new file mode 100644
index 0000000000000..2aef2e356973b
--- /dev/null
+++ b/src/ui/public/utils/__tests__/diff_object.js
@@ -0,0 +1,76 @@
+
+var diff = require('ui/utils/diff_object');
+var expect = require('expect.js');
+var _ = require('lodash');
+
+describe('ui/utils/diff_object', function () {
+
+  it('should list the removed keys', function () {
+    var target = { test: 'foo' };
+    var source = { foo: 'test' };
+    var results = diff(target, source);
+    expect(results).to.have.property('removed');
+    expect(results.removed).to.eql(['test']);
+  });
+
+  it('should list the changed keys', function () {
+    var target = { foo: 'bar' };
+    var source = { foo: 'test' };
+    var results = diff(target, source);
+    expect(results).to.have.property('changed');
+    expect(results.changed).to.eql(['foo']);
+  });
+
+  it('should list the added keys', function () {
+    var target = { };
+    var source = { foo: 'test' };
+    var results = diff(target, source);
+    expect(results).to.have.property('added');
+    expect(results.added).to.eql(['foo']);
+  });
+
+  it('should list all the keys that are change or removed', function () {
+    var target = { foo: 'bar', test: 'foo' };
+    var source = { foo: 'test' };
+    var results = diff(target, source);
+    expect(results).to.have.property('keys');
+    expect(results.keys).to.eql(['foo', 'test']);
+  });
+
+  it('should ignore functions', function () {
+    var target = { foo: 'bar', test: 'foo' };
+    var source = { foo: 'test', fn: _.noop };
+    diff(target, source);
+    expect(target).to.not.have.property('fn');
+  });
+
+  it('should ignore underscores', function () {
+    var target = { foo: 'bar', test: 'foo' };
+    var source = { foo: 'test', _private: 'foo' };
+    diff(target, source);
+    expect(target).to.not.have.property('_private');
+  });
+
+  it('should ignore dollar signs', function () {
+    var target = { foo: 'bar', test: 'foo' };
+    var source = { foo: 'test', $private: 'foo' };
+    diff(target, source);
+    expect(target).to.not.have.property('$private');
+  });
+
+  it('should not list any changes for similar objects', function () {
+    var target = { foo: 'bar', test: 'foo' };
+    var source = { foo: 'bar', test: 'foo', $private: 'foo' };
+    var results = diff(target, source);
+    expect(results.changed).to.be.empty();
+  });
+
+  it('should only change keys that actually changed', function () {
+    var obj = { 'message': 'foo' };
+    var target = { obj: obj, message: 'foo' };
+    var source = { obj: _.cloneDeep(obj), message: 'test' };
+    var results = diff(target, source);
+    expect(target.obj).to.be(obj);
+  });
+
+});
\ No newline at end of file
diff --git a/src/ui/public/utils/__tests__/diff_time_picker_vals.js b/src/ui/public/utils/__tests__/diff_time_picker_vals.js
new file mode 100644
index 0000000000000..68c474a733ef3
--- /dev/null
+++ b/src/ui/public/utils/__tests__/diff_time_picker_vals.js
@@ -0,0 +1,110 @@
+
+var moment = require('moment');
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+
+describe('Diff Time Picker Values', function () {
+  var diffTimePickerValues;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    diffTimePickerValues = Private(require('ui/utils/diff_time_picker_vals'));
+  }));
+
+  it('accepts two undefined values', function () {
+    var diff = diffTimePickerValues(undefined, undefined);
+    expect(diff).to.be(false);
+  });
+
+  describe('dateMath ranges', function () {
+    it('knows a match', function () {
+      var diff = diffTimePickerValues(
+        {
+          to: 'now',
+          from: 'now-7d'
+        },
+        {
+          to: 'now',
+          from: 'now-7d'
+        }
+      );
+
+      expect(diff).to.be(false);
+    });
+    it('knows a difference', function () {
+      var diff = diffTimePickerValues(
+        {
+          to: 'now',
+          from: 'now-7d'
+        },
+        {
+          to: 'now',
+          from: 'now-1h'
+        }
+      );
+
+      expect(diff).to.be(true);
+    });
+  });
+
+  describe('a dateMath range, and a moment range', function () {
+    it('is always different', function () {
+      var diff = diffTimePickerValues(
+        {
+          to: moment(),
+          from: moment()
+        },
+        {
+          to: 'now',
+          from: 'now-1h'
+        }
+      );
+
+      expect(diff).to.be(true);
+    });
+  });
+
+  describe('moment ranges', function () {
+    it('uses the time value of moments for comparison', function () {
+      var to = moment();
+      var from = moment().add(1, 'day');
+
+      var diff = diffTimePickerValues(
+        {
+          to: to.clone(),
+          from: from.clone()
+        },
+        {
+          to: to.clone(),
+          from: from.clone()
+        }
+      );
+
+      expect(diff).to.be(false);
+    });
+
+    it('fails if any to or from is different', function () {
+      var to = moment();
+      var from = moment().add(1, 'day');
+      var from2 = moment().add(2, 'day');
+
+      var diff = diffTimePickerValues(
+        {
+          to: to.clone(),
+          from: from.clone()
+        },
+        {
+          to: to.clone(),
+          from: from2.clone()
+        }
+      );
+
+      expect(diff).to.be(true);
+    });
+  });
+
+  it('does not fall apart with unusual values', function () {
+    var diff = diffTimePickerValues({}, {});
+    expect(diff).to.be(false);
+  });
+});
diff --git a/src/ui/public/utils/__tests__/ordinal_suffix.js b/src/ui/public/utils/__tests__/ordinal_suffix.js
new file mode 100644
index 0000000000000..4584437675256
--- /dev/null
+++ b/src/ui/public/utils/__tests__/ordinal_suffix.js
@@ -0,0 +1,52 @@
+
+var _ = require('lodash');
+var addOrdinalSuffix = require('ui/utils/ordinal_suffix');
+var expect = require('expect.js');
+
+describe('ordinal suffix util', function () {
+  var checks = {
+    1: 'st',
+    2: 'nd',
+    3: 'rd',
+    4: 'th',
+    5: 'th',
+    6: 'th',
+    7: 'th',
+    8: 'th',
+    9: 'th',
+    10: 'th',
+    11: 'th',
+    12: 'th',
+    13: 'th',
+    14: 'th',
+    15: 'th',
+    16: 'th',
+    17: 'th',
+    18: 'th',
+    19: 'th',
+    20: 'th',
+    21: 'st',
+    22: 'nd',
+    23: 'rd',
+    24: 'th',
+    25: 'th',
+    26: 'th',
+    27: 'th',
+    28: 'th',
+    29: 'th',
+    30: 'th'
+  };
+
+  _.forOwn(checks, function (expected, num) {
+    var int = parseInt(num, 10);
+    var float = int + Math.random();
+
+    it('knowns ' + int, function () {
+      expect(addOrdinalSuffix(num)).to.be(num + '' + expected);
+    });
+
+    it('knows ' + float, function () {
+      expect(addOrdinalSuffix(num)).to.be(num + '' + expected);
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/utils/__tests__/parse_interval.js b/src/ui/public/utils/__tests__/parse_interval.js
new file mode 100644
index 0000000000000..0476eab62c4e8
--- /dev/null
+++ b/src/ui/public/utils/__tests__/parse_interval.js
@@ -0,0 +1,72 @@
+
+var parseInterval = require('ui/utils/parse_interval');
+var expect = require('expect.js');
+
+describe('parseInterval', function () {
+  it('should correctly parse an interval containing unit and value', function () {
+    var duration = parseInterval('1d');
+    expect(duration.as('d')).to.be(1);
+
+    duration = parseInterval('2y');
+    expect(duration.as('y')).to.be(2);
+
+    duration = parseInterval('5M');
+    expect(duration.as('M')).to.be(5);
+
+    duration = parseInterval('5m');
+    expect(duration.as('m')).to.be(5);
+
+    duration = parseInterval('100s');
+    expect(duration.as('s')).to.be(100);
+
+    duration = parseInterval('23d');
+    expect(duration.as('d')).to.be(23);
+
+    duration = parseInterval('52w');
+    expect(duration.as('w')).to.be(52);
+  });
+
+  it('should correctly parse fractional intervals containing unit and value', function () {
+    var duration = parseInterval('1.5w');
+    expect(duration.as('w')).to.be(1.5);
+
+    duration = parseInterval('2.35y');
+    expect(duration.as('y')).to.be(2.35);
+  });
+
+  it('should correctly bubble up intervals which are less than 1', function () {
+    var duration = parseInterval('0.5y');
+    expect(duration.as('d')).to.be(183);
+
+    duration = parseInterval('0.5d');
+    expect(duration.as('h')).to.be(12);
+  });
+
+  it('should correctly parse a unit in an interval only', function () {
+    var duration = parseInterval('d');
+    expect(duration.as('d')).to.be(1);
+
+    duration = parseInterval('m');
+    expect(duration.as('m')).to.be(1);
+
+    duration = parseInterval('y');
+    expect(duration.as('y')).to.be(1);
+
+    duration = parseInterval('M');
+    expect(duration.as('M')).to.be(1);
+  });
+
+  it('should return null for an invalid interval', function () {
+    var duration = parseInterval('');
+    expect(duration).to.not.be.ok();
+
+    duration = parseInterval(null);
+    expect(duration).to.not.be.ok();
+
+    duration = parseInterval('234asdf');
+    expect(duration).to.not.be.ok();
+
+    duration = parseInterval('ms');
+    expect(duration).to.not.be.ok();
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/utils/__tests__/range.js b/src/ui/public/utils/__tests__/range.js
new file mode 100644
index 0000000000000..5f2e6cb184bf1
--- /dev/null
+++ b/src/ui/public/utils/__tests__/range.js
@@ -0,0 +1,110 @@
+
+describe('Range parsing utility', function () {
+  var _ = require('lodash');
+  var expect = require('expect.js');
+  var parse = require('ui/utils/range');
+
+  it('throws an error for inputs that are not formatted properly', function () {
+    expect(function () {
+      parse('');
+    }).to.throwException(TypeError);
+
+    expect(function () {
+      parse('p10202');
+    }).to.throwException(TypeError);
+
+    expect(function () {
+      parse('{0,100}');
+    }).to.throwException(TypeError);
+
+    expect(function () {
+      parse('[0,100');
+    }).to.throwException(TypeError);
+
+    expect(function () {
+      parse(')0,100(');
+    }).to.throwException(TypeError);
+  });
+
+  var tests = {
+    '[ 0 , 100 ]': {
+      props: {
+        min: 0,
+        max: 100,
+        minInclusive: true,
+        maxInclusive: true
+      },
+      within: [
+        [0, true],
+        [0.0000001, true],
+        [1, true],
+        [99.99999, true],
+        [100, true]
+      ]
+    },
+    '(26.3   ,   42]': {
+      props: {
+        min: 26.3,
+        max: 42,
+        minInclusive: false,
+        maxInclusive: true
+      },
+      within: [
+        [26.2999999, false],
+        [26.3000001, true],
+        [30, true],
+        [41, true],
+        [42, true]
+      ]
+    },
+    '(-50,50)': {
+      props: {
+        min: -50,
+        max: 50,
+        minInclusive: false,
+        maxInclusive: false
+      },
+      within: [
+        [-50, false],
+        [-49.99999, true],
+        [0, true],
+        [49.99999, true],
+        [50, false]
+      ]
+    },
+    '(Infinity, -Infinity)': {
+      props: {
+        min: -Infinity,
+        max: Infinity,
+        minInclusive: false,
+        maxInclusive: false
+      },
+      within: [
+        [0, true],
+        [-0.0000001, true],
+        [-1, true],
+        [-10000000000, true],
+        [-Infinity, false],
+        [Infinity, false],
+      ]
+    }
+  };
+
+  _.forOwn(tests, function (spec, str) {
+
+    describe(str, function () {
+      var range = parse(str);
+
+      it('creation', function () {
+        expect(range).to.eql(spec.props);
+      });
+
+      spec.within.forEach(function (tup) {
+        it('#within(' + tup[0] + ')', function () {
+          expect(range.within(tup[0])).to.be(tup[1]);
+        });
+      });
+    });
+
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/utils/__tests__/sequencer.js b/src/ui/public/utils/__tests__/sequencer.js
new file mode 100644
index 0000000000000..0198948e99c65
--- /dev/null
+++ b/src/ui/public/utils/__tests__/sequencer.js
@@ -0,0 +1,101 @@
+
+describe('sequencer util', function () {
+  var _ = require('lodash');
+  var sequencer = require('ui/utils/sequencer');
+  var expect = require('expect.js');
+
+  var args = [
+    { min: 500, max: 7500, length: 1500 },
+    { min: 50, max: 500, length: 1000 },
+    { min: 5, max: 50, length: 100 }
+  ];
+
+  function eachSeqFor(method, fn) {
+    args.forEach(function (args) {
+      fn(method(args.min, args.max, args.length), args);
+    });
+  }
+
+  function getSlopes(seq, count) {
+    return _.chunk(seq, Math.ceil(seq.length / count)).map(function (chunk) {
+      return (_.last(chunk) - _.first(chunk)) / chunk.length;
+    });
+  }
+
+  // using expect() here causes massive GC runs because seq can be +1000 elements
+  function expectedChange(seq, up) {
+    up = !!up;
+
+    if (seq.length < 2) {
+      throw new Error('unable to reach change without at least two elements');
+    }
+
+    seq.forEach(function (n, i) {
+      if (i > 0 && (seq[i - 1] < n) !== up) {
+        throw new Error('expected values to ' + (up ? 'increase' : 'decrease'));
+      }
+    });
+  }
+
+  function generalTests(seq, args) {
+    it('obeys the min arg', function () {
+      expect(Math.min.apply(Math, seq)).to.be(args.min);
+    });
+
+    it('obeys the max arg', function () {
+      expect(Math.max.apply(Math, seq)).to.be(args.max);
+    });
+
+    it('obeys the length arg', function () {
+      expect(seq).to.have.length(args.length);
+    });
+
+    it('always creates increasingly larger values', function () {
+      expectedChange(seq, true);
+    });
+  }
+
+  describe('#createEaseIn', function () {
+    eachSeqFor(sequencer.createEaseIn, function (seq, args) {
+      describe('with args: ' + JSON.stringify(args), function () {
+        generalTests(seq, args);
+
+        it('produces increasing slopes', function () {
+          expectedChange(getSlopes(seq, 2), true);
+          expectedChange(getSlopes(seq, 4), true);
+          expectedChange(getSlopes(seq, 6), true);
+        });
+      });
+    });
+  });
+
+  describe('#createEaseOut', function () {
+    eachSeqFor(sequencer.createEaseOut, function (seq, args) {
+      describe('with args: ' + JSON.stringify(args), function () {
+        generalTests(seq, args);
+
+        it('produces decreasing slopes', function () {
+          expectedChange(getSlopes(seq, 2), false);
+          expectedChange(getSlopes(seq, 4), false);
+          expectedChange(getSlopes(seq, 6), false);
+        });
+
+        // Flipped version of previous test to ensure that expectedChange()
+        // and friends are behaving properly
+        it('doesn\'t produce increasing slopes', function () {
+          expect(function () {
+            expectedChange(getSlopes(seq, 2), true);
+          }).to.throwError();
+
+          expect(function () {
+            expectedChange(getSlopes(seq, 4), true);
+          }).to.throwError();
+
+          expect(function () {
+            expectedChange(getSlopes(seq, 6), true);
+          }).to.throwError();
+        });
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/public/utils/__tests__/slugify_id.js b/src/ui/public/utils/__tests__/slugify_id.js
new file mode 100644
index 0000000000000..7248f57b0a98c
--- /dev/null
+++ b/src/ui/public/utils/__tests__/slugify_id.js
@@ -0,0 +1,39 @@
+
+var _ = require('lodash');
+var slugifyId = require('ui/utils/slugify_id');
+var expect = require('expect.js');
+
+describe('slugifyId()', function () {
+
+  var fixtures = [
+    ['test/test', 'test-slash-test'],
+    ['test?test', 'test-questionmark-test'],
+    ['test=test', 'test-equal-test'],
+    ['test&test', 'test-ampersand-test'],
+    ['test / test', 'test-slash-test'],
+    ['test ? test', 'test-questionmark-test'],
+    ['test = test', 'test-equal-test'],
+    ['test & test', 'test-ampersand-test'],
+    ['test / ^test', 'test-slash-^test'],
+    ['test ?  test', 'test-questionmark-test'],
+    ['test =  test', 'test-equal-test'],
+    ['test &  test', 'test-ampersand-test'],
+    ['test/test/test', 'test-slash-test-slash-test'],
+    ['test?test?test', 'test-questionmark-test-questionmark-test'],
+    ['test&test&test', 'test-ampersand-test-ampersand-test'],
+    ['test=test=test', 'test-equal-test-equal-test']
+  ];
+
+  _.each(fixtures, function (fixture) {
+    var msg = 'should convert ' + fixture[0] + ' to ' + fixture[1];
+    it(msg, function () {
+      var results = slugifyId(fixture[0]);
+      expect(results).to.be(fixture[1]);
+    });
+  });
+
+  it('should do nothing if the id is undefined', function () {
+    expect(slugifyId(undefined)).to.be(undefined);
+  });
+
+});
\ No newline at end of file
diff --git a/src/ui/public/utils/__tests__/versionmath.js b/src/ui/public/utils/__tests__/versionmath.js
new file mode 100644
index 0000000000000..5fe3323770721
--- /dev/null
+++ b/src/ui/public/utils/__tests__/versionmath.js
@@ -0,0 +1,128 @@
+var _ = require('lodash');
+var versionmath = require('ui/utils/versionmath');
+var expect = require('expect.js');
+var versions = [
+  '1.1.12',
+  '1.1.12',
+  '1.1.12',
+  '1.1.12',
+  '0.90.0',
+  '0.90.1',
+  '1.0.0',
+  '1.0',
+  '1.2.3',
+  '2.0.0',
+  '2.0.1',
+  '2.3.1'
+];
+
+describe('version math (0.90.0 - 2.3.1)', function () {
+  var methods = 'max,min,eq,is,lt,lte,gt,gte'.split(',');
+  describe('methods', function () {
+    it('should have ' + methods.join(', ') + ' methods', function () {
+      _.each(methods, function (method) {
+        expect(versionmath[method]).to.be.a(Function);
+      });
+    });
+  });
+
+  describe('min & max', function () {
+    it('has a max of 2.3.1', function () {
+      expect(versionmath.max(versions)).to.be('2.3.1');
+    });
+
+    it('has a min of 0.90.0', function () {
+      expect(versionmath.min(versions)).to.be('0.90.0');
+    });
+  });
+
+  describe('eq / lowest version', function () {
+    it('should be true for  0.90.0', function () {
+      expect(versionmath.eq('0.90.0', versions)).to.be(true);
+    });
+
+    it('should be false for 1.0', function () {
+      expect(versionmath.eq('1.0', versions)).to.be(false);
+    });
+  });
+
+  describe('gt / lowest version', function () {
+    it('is > 0.20.3', function () {
+      expect(versionmath.gt('0.20.3', versions)).to.be(true);
+    });
+
+    it('is not > 0.90.0', function () {
+      expect(versionmath.gt('0.90.0', versions)).to.be(false);
+    });
+
+    it('is not > 1.0.0', function () {
+      expect(versionmath.gt('1.0.0', versions)).to.be(false);
+    });
+  });
+
+  describe('gte / lowest version', function () {
+    it('is >= 0.20.3', function () {
+      expect(versionmath.gte('0.20.3', versions)).to.be(true);
+    });
+
+    it('is >= 0.90.0', function () {
+      expect(versionmath.gte('0.90.0', versions)).to.be(true);
+    });
+
+    it('is not >= 1.0.0', function () {
+      expect(versionmath.gte('1.0.0', versions)).to.be(false);
+    });
+  });
+
+  describe('lt / highest version', function () {
+    it('is not < 0.20.3', function () {
+      expect(versionmath.lt('0.20.3', versions)).to.be(false);
+    });
+
+    it('is not < 2.3.1', function () {
+      expect(versionmath.lt('2.3.1', versions)).to.be(false);
+    });
+
+    it('is < 2.5', function () {
+      expect(versionmath.lt('2.5', versions)).to.be(true);
+    });
+  });
+
+  describe('lte / highest version', function () {
+    it('is not =< 0.20.3', function () {
+      expect(versionmath.lte('0.20.3', versions)).to.be(false);
+    });
+
+    it('is =< 2.3.1', function () {
+      expect(versionmath.lte('2.3.1', versions)).to.be(true);
+    });
+
+    it('is =< 2.5', function () {
+      expect(versionmath.lte('2.5', versions)).to.be(true);
+    });
+  });
+
+  describe('is', function () {
+    it('exactly, <, <=, >, >=', function () {
+      expect(versionmath.is('0.90.0', versions)).to.be(true);
+      expect(versionmath.is('0.20.0', versions)).to.be(false);
+
+      expect(versionmath.is('>0.20.0', versions)).to.be(true);
+      expect(versionmath.is('>0.90.0', versions)).to.be(false);
+      expect(versionmath.is('>0.90.1', versions)).to.be(false);
+
+      expect(versionmath.is('>=0.20.0', versions)).to.be(true);
+      expect(versionmath.is('>=0.90.0', versions)).to.be(true);
+      expect(versionmath.is('>=0.90.1', versions)).to.be(false);
+
+      expect(versionmath.is('<2.5', versions)).to.be(true);
+      expect(versionmath.is('<2.3.1', versions)).to.be(false);
+      expect(versionmath.is('<0.90.1', versions)).to.be(false);
+
+      expect(versionmath.is('<=2.5', versions)).to.be(true);
+      expect(versionmath.is('<=2.3.1', versions)).to.be(true);
+      expect(versionmath.is('<=0.90.1', versions)).to.be(false);
+    });
+  });
+
+});
diff --git a/src/kibana/utils/add_word_breaks.js b/src/ui/public/utils/add_word_breaks.js
similarity index 100%
rename from src/kibana/utils/add_word_breaks.js
rename to src/ui/public/utils/add_word_breaks.js
diff --git a/src/kibana/utils/brush_event.js b/src/ui/public/utils/brush_event.js
similarity index 100%
rename from src/kibana/utils/brush_event.js
rename to src/ui/public/utils/brush_event.js
diff --git a/src/kibana/utils/datemath.js b/src/ui/public/utils/dateMath.js
similarity index 100%
rename from src/kibana/utils/datemath.js
rename to src/ui/public/utils/dateMath.js
diff --git a/src/kibana/utils/date_range.js b/src/ui/public/utils/date_range.js
similarity index 100%
rename from src/kibana/utils/date_range.js
rename to src/ui/public/utils/date_range.js
diff --git a/src/kibana/utils/decode_geo_hash.js b/src/ui/public/utils/decode_geo_hash.js
similarity index 100%
rename from src/kibana/utils/decode_geo_hash.js
rename to src/ui/public/utils/decode_geo_hash.js
diff --git a/src/kibana/utils/diff_object.js b/src/ui/public/utils/diff_object.js
similarity index 100%
rename from src/kibana/utils/diff_object.js
rename to src/ui/public/utils/diff_object.js
diff --git a/src/kibana/utils/diff_time_picker_vals.js b/src/ui/public/utils/diff_time_picker_vals.js
similarity index 100%
rename from src/kibana/utils/diff_time_picker_vals.js
rename to src/ui/public/utils/diff_time_picker_vals.js
diff --git a/src/kibana/utils/esBool.js b/src/ui/public/utils/esBool.js
similarity index 100%
rename from src/kibana/utils/esBool.js
rename to src/ui/public/utils/esBool.js
diff --git a/src/kibana/utils/key_map.js b/src/ui/public/utils/key_map.js
similarity index 100%
rename from src/kibana/utils/key_map.js
rename to src/ui/public/utils/key_map.js
diff --git a/src/ui/public/utils/lodash-mixins/__tests__/_move.js b/src/ui/public/utils/lodash-mixins/__tests__/_move.js
new file mode 100644
index 0000000000000..4d89a7f29cec2
--- /dev/null
+++ b/src/ui/public/utils/lodash-mixins/__tests__/_move.js
@@ -0,0 +1,162 @@
+describe('_.move', function () {
+  var _ = require('lodash');
+  var expect = require('expect.js');
+
+  it('accepts previous from->to syntax', function () {
+    var list = [
+      1,
+      1,
+      1,
+      1,
+      1,
+      1,
+      1,
+      1,
+      8,
+      1,
+      1,
+    ];
+
+    expect(list[3]).to.be(1);
+    expect(list[8]).to.be(8);
+
+    _.move(list, 8, 3);
+
+    expect(list[8]).to.be(1);
+    expect(list[3]).to.be(8);
+  });
+
+  it('moves an object up based on a function callback', function () {
+    var list = [
+      1,
+      1,
+      1,
+      1,
+      0,
+      1,
+      0,
+      1,
+      1,
+      1,
+      1,
+    ];
+
+    expect(list[4]).to.be(0);
+    expect(list[5]).to.be(1);
+    expect(list[6]).to.be(0);
+
+    _.move(list, 5, false, function (v) {
+      return v === 0;
+    });
+
+    expect(list[4]).to.be(1);
+    expect(list[5]).to.be(0);
+    expect(list[6]).to.be(0);
+  });
+
+  it('moves an object down based on a function callback', function () {
+    var list = [
+      1,
+      1,
+      1,
+      1,
+      0,
+      1,
+      0,
+      1,
+      1,
+      1,
+      1,
+    ];
+
+    expect(list[4]).to.be(0);
+    expect(list[5]).to.be(1);
+    expect(list[6]).to.be(0);
+
+    _.move(list, 5, true, function (v) {
+      return v === 0;
+    });
+
+    expect(list[4]).to.be(0);
+    expect(list[5]).to.be(0);
+    expect(list[6]).to.be(1);
+  });
+
+  it('moves an object up based on a where callback', function () {
+    var list = [
+      { v: 1 },
+      { v: 1 },
+      { v: 1 },
+      { v: 1 },
+      { v: 0 },
+      { v: 1 },
+      { v: 0 },
+      { v: 1 },
+      { v: 1 },
+      { v: 1 },
+      { v: 1 },
+    ];
+
+    expect(list[4]).to.have.property('v', 0);
+    expect(list[5]).to.have.property('v', 1);
+    expect(list[6]).to.have.property('v', 0);
+
+    _.move(list, 5, false, { v: 0 });
+
+    expect(list[4]).to.have.property('v', 1);
+    expect(list[5]).to.have.property('v', 0);
+    expect(list[6]).to.have.property('v', 0);
+  });
+
+
+  it('moves an object up based on a where callback', function () {
+    var list = [
+      { v: 1 },
+      { v: 1 },
+      { v: 1 },
+      { v: 1 },
+      { v: 0 },
+      { v: 1 },
+      { v: 0 },
+      { v: 1 },
+      { v: 1 },
+      { v: 1 },
+      { v: 1 },
+    ];
+
+    expect(list[4]).to.have.property('v', 0);
+    expect(list[5]).to.have.property('v', 1);
+    expect(list[6]).to.have.property('v', 0);
+
+    _.move(list, 5, true, { v: 0 });
+
+    expect(list[4]).to.have.property('v', 0);
+    expect(list[5]).to.have.property('v', 0);
+    expect(list[6]).to.have.property('v', 1);
+  });
+
+  it('moves an object down based on a pluck callback', function () {
+    var list = [
+      { id: 0, normal: true },
+      { id: 1, normal: true },
+      { id: 2, normal: true },
+      { id: 3, normal: true },
+      { id: 4, normal: true },
+      { id: 5, normal: false },
+      { id: 6, normal: true },
+      { id: 7, normal: true },
+      { id: 8, normal: true },
+      { id: 9, normal: true }
+    ];
+
+    expect(list[4]).to.have.property('id', 4);
+    expect(list[5]).to.have.property('id', 5);
+    expect(list[6]).to.have.property('id', 6);
+
+    _.move(list, 5, true, 'normal');
+
+    expect(list[4]).to.have.property('id', 4);
+    expect(list[5]).to.have.property('id', 6);
+    expect(list[6]).to.have.property('id', 5);
+  });
+});
diff --git a/src/ui/public/utils/lodash-mixins/__tests__/_organize_by.js b/src/ui/public/utils/lodash-mixins/__tests__/_organize_by.js
new file mode 100644
index 0000000000000..3832d77f230ec
--- /dev/null
+++ b/src/ui/public/utils/lodash-mixins/__tests__/_organize_by.js
@@ -0,0 +1,48 @@
+describe('_.organize', function () {
+  var _ = require('lodash');
+  var expect = require('expect.js');
+
+  it('it works', function () {
+    var col = [
+      {
+        name: 'one',
+        roles: ['user', 'admin', 'owner']
+      },
+      {
+        name: 'two',
+        roles: ['user']
+      },
+      {
+        name: 'three',
+        roles: ['user']
+      },
+      {
+        name: 'four',
+        roles: ['user', 'admin']
+      }
+    ];
+
+    var resp = _.organizeBy(col, 'roles');
+    expect(resp).to.have.property('user');
+    expect(resp.user).to.have.length(4);
+
+    expect(resp).to.have.property('admin');
+    expect(resp.admin).to.have.length(2);
+
+    expect(resp).to.have.property('owner');
+    expect(resp.owner).to.have.length(1);
+  });
+
+  it('behaves just like groupBy in normal scenarios', function () {
+    var col = [
+      { name: 'one' },
+      { name: 'two' },
+      { name: 'three' },
+      { name: 'four' }
+    ];
+
+    var orgs = _.organizeBy(col, 'name');
+    var groups = _.groupBy(col, 'name');
+    expect(orgs).to.eql(groups);
+  });
+});
diff --git a/src/ui/public/utils/lodash-mixins/__tests__/_push_all.js b/src/ui/public/utils/lodash-mixins/__tests__/_push_all.js
new file mode 100644
index 0000000000000..25925947a1062
--- /dev/null
+++ b/src/ui/public/utils/lodash-mixins/__tests__/_push_all.js
@@ -0,0 +1,14 @@
+describe('_.pushAll', function () {
+  var _ = require('lodash');
+  var expect = require('expect.js');
+
+  it('pushes an entire array into another', function () {
+    var a = [1, 2, 3, 4];
+    var b = [5, 6, 7, 8];
+
+    var output = _.pushAll(b, a);
+    expect(output).to.be(a);
+    expect(a).to.eql([1, 2, 3, 4, 5, 6, 7, 8]);
+    expect(b).to.eql([5, 6, 7, 8]);
+  });
+});
diff --git a/src/ui/public/utils/lodash-mixins/__tests__/index.js b/src/ui/public/utils/lodash-mixins/__tests__/index.js
new file mode 100644
index 0000000000000..b60b3de356286
--- /dev/null
+++ b/src/ui/public/utils/lodash-mixins/__tests__/index.js
@@ -0,0 +1,6 @@
+
+describe('lodash mixins', function () {
+  require('./_move');
+  require('./_organize_by');
+  require('./_push_all');
+});
diff --git a/src/kibana/utils/lodash-mixins/collection.js b/src/ui/public/utils/lodash-mixins/collection.js
similarity index 100%
rename from src/kibana/utils/lodash-mixins/collection.js
rename to src/ui/public/utils/lodash-mixins/collection.js
diff --git a/src/kibana/utils/lodash-mixins/function.js b/src/ui/public/utils/lodash-mixins/function.js
similarity index 100%
rename from src/kibana/utils/lodash-mixins/function.js
rename to src/ui/public/utils/lodash-mixins/function.js
diff --git a/src/kibana/utils/lodash-mixins/lang.js b/src/ui/public/utils/lodash-mixins/lang.js
similarity index 100%
rename from src/kibana/utils/lodash-mixins/lang.js
rename to src/ui/public/utils/lodash-mixins/lang.js
diff --git a/src/kibana/utils/lodash-mixins/object.js b/src/ui/public/utils/lodash-mixins/object.js
similarity index 100%
rename from src/kibana/utils/lodash-mixins/object.js
rename to src/ui/public/utils/lodash-mixins/object.js
diff --git a/src/kibana/utils/lodash-mixins/oop.js b/src/ui/public/utils/lodash-mixins/oop.js
similarity index 100%
rename from src/kibana/utils/lodash-mixins/oop.js
rename to src/ui/public/utils/lodash-mixins/oop.js
diff --git a/src/kibana/utils/lodash-mixins/string.js b/src/ui/public/utils/lodash-mixins/string.js
similarity index 100%
rename from src/kibana/utils/lodash-mixins/string.js
rename to src/ui/public/utils/lodash-mixins/string.js
diff --git a/src/kibana/utils/mapping_setup.js b/src/ui/public/utils/mapping_setup.js
similarity index 95%
rename from src/kibana/utils/mapping_setup.js
rename to src/ui/public/utils/mapping_setup.js
index d4473224e8ce8..d54b6feded7d8 100644
--- a/src/kibana/utils/mapping_setup.js
+++ b/src/ui/public/utils/mapping_setup.js
@@ -1,5 +1,5 @@
 define(function () {
-  return function MappingSetupService(configFile, es) {
+  return function MappingSetupService(kbnIndex, es) {
     var angular = require('angular');
     var _ = require('lodash');
     var mappingSetup = this;
@@ -23,7 +23,7 @@ define(function () {
      * @return {[type]} [description]
      */
     var getKnownKibanaTypes = _.once(function () {
-      var indexName = configFile.kibana_index;
+      var indexName = kbnIndex;
       return es.indices.getFieldMapping({
         // only concerned with types in this kibana index
         index: indexName,
@@ -82,7 +82,7 @@ define(function () {
         };
 
         return es.indices.putMapping({
-          index: configFile.kibana_index,
+          index: kbnIndex,
           type: type,
           body: body
         }).then(function (resp) {
diff --git a/src/kibana/utils/no_white_space.js b/src/ui/public/utils/no_white_space.js
similarity index 100%
rename from src/kibana/utils/no_white_space.js
rename to src/ui/public/utils/no_white_space.js
diff --git a/src/kibana/utils/ordinal_suffix.js b/src/ui/public/utils/ordinal_suffix.js
similarity index 100%
rename from src/kibana/utils/ordinal_suffix.js
rename to src/ui/public/utils/ordinal_suffix.js
diff --git a/src/ui/public/utils/parse_interval.js b/src/ui/public/utils/parse_interval.js
new file mode 100644
index 0000000000000..551fba8e24c7c
--- /dev/null
+++ b/src/ui/public/utils/parse_interval.js
@@ -0,0 +1,36 @@
+define(function (require) {
+  var _ = require('lodash');
+  var moment = require('moment');
+  var dateMath = require('ui/utils/dateMath');
+
+  // Assume interval is in the form (value)(unit), such as "1h"
+  var INTERVAL_STRING_RE = new RegExp('^([0-9\\.]*)\\s*(' + dateMath.units.join('|') + ')$');
+
+  return function parseInterval(interval) {
+    var matches = String(interval).trim().match(INTERVAL_STRING_RE);
+
+    if (!matches) return null;
+
+    try {
+      var value = parseFloat(matches[1]) || 1;
+      var unit = matches[2];
+
+      var duration = moment.duration(value, unit);
+
+      // There is an error with moment, where if you have a fractional interval between 0 and 1, then when you add that
+      // interval to an existing moment object, it will remain unchanged, which causes problems in the ordered_x_keys
+      // code. To counteract this, we find the first unit that doesn't result in a value between 0 and 1.
+      // For example, if you have '0.5d', then when calculating the x-axis series, we take the start date and begin
+      // adding 0.5 days until we hit the end date. However, since there is a bug in moment, when you add 0.5 days to
+      // the start date, you get the same exact date (instead of being ahead by 12 hours). So instead of returning
+      // a duration corresponding to 0.5 hours, we return a duration corresponding to 12 hours.
+      var selectedUnit = _.find(dateMath.units, function (unit) {
+        return Math.abs(duration.as(unit)) >= 1;
+      });
+
+      return moment.duration(duration.as(selectedUnit), selectedUnit);
+    } catch (e) {
+      return null;
+    }
+  };
+});
diff --git a/src/kibana/utils/query_string.js b/src/ui/public/utils/query_string.js
similarity index 100%
rename from src/kibana/utils/query_string.js
rename to src/ui/public/utils/query_string.js
diff --git a/src/kibana/utils/range.js b/src/ui/public/utils/range.js
similarity index 100%
rename from src/kibana/utils/range.js
rename to src/ui/public/utils/range.js
diff --git a/src/kibana/utils/rison.js b/src/ui/public/utils/rison.js
similarity index 100%
rename from src/kibana/utils/rison.js
rename to src/ui/public/utils/rison.js
diff --git a/src/kibana/utils/sequencer.js b/src/ui/public/utils/sequencer.js
similarity index 100%
rename from src/kibana/utils/sequencer.js
rename to src/ui/public/utils/sequencer.js
diff --git a/src/kibana/utils/slugify_id.js b/src/ui/public/utils/slugify_id.js
similarity index 100%
rename from src/kibana/utils/slugify_id.js
rename to src/ui/public/utils/slugify_id.js
diff --git a/src/kibana/utils/supports.js b/src/ui/public/utils/supports.js
similarity index 100%
rename from src/kibana/utils/supports.js
rename to src/ui/public/utils/supports.js
diff --git a/src/kibana/utils/versionmath.js b/src/ui/public/utils/versionmath.js
similarity index 100%
rename from src/kibana/utils/versionmath.js
rename to src/ui/public/utils/versionmath.js
diff --git a/src/kibana/components/validateDateInterval.js b/src/ui/public/validateDateInterval.js
similarity index 85%
rename from src/kibana/components/validateDateInterval.js
rename to src/ui/public/validateDateInterval.js
index 72ba12047f109..2adf577c288e4 100644
--- a/src/kibana/components/validateDateInterval.js
+++ b/src/ui/public/validateDateInterval.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var parseInterval = require('utils/parse_interval');
+  var parseInterval = require('ui/utils/parse_interval');
 
-  require('modules')
+  require('ui/modules')
   .get('kibana')
   .directive('validateDateInterval', function () {
     return {
diff --git a/src/kibana/components/validate_query/lib/from_user.js b/src/ui/public/validate_query/lib/from_user.js
similarity index 91%
rename from src/kibana/components/validate_query/lib/from_user.js
rename to src/ui/public/validate_query/lib/from_user.js
index cbb9cef039136..0eb2e32d93efd 100644
--- a/src/kibana/components/validate_query/lib/from_user.js
+++ b/src/ui/public/validate_query/lib/from_user.js
@@ -1,7 +1,7 @@
 define(function (require) {
   var _ = require('lodash');
   return function GetQueryFromUser(es, Private) {
-    var decorateQuery = Private(require('components/courier/data_source/_decorate_query'));
+    var decorateQuery = Private(require('ui/courier/data_source/_decorate_query'));
 
     /**
      * Take text from the user and make it into a query object
diff --git a/src/kibana/components/validate_query/lib/to_user.js b/src/ui/public/validate_query/lib/to_user.js
similarity index 100%
rename from src/kibana/components/validate_query/lib/to_user.js
rename to src/ui/public/validate_query/lib/to_user.js
diff --git a/src/ui/public/validate_query/validate_query.js b/src/ui/public/validate_query/validate_query.js
new file mode 100644
index 0000000000000..d6c1ba71a673d
--- /dev/null
+++ b/src/ui/public/validate_query/validate_query.js
@@ -0,0 +1,124 @@
+define(function (require) {
+  var _ = require('lodash');
+  var $ = require('jquery');
+
+  require('ui/debounce');
+
+  require('ui/modules')
+    .get('kibana')
+    .directive('validateQuery', function (es, $compile, timefilter, kbnIndex, debounce, Private) {
+      var fromUser = Private(require('ui/validate_query/lib/from_user'));
+      var toUser = require('ui/validate_query/lib/to_user');
+
+      return {
+        restrict: 'A',
+        require: 'ngModel',
+        scope: {
+          'ngModel': '=',
+          'queryInput': '=?',
+        },
+        link: function ($scope, elem, attr, ngModel) {
+
+          // track request so we can abort it if needed
+          var request = {};
+
+          var errorElem = $('<i tooltip={{tooltipMsg}} class="fa fa-ban input-error"></i>').hide();
+          $compile(errorElem)($scope);
+
+          var init = function () {
+            elem.after(errorElem);
+            $scope.ngModel = fromUser($scope.ngModel);
+            validator($scope.ngModel);
+          };
+
+          var validator = function (query) {
+            var index, type;
+            if (request.abort) request.abort();
+
+            if ($scope.queryInput) {
+              useSearchSource();
+            } else {
+              useDefaults();
+            }
+
+            return sendRequest();
+
+            function useSearchSource() {
+              var pattern = $scope.queryInput.get('index');
+              if (!pattern) return useDefaults();
+
+              if (_.isString(pattern)) {
+                index = pattern;
+              } else if (_.isFunction(pattern.toIndexList)) {
+                index = pattern.toIndexList();
+              } else {
+                useDefaults();
+              }
+            }
+
+            function useDefaults() {
+              index = kbnIndex;
+              type = '__kibanaQueryValidator';
+            }
+
+            function sendRequest() {
+              request = es.indices.validateQuery({
+                index: index,
+                type: type,
+                explain: true,
+                ignoreUnavailable: true,
+                body: {
+                  query: query || { match_all: {} }
+                }
+              })
+              .then(success, error);
+            }
+
+            function error(resp) {
+              var msg;
+
+              ngModel.$setValidity('queryInput', false);
+
+              if (resp.explanations && resp.explanations[0]) {
+                msg = resp.explanations[0].error;
+              } else {
+                msg = resp.body.error;
+              }
+
+              $scope.tooltipMsg = msg;
+              errorElem.show();
+
+              return undefined;
+            }
+
+            function success(resp) {
+              if (resp.valid) {
+                ngModel.$setValidity('queryInput', true);
+                errorElem.hide();
+                return query;
+              } else {
+                return error(resp);
+              }
+            }
+          };
+
+          var debouncedValidator = debounce(validator, 300, {
+            leading: true,
+            trailing: true
+          });
+
+          ngModel.$parsers.push(fromUser);
+          ngModel.$formatters.push(toUser);
+
+          // Use a model watch instead of parser/formatter. Parsers require the
+          // user to actually enter input, which may not happen if the back button is clicked
+          $scope.$watch('ngModel', function (newValue, oldValue) {
+            if (newValue === oldValue) return;
+            debouncedValidator(newValue);
+          });
+
+          init();
+        }
+      };
+    });
+});
diff --git a/src/ui/public/vislib/__tests__/components/color.js b/src/ui/public/vislib/__tests__/components/color.js
new file mode 100644
index 0000000000000..f896773893178
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/components/color.js
@@ -0,0 +1,215 @@
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+describe('Vislib Color Module Test Suite', function () {
+  var seedColors;
+  var MappedColors, mappedColors;
+
+  describe('Color (main)', function () {
+    var getColors;
+    var arr = ['good', 'better', 'best', 'never', 'let', 'it', 'rest'];
+    var arrayOfNumbers = [1, 2, 3, 4, 5];
+    var arrayOfUndefinedValues = [undefined, undefined, undefined];
+    var arrayOfObjects = [{}, {}, {}];
+    var arrayOfBooleans = [true, false, true];
+    var arrayOfNullValues = [null, null, null];
+    var emptyObject = {};
+    var nullValue = null;
+    var notAValue;
+    var color;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      seedColors = Private(require('ui/vislib/components/color/seed_colors'));
+      getColors = Private(require('ui/vislib/components/color/color'));
+      MappedColors = Private(require('ui/vislib/components/color/mapped_colors'));
+      mappedColors = new MappedColors();
+      color = getColors(arr);
+    }));
+
+    it('should throw an error if input is not an array', function () {
+      expect(function () {
+        getColors(200);
+      }).to.throwError();
+
+      expect(function () {
+        getColors('help');
+      }).to.throwError();
+
+      expect(function () {
+        getColors(true);
+      }).to.throwError();
+
+      expect(function () {
+        getColors(notAValue);
+      }).to.throwError();
+
+      expect(function () {
+        getColors(nullValue);
+      }).to.throwError();
+
+      expect(function () {
+        getColors(emptyObject);
+      }).to.throwError();
+    });
+
+    it('should throw an error if array is not composed of numbers, strings, or ' +
+      'undefined values', function () {
+      expect(function () {
+        getColors(arrayOfObjects);
+      }).to.throwError();
+
+      expect(function () {
+        getColors(arrayOfBooleans);
+      }).to.throwError();
+
+      expect(function () {
+        getColors(arrayOfNullValues);
+      }).to.throwError();
+    });
+
+    it('should not throw an error if input is an array of strings, numbers, or' +
+      ' undefined values', function () {
+      expect(function () {
+        getColors(arr);
+      }).to.not.throwError();
+
+      expect(function () {
+        getColors(arrayOfNumbers);
+      }).to.not.throwError();
+
+      expect(function () {
+        getColors(arrayOfUndefinedValues);
+      }).to.not.throwError();
+    });
+
+    it('should be a function', function () {
+      expect(typeof getColors).to.be('function');
+    });
+
+    it('should return a function', function () {
+      expect(typeof color).to.be('function');
+    });
+
+    it('should return the first hex color in the seed colors array', function () {
+      expect(color(arr[0])).to.be(seedColors[0]);
+    });
+
+    it('should return the value from the mapped colors', function () {
+      expect(color(arr[1])).to.be(mappedColors.get(arr[1]));
+    });
+  });
+
+  describe('Seed Colors', function () {
+    it('should return an array', function () {
+      expect(seedColors instanceof Array).to.be(true);
+    });
+  });
+
+  describe('Mapped Colors', function () {
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      MappedColors = Private(require('ui/vislib/components/color/mapped_colors'));
+      mappedColors = new MappedColors();
+    }));
+
+    it('should clear all the keys from the map table', function () {
+      mappedColors.reset();
+      expect(mappedColors.count()).to.be(0);
+    });
+
+    it('should return the color for the added value', function () {
+      mappedColors.reset();
+      mappedColors.add('value1', '#somecolor');
+      expect(mappedColors.get('value1')).to.be('#somecolor');
+    });
+
+    it('should return the count of mapped keys', function () {
+      mappedColors.reset();
+      mappedColors.add('value1', '#color1');
+      mappedColors.add('value2', '#color2');
+      expect(mappedColors.count()).to.be(2);
+    });
+
+    it('should return all the colors in the map', function () {
+      mappedColors.reset();
+      mappedColors.add('value1', '#colors1');
+      mappedColors.add('value3', '#newColor');
+      expect(mappedColors.all()).to.eql(['#colors1', '#newColor']);
+    });
+  });
+
+  describe('Color Palette', function () {
+    var num1 = 45;
+    var num2 = 72;
+    var num3 = 90;
+    var string = 'Welcome';
+    var bool = true;
+    var nullValue = null;
+    var emptyArr = [];
+    var emptyObject = {};
+    var notAValue;
+    var createColorPalette;
+    var colorPalette;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      seedColors = Private(require('ui/vislib/components/color/seed_colors'));
+      createColorPalette = Private(require('ui/vislib/components/color/color_palette'));
+      colorPalette = createColorPalette(num1);
+    }));
+
+    it('should throw an error if input is not a number', function () {
+      expect(function () {
+        createColorPalette(string);
+      }).to.throwError();
+
+      expect(function () {
+        createColorPalette(bool);
+      }).to.throwError();
+
+      expect(function () {
+        createColorPalette(nullValue);
+      }).to.throwError();
+
+      expect(function () {
+        createColorPalette(emptyArr);
+      }).to.throwError();
+
+      expect(function () {
+        createColorPalette(emptyObject);
+      }).to.throwError();
+
+      expect(function () {
+        createColorPalette(notAValue);
+      }).to.throwError();
+    });
+
+    it('should be a function', function () {
+      expect(typeof createColorPalette).to.be('function');
+    });
+
+    it('should return an array', function () {
+      expect(colorPalette instanceof Array).to.be(true);
+    });
+
+    it('should return an array of the same length as the input', function () {
+      expect(colorPalette.length).to.be(num1);
+    });
+
+    it('should return the seed color array when input length is 72', function () {
+      expect(createColorPalette(num2)[71]).to.be(seedColors[71]);
+    });
+
+    it('should return an array of the same length as the input when input is greater than 72', function () {
+      expect(createColorPalette(num3).length).to.be(num3);
+    });
+
+    it('should create new darker colors when input is greater than 72', function () {
+      expect(createColorPalette(num3)[72]).not.to.equal(seedColors[0]);
+    });
+
+  });
+});
diff --git a/src/ui/public/vislib/__tests__/components/labels.js b/src/ui/public/vislib/__tests__/components/labels.js
new file mode 100644
index 0000000000000..0882b20eb985c
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/components/labels.js
@@ -0,0 +1,431 @@
+var angular = require('angular');
+var _ = require('lodash');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+var getLabels;
+var seriesLabels;
+var rowsLabels;
+var seriesArr;
+var rowsArr;
+var uniqLabels;
+var error;
+
+var seriesData = {
+  'label': '',
+  'series': [
+    {
+      'label': '100',
+      'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+    }
+  ]
+};
+
+var rowsData = {
+  'rows': [
+    {
+      'label': 'a',
+      'series': [
+        {
+          'label': '100',
+          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+        }
+      ]
+    },
+    {
+      'label': 'b',
+      'series': [
+        {
+          'label': '300',
+          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+        }
+      ]
+    },
+    {
+      'label': 'c',
+      'series': [
+        {
+          'label': '100',
+          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+        }
+      ]
+    },
+    {
+      'label': 'd',
+      'series': [
+        {
+          'label': '200',
+          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+        }
+      ]
+    }
+  ]
+};
+
+var columnsData = {
+  'columns': [
+    {
+      'label': 'a',
+      'series': [
+        {
+          'label': '100',
+          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+        }
+      ]
+    },
+    {
+      'label': 'b',
+      'series': [
+        {
+          'label': '300',
+          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+        }
+      ]
+    },
+    {
+      'label': 'c',
+      'series': [
+        {
+          'label': '100',
+          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+        }
+      ]
+    },
+    {
+      'label': 'd',
+      'series': [
+        {
+          'label': '200',
+          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+        }
+      ]
+    }
+  ]
+};
+
+describe('Vislib Labels Module Test Suite', function () {
+
+  describe('Labels (main)', function () {
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      getLabels = Private(require('ui/vislib/components/labels/labels'));
+      seriesLabels = getLabels(seriesData);
+      rowsLabels = getLabels(rowsData);
+      seriesArr = _.isArray(seriesLabels);
+      rowsArr = _.isArray(rowsLabels);
+      uniqLabels = _.chain(rowsData.rows)
+        .pluck('series')
+        .flattenDeep()
+        .pluck('label')
+        .uniq()
+        .value();
+    }));
+
+    it('should be a function', function () {
+      expect(typeof getLabels).to.be('function');
+    });
+
+    it('should return an array if input is data.series', function () {
+      expect(seriesArr).to.be(true);
+    });
+
+    it('should return an array if input is data.rows', function () {
+      expect(rowsArr).to.be(true);
+    });
+
+    it('should throw an error if input is not an object', function () {
+      expect(function () {
+        getLabels('string not object');
+      }).to.throwError();
+    });
+
+    it('should return unique label values', function () {
+      expect(rowsLabels[0]).to.equal(uniqLabels[0]);
+      expect(rowsLabels[1]).to.equal(uniqLabels[1]);
+      expect(rowsLabels[2]).to.equal(uniqLabels[2]);
+    });
+
+  });
+
+  describe('Data array', function () {
+    var childrenObject = {
+      children: []
+    };
+    var seriesObject = {
+      series: []
+    };
+    var rowsObject = {
+      rows: []
+    };
+    var columnsObject = {
+      columns: []
+    };
+    var string = 'string';
+    var number = 23;
+    var boolean = false;
+    var emptyArray = [];
+    var nullValue = null;
+    var notAValue;
+    var dataArray;
+    var testSeries;
+    var testRows;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      dataArray = Private(require('ui/vislib/components/labels/data_array'));
+      seriesLabels = dataArray(seriesData);
+      rowsLabels = dataArray(rowsData);
+      testSeries = _.isArray(seriesLabels);
+      testRows = _.isArray(rowsLabels);
+    }));
+
+    it('should throw an error if the input is not an object', function () {
+      expect(function () {
+        dataArray(string);
+      }).to.throwError();
+
+      expect(function () {
+        dataArray(number);
+      }).to.throwError();
+
+      expect(function () {
+        dataArray(boolean);
+      }).to.throwError();
+
+      expect(function () {
+        dataArray(emptyArray);
+      }).to.throwError();
+
+      expect(function () {
+        dataArray(nullValue);
+      }).to.throwError();
+
+      expect(function () {
+        dataArray(notAValue);
+      }).to.throwError();
+    });
+
+    it(
+      'should throw an error if property series, rows, or ' +
+      'columns is not present',
+      function () {
+        expect(function () {
+          dataArray(childrenObject);
+        }).to.throwError();
+      }
+    );
+
+    it(
+      'should not throw an error if object has property series, rows, or ' +
+      'columns',
+      function () {
+        expect(function () {
+          dataArray(seriesObject);
+        }).to.not.throwError();
+
+        expect(function () {
+          dataArray(rowsObject);
+        }).to.not.throwError();
+
+        expect(function () {
+          dataArray(columnsObject);
+        }).to.not.throwError();
+      }
+    );
+
+    it('should be a function', function () {
+      expect(typeof dataArray).to.equal('function');
+    });
+
+    it('should return an array of objects if input is data.series', function () {
+      expect(testSeries).to.equal(true);
+    });
+
+    it('should return an array of objects if input is data.rows', function () {
+      expect(testRows).to.equal(true);
+    });
+
+    it('should return an array of same length as input data.series', function () {
+      expect(seriesLabels.length).to.equal(seriesData.series.length);
+    });
+
+    it('should return an array of same length as input data.rows', function () {
+      expect(rowsLabels.length).to.equal(rowsData.rows.length);
+    });
+
+    it('should return an array of objects with obj.labels and obj.values', function () {
+      expect(seriesLabels[0].label).to.equal('100');
+      expect(seriesLabels[0].values[0].x).to.equal(0);
+      expect(seriesLabels[0].values[0].y).to.equal(1);
+    });
+
+  });
+
+  describe('Unique labels', function () {
+    var uniqLabels;
+    var arrObj = [
+      {'label': 'a'},
+      {'label': 'b'},
+      {'label': 'b'},
+      {'label': 'c'},
+      {'label': 'c'},
+      {'label': 'd'},
+      {'label': 'f'}
+    ];
+    var string = 'string';
+    var number = 24;
+    var boolean = false;
+    var nullValue = null;
+    var emptyObject = {};
+    var emptyArray = [];
+    var notAValue;
+    var uniq;
+    var testArr;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      uniqLabels = Private(require('ui/vislib/components/labels/uniq_labels'));
+      uniq = uniqLabels(arrObj, function (d) { return d; });
+      testArr = _.isArray(uniq);
+    }));
+
+    it('should throw an error if input is not an array', function () {
+      expect(function () {
+        uniqLabels(string);
+      }).to.throwError();
+
+      expect(function () {
+        uniqLabels(number);
+      }).to.throwError();
+
+      expect(function () {
+        uniqLabels(boolean);
+      }).to.throwError();
+
+      expect(function () {
+        uniqLabels(nullValue);
+      }).to.throwError();
+
+      expect(function () {
+        uniqLabels(emptyObject);
+      }).to.throwError();
+
+      expect(function () {
+        uniqLabels(notAValue);
+      }).to.throwError();
+    });
+
+    it('should not throw an error if the input is an array', function () {
+      expect(function () {
+        uniqLabels(emptyArray);
+      }).to.not.throwError();
+    });
+
+    it('should be a function', function () {
+      expect(typeof uniqLabels).to.be('function');
+    });
+
+    it('should return an array', function () {
+      expect(testArr).to.be(true);
+    });
+
+    it('should return array of 5 unique values', function () {
+      expect(uniq.length).to.be(5);
+    });
+
+  });
+
+  describe('Get series', function () {
+    var string = 'string';
+    var number = 24;
+    var boolean = false;
+    var nullValue = null;
+    var rowsObject = {
+      rows: []
+    };
+    var columnsObject = {
+      columns: []
+    };
+    var emptyObject = {};
+    var emptyArray = [];
+    var notAValue;
+    var getSeries;
+    var columnsLabels;
+    var rowsLabels;
+    var columnsArr;
+    var rowsArr;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      getSeries = Private(require('ui/vislib/components/labels/flatten_series'));
+      columnsLabels = getSeries(columnsData);
+      rowsLabels = getSeries(rowsData);
+      columnsArr = _.isArray(columnsLabels);
+      rowsArr = _.isArray(rowsLabels);
+    }));
+
+    it('should throw an error if input is not an object', function () {
+      expect(function () {
+        getSeries(string);
+      }).to.throwError();
+
+      expect(function () {
+        getSeries(number);
+      }).to.throwError();
+
+      expect(function () {
+        getSeries(boolean);
+      }).to.throwError();
+
+      expect(function () {
+        getSeries(nullValue);
+      }).to.throwError();
+
+      expect(function () {
+        getSeries(emptyArray);
+      }).to.throwError();
+
+      expect(function () {
+        getSeries(notAValue);
+      }).to.throwError();
+    });
+
+    it('should throw an if property rows or columns is not set on the object', function () {
+      expect(function () {
+        getSeries(emptyObject);
+      }).to.throwError();
+    });
+
+    it('should not throw an error if rows or columns set on object', function () {
+      expect(function () {
+        getSeries(rowsObject);
+      }).to.not.throwError();
+
+      expect(function () {
+        getSeries(columnsObject);
+      }).to.not.throwError();
+    });
+
+    it('should be a function', function () {
+      expect(typeof getSeries).to.be('function');
+    });
+
+    it('should return an array if input is data.columns', function () {
+      expect(columnsArr).to.be(true);
+    });
+
+    it('should return an array if input is data.rows', function () {
+      expect(rowsArr).to.be(true);
+    });
+
+    it('should return an array of the same length as as input data.columns', function () {
+      expect(columnsLabels.length).to.be(columnsData.columns.length);
+    });
+
+    it('should return an array of the same length as as input data.rows', function () {
+      expect(rowsLabels.length).to.be(rowsData.rows.length);
+    });
+
+  });
+
+});
diff --git a/src/ui/public/vislib/__tests__/components/zero_injection.js b/src/ui/public/vislib/__tests__/components/zero_injection.js
new file mode 100644
index 0000000000000..5da63afb33a0a
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/components/zero_injection.js
@@ -0,0 +1,666 @@
+
+var angular = require('angular');
+var _ = require('lodash');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+describe('Vislib Zero Injection Module Test Suite', function () {
+  var dateHistogramRows = {
+    'rows': [
+      {
+        'label': 'Top 5 @tags: success',
+        'ordered': {
+          'date': true,
+          'interval': 60000,
+          'min': 1418410540548,
+          'max': 1418410936568
+        },
+        'series': [
+          {
+            'label': 'jpg',
+            'values': [
+              { 'x': 1418410560000, 'y': 2 },
+              { 'x': 1418410620000, 'y': 4 },
+              { 'x': 1418410680000, 'y': 1 },
+              { 'x': 1418410740000, 'y': 5 },
+              { 'x': 1418410800000, 'y': 2 },
+              { 'x': 1418410860000, 'y': 3 },
+              { 'x': 1418410920000, 'y': 2 }
+            ]
+          },
+          {
+            'label': 'css',
+            'values': [
+              { 'x': 1418410560000, 'y': 1 },
+              { 'x': 1418410620000, 'y': 3 },
+              { 'x': 1418410680000, 'y': 1 },
+              { 'x': 1418410740000, 'y': 4 },
+              { 'x': 1418410800000, 'y': 2 }
+            ]
+          },
+          {
+            'label': 'gif',
+            'values': [
+              { 'x': 1418410500000, 'y': 1 },
+              { 'x': 1418410680000, 'y': 3 },
+              { 'x': 1418410740000, 'y': 2 }
+            ]
+          }
+        ]
+      },
+      {
+        'label': 'Top 5 @tags: info',
+        'ordered': {
+          'date': true,
+          'interval': 60000,
+          'min': 1418410540548,
+          'max': 1418410936568
+        },
+        'series': [
+          {
+            'label': 'jpg',
+            'values': [
+              { 'x': 1418410560000, 'y': 4 },
+              { 'x': 1418410620000, 'y': 2 },
+              { 'x': 1418410680000, 'y': 1 },
+              { 'x': 1418410740000, 'y': 5 },
+              { 'x': 1418410800000, 'y': 2 },
+              { 'x': 1418410860000, 'y': 3 },
+              { 'x': 1418410920000, 'y': 2 }
+            ]
+          },
+          {
+            'label': 'css',
+            'values': [
+              { 'x': 1418410620000, 'y': 3 },
+              { 'x': 1418410680000, 'y': 1 },
+              { 'x': 1418410740000, 'y': 4 },
+              { 'x': 1418410800000, 'y': 2 }
+            ]
+          },
+          {
+            'label': 'gif',
+            'values': [
+              { 'x': 1418410500000, 'y': 1 }
+            ]
+          }
+        ]
+      },
+      {
+        'label': 'Top 5 @tags: security',
+        'ordered': {
+          'date': true,
+          'interval': 60000,
+          'min': 1418410540548,
+          'max': 1418410936568
+        },
+        'series': [
+          {
+            'label': 'jpg',
+            'values': [
+              { 'x': 1418410560000, 'y': 1 },
+              { 'x': 1418410620000, 'y': 3 },
+              { 'x': 1418410920000, 'y': 2 }
+            ]
+          },
+          {
+            'label': 'gif',
+            'values': [
+              { 'x': 1418410680000, 'y': 3 },
+              { 'x': 1418410740000, 'y': 1 }
+            ]
+          }
+        ]
+      },
+      {
+        'label': 'Top 5 @tags: login',
+        'ordered': {
+          'date': true,
+          'interval': 60000,
+          'min': 1418410540548,
+          'max': 1418410936568
+        },
+        'series': [
+          {
+            'label': 'jpg',
+            'values': [
+              { 'x': 1418410740000, 'y': 1 }
+            ]
+          },
+          {
+            'label': 'css',
+            'values': [
+              { 'x': 1418410560000, 'y': 1 }
+            ]
+          }
+        ]
+      },
+      {
+        'label': 'Top 5 @tags: warning',
+        'ordered': {
+          'date': true,
+          'interval': 60000,
+          'min': 1418410540548,
+          'max': 1418410936568
+        },
+        'series': [
+          {
+            'label': 'jpg',
+            'values': [
+              { 'x': 1418410860000, 'y': 2 }
+            ]
+          }
+        ]
+      }
+    ]
+  };
+
+  var seriesData = {
+    series: [
+      {
+        label: '200',
+        values: [
+          {x: 'v1', y: 234},
+          {x: 'v2', y: 34},
+          {x: 'v3', y: 834},
+          {x: 'v4', y: 1234},
+          {x: 'v5', y: 4}
+        ]
+      }
+    ]
+  };
+
+  var multiSeriesData = {
+    series: [
+      {
+        label: '200',
+        values: [
+          {x: '1', y: 234},
+          {x: '2', y: 34},
+          {x: '3', y: 834},
+          {x: '4', y: 1234},
+          {x: '5', y: 4}
+        ]
+      },
+      {
+        label: '404',
+        values: [
+          {x: '1', y: 1234},
+          {x: '3', y: 234},
+          {x: '5', y: 34}
+        ]
+      },
+      {
+        label: '503',
+        values: [
+          {x: '3', y: 834}
+        ]
+      }
+    ]
+  };
+
+  var multiSeriesNumberedData = {
+    series: [
+      {
+        label: '200',
+        values: [
+          {x: 1, y: 234},
+          {x: 2, y: 34},
+          {x: 3, y: 834},
+          {x: 4, y: 1234},
+          {x: 5, y: 4}
+        ]
+      },
+      {
+        label: '404',
+        values: [
+          {x: 1, y: 1234},
+          {x: 3, y: 234},
+          {x: 5, y: 34}
+        ]
+      },
+      {
+        label: '503',
+        values: [
+          {x: 3, y: 834}
+        ]
+      }
+    ]
+  };
+
+  var childrenObject = {
+    children: []
+  };
+  var seriesObject = {
+    series: []
+  };
+  var rowsObject = {
+    rows: []
+  };
+  var columnsObject = {
+    columns: []
+  };
+  var emptyObject = {};
+  var str = 'string';
+  var number = 24;
+  var boolean = false;
+  var nullValue = null;
+  var emptyArray = [];
+  var notAValue;
+
+  describe('Zero Injection (main)', function () {
+    var injectZeros;
+    var sample1;
+    var sample2;
+    var sample3;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      injectZeros = Private(require('ui/vislib/components/zero_injection/inject_zeros'));
+      sample1 = injectZeros(seriesData);
+      sample2 = injectZeros(multiSeriesData);
+      sample3 = injectZeros(multiSeriesNumberedData);
+    }));
+
+    it('should throw an error if the input is not an object', function () {
+      expect(function () {
+        injectZeros(str);
+      }).to.throwError();
+
+      expect(function () {
+        injectZeros(number);
+      }).to.throwError();
+
+      expect(function () {
+        injectZeros(boolean);
+      }).to.throwError();
+
+      expect(function () {
+        injectZeros(emptyArray);
+      }).to.throwError();
+
+      expect(function () {
+        injectZeros(nullValue);
+      }).to.throwError();
+
+      expect(function () {
+        injectZeros(notAValue);
+      }).to.throwError();
+    });
+
+    it('should throw an error if property series, rows, or columns is not ' +
+    'present', function () {
+
+      expect(function () {
+        injectZeros(childrenObject);
+      }).to.throwError();
+    });
+
+    it('should not throw an error if object has property series, rows, or ' +
+    'columns', function () {
+
+      expect(function () {
+        injectZeros(seriesObject);
+      }).to.not.throwError();
+
+      expect(function () {
+        injectZeros(rowsObject);
+      }).to.not.throwError();
+
+      expect(function () {
+        injectZeros(columnsObject);
+      }).to.not.throwError();
+    });
+
+    it('should be a function', function () {
+      expect(_.isFunction(injectZeros)).to.be(true);
+    });
+
+    it('should return an object with series[0].values', function () {
+      expect(_.isObject(sample1)).to.be(true);
+      expect(_.isObject(sample1.series[0].values)).to.be(true);
+    });
+
+    it('should return the same array of objects when the length of the series array is 1', function () {
+      expect(sample1.series[0].values[0].x).to.be(seriesData.series[0].values[0].x);
+      expect(sample1.series[0].values[1].x).to.be(seriesData.series[0].values[1].x);
+      expect(sample1.series[0].values[2].x).to.be(seriesData.series[0].values[2].x);
+      expect(sample1.series[0].values[3].x).to.be(seriesData.series[0].values[3].x);
+      expect(sample1.series[0].values[4].x).to.be(seriesData.series[0].values[4].x);
+    });
+
+    it('should inject zeros in the input array', function () {
+      expect(sample2.series[1].values[1].y).to.be(0);
+      expect(sample2.series[2].values[0].y).to.be(0);
+      expect(sample2.series[2].values[1].y).to.be(0);
+      expect(sample2.series[2].values[4].y).to.be(0);
+      expect(sample3.series[1].values[1].y).to.be(0);
+      expect(sample3.series[2].values[0].y).to.be(0);
+      expect(sample3.series[2].values[1].y).to.be(0);
+      expect(sample3.series[2].values[4].y).to.be(0);
+    });
+
+    it('should return values arrays with the same x values', function () {
+      expect(sample2.series[1].values[0].x).to.be(sample2.series[2].values[0].x);
+      expect(sample2.series[1].values[1].x).to.be(sample2.series[2].values[1].x);
+      expect(sample2.series[1].values[2].x).to.be(sample2.series[2].values[2].x);
+      expect(sample2.series[1].values[3].x).to.be(sample2.series[2].values[3].x);
+      expect(sample2.series[1].values[4].x).to.be(sample2.series[2].values[4].x);
+    });
+
+    it('should return values arrays of the same length', function () {
+      expect(sample2.series[0].values.length).to.be(sample2.series[1].values.length);
+      expect(sample2.series[0].values.length).to.be(sample2.series[2].values.length);
+      expect(sample2.series[1].values.length).to.be(sample2.series[2].values.length);
+    });
+  });
+
+  describe('Order X Values', function () {
+    var orderXValues;
+    var results;
+    var numberedResults;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      orderXValues = Private(require('ui/vislib/components/zero_injection/ordered_x_keys'));
+      results = orderXValues(multiSeriesData);
+      numberedResults = orderXValues(multiSeriesNumberedData);
+    }));
+
+    it('should throw an error if input is not an object', function () {
+      expect(function () {
+        orderXValues(str);
+      }).to.throwError();
+
+      expect(function () {
+        orderXValues(number);
+      }).to.throwError();
+
+      expect(function () {
+        orderXValues(boolean);
+      }).to.throwError();
+
+      expect(function () {
+        orderXValues(nullValue);
+      }).to.throwError();
+
+      expect(function () {
+        orderXValues(emptyArray);
+      }).to.throwError();
+
+      expect(function () {
+        orderXValues(notAValue);
+      }).to.throwError();
+    });
+
+    it('should return a function', function () {
+      expect(_.isFunction(orderXValues)).to.be(true);
+    });
+
+    it('should return an array', function () {
+      expect(_.isArray(results)).to.be(true);
+    });
+
+    it('should return an array of values in the correct order', function () {
+      expect(results[0]).to.be('1');
+      expect(results[1]).to.be('2');
+      expect(results[2]).to.be('3');
+      expect(results[3]).to.be('4');
+      expect(results[4]).to.be('5');
+      expect(numberedResults[0]).to.be(1);
+      expect(numberedResults[1]).to.be(2);
+      expect(numberedResults[2]).to.be(3);
+      expect(numberedResults[3]).to.be(4);
+      expect(numberedResults[4]).to.be(5);
+    });
+  });
+
+  describe('Unique Keys', function () {
+    var uniqueKeys;
+    var results;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      uniqueKeys = Private(require('ui/vislib/components/zero_injection/uniq_keys'));
+      results = uniqueKeys(multiSeriesData);
+    }));
+
+    it('should throw an error if input is not an object', function () {
+      expect(function () {
+        uniqueKeys(str);
+      }).to.throwError();
+
+      expect(function () {
+        uniqueKeys(number);
+      }).to.throwError();
+
+      expect(function () {
+        uniqueKeys(boolean);
+      }).to.throwError();
+
+      expect(function () {
+        uniqueKeys(nullValue);
+      }).to.throwError();
+
+      expect(function () {
+        uniqueKeys(emptyArray);
+      }).to.throwError();
+
+      expect(function () {
+        uniqueKeys(notAValue);
+      }).to.throwError();
+    });
+
+    it('should return a function', function () {
+      expect(_.isFunction(uniqueKeys)).to.be(true);
+    });
+
+    it('should return an object', function () {
+      expect(_.isObject(results)).to.be(true);
+    });
+
+    it('should return an object of unique keys', function () {
+      expect(_.uniq(_.keys(results)).length).to.be(_.keys(results).length);
+    });
+  });
+
+  describe('Flatten Data', function () {
+    var flattenData;
+    var results;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      flattenData = Private(require('ui/vislib/components/zero_injection/flatten_data'));
+      results = flattenData(multiSeriesData);
+    }));
+
+    it('should return a function', function () {
+      expect(_.isFunction(flattenData)).to.be(true);
+    });
+
+    it('should return an array', function () {
+      expect(_.isArray(results)).to.be(true);
+    });
+
+    it('should return an array of objects', function () {
+      expect(_.isObject(results[0])).to.be(true);
+      expect(_.isObject(results[1])).to.be(true);
+      expect(_.isObject(results[2])).to.be(true);
+    });
+  });
+
+  describe('Zero Filled Array', function () {
+    var createZeroArray;
+    var arr1 = [1, 2, 3, 4, 5];
+    var arr2 = ['1', '2', '3', '4', '5'];
+    var results1;
+    var results2;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      createZeroArray = Private(require('ui/vislib/components/zero_injection/zero_filled_array'));
+      results1 = createZeroArray(arr1);
+      results2 = createZeroArray(arr2);
+    }));
+
+    it('should throw an error if input is not an array', function () {
+      expect(function () {
+        createZeroArray(str);
+      }).to.throwError();
+
+      expect(function () {
+        createZeroArray(number);
+      }).to.throwError();
+
+      expect(function () {
+        createZeroArray(boolean);
+      }).to.throwError();
+
+      expect(function () {
+        createZeroArray(nullValue);
+      }).to.throwError();
+
+      expect(function () {
+        createZeroArray(emptyObject);
+      }).to.throwError();
+
+      expect(function () {
+        createZeroArray(notAValue);
+      }).to.throwError();
+    });
+
+    it('should return a function', function () {
+      expect(_.isFunction(createZeroArray)).to.be(true);
+    });
+
+    it('should return an array', function () {
+      expect(_.isArray(results1)).to.be(true);
+    });
+
+    it('should return an array of objects', function () {
+      expect(_.isObject(results1[0])).to.be(true);
+      expect(_.isObject(results1[1])).to.be(true);
+      expect(_.isObject(results1[2])).to.be(true);
+      expect(_.isObject(results1[3])).to.be(true);
+      expect(_.isObject(results1[4])).to.be(true);
+    });
+
+    it('should return an array of objects where each y value is 0', function () {
+      expect(results1[0].y).to.be(0);
+      expect(results1[1].y).to.be(0);
+      expect(results1[2].y).to.be(0);
+      expect(results1[3].y).to.be(0);
+      expect(results1[4].y).to.be(0);
+    });
+
+    it('should return an array of objects where each x values are numbers', function () {
+      expect(_.isNumber(results1[0].x)).to.be(true);
+      expect(_.isNumber(results1[1].x)).to.be(true);
+      expect(_.isNumber(results1[2].x)).to.be(true);
+      expect(_.isNumber(results1[3].x)).to.be(true);
+      expect(_.isNumber(results1[4].x)).to.be(true);
+    });
+
+    it('should return an array of objects where each x values are strings', function () {
+      expect(_.isString(results2[0].x)).to.be(true);
+      expect(_.isString(results2[1].x)).to.be(true);
+      expect(_.isString(results2[2].x)).to.be(true);
+      expect(_.isString(results2[3].x)).to.be(true);
+      expect(_.isString(results2[4].x)).to.be(true);
+    });
+  });
+
+  describe('Zero Filled Data Array', function () {
+    var zeroFillArray;
+    var xValueArr = [1, 2, 3, 4, 5];
+    var createZeroArray;
+    var arr1;
+    var arr2 = [ {x: 3, y: 834} ];
+    var results;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      zeroFillArray = Private(require('ui/vislib/components/zero_injection/zero_fill_data_array'));
+      createZeroArray = Private(require('ui/vislib/components/zero_injection/zero_filled_array'));
+      arr1 = createZeroArray(xValueArr);
+
+      // Takes zero array as 1st arg and data array as 2nd arg
+      results = zeroFillArray(arr1, arr2);
+    }));
+
+    it('should throw an error if input are not arrays', function () {
+      expect(function () {
+        zeroFillArray(str, str);
+      }).to.throwError();
+
+      expect(function () {
+        zeroFillArray(number, number);
+      }).to.throwError();
+
+      expect(function () {
+        zeroFillArray(boolean, boolean);
+      }).to.throwError();
+
+      expect(function () {
+        zeroFillArray(nullValue, nullValue);
+      }).to.throwError();
+
+      expect(function () {
+        zeroFillArray(emptyObject, emptyObject);
+      }).to.throwError();
+
+      expect(function () {
+        zeroFillArray(notAValue, notAValue);
+      }).to.throwError();
+    });
+
+    it('should return a function', function () {
+      expect(_.isFunction(zeroFillArray)).to.be(true);
+    });
+
+    it('should return an array', function () {
+      expect(_.isArray(results)).to.be(true);
+    });
+
+    it('should return an array of objects', function () {
+      expect(_.isObject(results[0])).to.be(true);
+      expect(_.isObject(results[1])).to.be(true);
+      expect(_.isObject(results[2])).to.be(true);
+    });
+
+    it('should return an array with zeros injected in the appropriate objects as y values', function () {
+      expect(results[0].y).to.be(0);
+      expect(results[1].y).to.be(0);
+      expect(results[3].y).to.be(0);
+      expect(results[4].y).to.be(0);
+    });
+  });
+
+  describe('Injected Zero values return in the correct order', function () {
+    var injectZeros;
+    var results;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      injectZeros = Private(require('ui/vislib/components/zero_injection/inject_zeros'));
+      results = injectZeros(dateHistogramRows);
+    }));
+
+    it('should return an array of objects', function () {
+      results.rows.forEach(function (row) {
+        expect(_.isArray(row.series[0].values)).to.be(true);
+      });
+    });
+
+    it('should return ordered x values', function () {
+      var values = results.rows[0].series[0].values;
+      expect(values[0].x).to.be.lessThan(values[1].x);
+      expect(values[1].x).to.be.lessThan(values[2].x);
+      expect(values[2].x).to.be.lessThan(values[3].x);
+      expect(values[3].x).to.be.lessThan(values[4].x);
+      expect(values[4].x).to.be.lessThan(values[5].x);
+      expect(values[5].x).to.be.lessThan(values[6].x);
+      expect(values[6].x).to.be.lessThan(values[7].x);
+    });
+  });
+});
diff --git a/src/ui/public/vislib/__tests__/index.js b/src/ui/public/vislib/__tests__/index.js
new file mode 100644
index 0000000000000..9ebf1f24a6f1a
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/index.js
@@ -0,0 +1,25 @@
+
+var _ = require('lodash');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+var d3 = require('d3');
+require('ui/vislib/styles/main.less');
+
+var angular = require('angular');
+
+describe('Vislib Index Test Suite', function () {
+  var vislib;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    vislib = Private(require('ui/vislib'));
+  }));
+
+  it('should return an object', function () {
+    expect(_.isObject(vislib)).to.be(true);
+  });
+
+  it('should return a Vis function', function () {
+    expect(_.isFunction(vislib.Vis)).to.be(true);
+  });
+});
diff --git a/src/ui/public/vislib/__tests__/lib/axis_title.js b/src/ui/public/vislib/__tests__/lib/axis_title.js
new file mode 100644
index 0000000000000..19c58829f3cc9
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/lib/axis_title.js
@@ -0,0 +1,131 @@
+var d3 = require('d3');
+var angular = require('angular');
+var _ = require('lodash');
+var $ = require('jquery');
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+
+describe('Vislib AxisTitle Class Test Suite', function () {
+  var AxisTitle;
+  var Data;
+  var axisTitle;
+  var el;
+  var dataObj;
+  var xTitle;
+  var yTitle;
+  var data = {
+    hits: 621,
+    label: '',
+    ordered: {
+      date: true,
+      interval: 30000,
+      max: 1408734982458,
+      min: 1408734082458
+    },
+    series: [
+      {
+        values: [
+          {
+            x: 1408734060000,
+            y: 8
+          },
+          {
+            x: 1408734090000,
+            y: 23
+          },
+          {
+            x: 1408734120000,
+            y: 30
+          },
+          {
+            x: 1408734150000,
+            y: 28
+          },
+          {
+            x: 1408734180000,
+            y: 36
+          },
+          {
+            x: 1408734210000,
+            y: 30
+          },
+          {
+            x: 1408734240000,
+            y: 26
+          },
+          {
+            x: 1408734270000,
+            y: 22
+          },
+          {
+            x: 1408734300000,
+            y: 29
+          },
+          {
+            x: 1408734330000,
+            y: 24
+          }
+        ]
+      }
+    ],
+    xAxisLabel: 'Date Histogram',
+    yAxisLabel: 'Count'
+  };
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    AxisTitle = Private(require('ui/vislib/lib/axis_title'));
+    Data = Private(require('ui/vislib/lib/data'));
+
+    el = d3.select('body').append('div')
+      .attr('class', 'vis-wrapper');
+
+    el.append('div')
+      .attr('class', 'y-axis-title')
+      .style('height', '20px')
+      .style('width', '20px');
+
+    el.append('div')
+      .attr('class', 'x-axis-title')
+      .style('height', '20px')
+      .style('width', '20px');
+
+
+    dataObj = new Data(data, {});
+    xTitle = dataObj.get('xAxisLabel');
+    yTitle = dataObj.get('yAxisLabel');
+    axisTitle = new AxisTitle($('.vis-wrapper')[0], xTitle, yTitle);
+  }));
+
+  afterEach(function () {
+    el.remove();
+  });
+
+  describe('render Method', function () {
+    beforeEach(function () {
+      axisTitle.render();
+    });
+
+    it('should append an svg to div', function () {
+      expect(el.select('.x-axis-title').selectAll('svg').length).to.be(1);
+      expect(el.select('.y-axis-title').selectAll('svg').length).to.be(1);
+    });
+
+    it('should append a g element to the svg', function () {
+      expect(el.select('.x-axis-title').selectAll('svg').select('g').length).to.be(1);
+      expect(el.select('.y-axis-title').selectAll('svg').select('g').length).to.be(1);
+    });
+
+    it('should append text', function () {
+      expect(!!el.select('.x-axis-title').selectAll('svg').selectAll('text')).to.be(true);
+      expect(!!el.select('.y-axis-title').selectAll('svg').selectAll('text')).to.be(true);
+    });
+  });
+
+  describe('draw Method', function () {
+    it('should be a function', function () {
+      expect(_.isFunction(axisTitle.draw())).to.be(true);
+    });
+  });
+
+});
diff --git a/src/ui/public/vislib/__tests__/lib/chart_title.js b/src/ui/public/vislib/__tests__/lib/chart_title.js
new file mode 100644
index 0000000000000..cb5a347829b13
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/lib/chart_title.js
@@ -0,0 +1,114 @@
+var d3 = require('d3');
+var angular = require('angular');
+var _ = require('lodash');
+var $ = require('jquery');
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+
+describe('Vislib ChartTitle Class Test Suite', function () {
+  var ChartTitle;
+  var Data;
+  var chartTitle;
+  var el;
+  var dataObj;
+  var data = {
+    hits: 621,
+    label: '',
+    ordered: {
+      date: true,
+      interval: 30000,
+      max: 1408734982458,
+      min: 1408734082458
+    },
+    series: [
+      {
+        values: [
+          {
+            x: 1408734060000,
+            y: 8
+          },
+          {
+            x: 1408734090000,
+            y: 23
+          },
+          {
+            x: 1408734120000,
+            y: 30
+          },
+          {
+            x: 1408734150000,
+            y: 28
+          },
+          {
+            x: 1408734180000,
+            y: 36
+          },
+          {
+            x: 1408734210000,
+            y: 30
+          },
+          {
+            x: 1408734240000,
+            y: 26
+          },
+          {
+            x: 1408734270000,
+            y: 22
+          },
+          {
+            x: 1408734300000,
+            y: 29
+          },
+          {
+            x: 1408734330000,
+            y: 24
+          }
+        ]
+      }
+    ],
+    xAxisLabel: 'Date Histogram',
+    yAxisLabel: 'Count'
+  };
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    ChartTitle = Private(require('ui/vislib/lib/chart_title'));
+    Data = Private(require('ui/vislib/lib/data'));
+
+    el = d3.select('body').append('div')
+      .attr('class', 'vis-wrapper')
+      .datum(data);
+
+    el.append('div')
+      .attr('class', 'chart-title')
+      .style('height', '20px');
+
+    dataObj = new Data(data, {});
+    chartTitle = new ChartTitle($('.vis-wrapper')[0], 'rows');
+  }));
+
+  afterEach(function () {
+    el.remove();
+  });
+
+  describe('render Method', function () {
+    beforeEach(function () {
+      chartTitle.render();
+    });
+
+    it('should append an svg to div', function () {
+      expect(el.select('.chart-title').selectAll('svg').length).to.be(1);
+    });
+
+    it('should append text', function () {
+      expect(!!el.select('.chart-title').selectAll('svg').selectAll('text')).to.be(true);
+    });
+  });
+
+  describe('draw Method', function () {
+    it('should be a function', function () {
+      expect(_.isFunction(chartTitle.draw())).to.be(true);
+    });
+  });
+
+});
diff --git a/src/ui/public/vislib/__tests__/lib/data.js b/src/ui/public/vislib/__tests__/lib/data.js
new file mode 100644
index 0000000000000..035cb36634fd7
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/lib/data.js
@@ -0,0 +1,416 @@
+var angular = require('angular');
+var _ = require('lodash');
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+
+var dataSeries = require('fixtures/vislib/mock_data/date_histogram/_series');
+var dataSeriesNeg = require('fixtures/vislib/mock_data/date_histogram/_series_neg');
+var dataStacked = require('fixtures/vislib/mock_data/stacked/_stacked');
+
+var seriesData = {
+  'label': '',
+  'series': [
+    {
+      'label': '100',
+      'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+    }
+  ]
+};
+
+var rowsData = {
+  'rows': [
+    {
+      'label': 'a',
+      'series': [
+        {
+          'label': '100',
+          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+        }
+      ]
+    },
+    {
+      'label': 'b',
+      'series': [
+        {
+          'label': '300',
+          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+        }
+      ]
+    },
+    {
+      'label': 'c',
+      'series': [
+        {
+          'label': '100',
+          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+        }
+      ]
+    },
+    {
+      'label': 'd',
+      'series': [
+        {
+          'label': '200',
+          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+        }
+      ]
+    }
+  ]
+};
+
+var colsData = {
+  'columns': [
+    {
+      'label': 'a',
+      'series': [
+        {
+          'label': '100',
+          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+        }
+      ]
+    },
+    {
+      'label': 'b',
+      'series': [
+        {
+          'label': '300',
+          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+        }
+      ]
+    },
+    {
+      'label': 'c',
+      'series': [
+        {
+          'label': '100',
+          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+        }
+      ]
+    },
+    {
+      'label': 'd',
+      'series': [
+        {
+          'label': '200',
+          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+        }
+      ]
+    }
+  ]
+};
+
+describe('Vislib Data Class Test Suite', function () {
+  var Data;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    Data = Private(require('ui/vislib/lib/data'));
+  }));
+
+  describe('Data Class (main)', function () {
+    it('should be a function', function () {
+      expect(_.isFunction(Data)).to.be(true);
+    });
+
+    it('should return an object', function () {
+      var rowIn = new Data(rowsData, {});
+      expect(_.isObject(rowIn)).to.be(true);
+    });
+
+    it('should update label in series data', function () {
+      var seriesDataWithoutLabelInSeries = {
+        'label': '',
+        'series': [
+          {
+            'label': '',
+            'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+          }
+        ],
+        'yAxisLabel': 'customLabel'
+      };
+      var modifiedData = new Data(seriesDataWithoutLabelInSeries, {});
+      expect(modifiedData.data.series[0].label).to.be('customLabel');
+    });
+
+    it('should update label in row data', function () {
+      var seriesDataWithoutLabelInRow = {
+        'rows': [
+          {
+            'label': '',
+            'series': [
+              {
+                'label': '',
+                'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+              }
+            ],
+            'yAxisLabel': 'customLabel'
+          },
+          {
+            'label': '',
+            'series': [
+              {
+                'label': '',
+                'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+              }
+            ],
+            'yAxisLabel': 'customLabel'
+          }
+        ],
+      };
+
+      var modifiedData = new Data(seriesDataWithoutLabelInRow, {});
+      expect(modifiedData.data.rows[0].series[0].label).to.be('customLabel');
+      expect(modifiedData.data.rows[1].series[0].label).to.be('customLabel');
+    });
+
+    it('should update label in column data', function () {
+      var seriesDataWithoutLabelInRow = {
+        'columns': [
+          {
+            'label': '',
+            'series': [
+              {
+                'label': '',
+                'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+              }
+            ],
+            'yAxisLabel': 'customLabel'
+          },
+          {
+            'label': '',
+            'series': [
+              {
+                'label': '',
+                'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+              }
+            ],
+            'yAxisLabel': 'customLabel'
+          }
+        ],
+        'yAxisLabel': 'customLabel'
+      };
+
+      var modifiedData = new Data(seriesDataWithoutLabelInRow, {});
+      expect(modifiedData.data.columns[0].series[0].label).to.be('customLabel');
+      expect(modifiedData.data.columns[1].series[0].label).to.be('customLabel');
+    });
+  });
+
+
+  describe('_removeZeroSlices', function () {
+    var data;
+    var pieData = {
+      slices: {
+        children: [
+          {size: 30},
+          {size: 20},
+          {size: 0}
+        ]
+      }
+    };
+
+    beforeEach(function () {
+      data = new Data(pieData, {});
+    });
+
+    it('should remove zero values', function () {
+      var slices = data._removeZeroSlices(data.data.slices);
+      expect(slices.children.length).to.be(2);
+    });
+  });
+
+  describe('Data.flatten', function () {
+    var serIn;
+    var rowIn;
+    var colIn;
+    var serOut;
+    var rowOut;
+    var colOut;
+
+    beforeEach(function () {
+      serIn = new Data(seriesData, {});
+      rowIn = new Data(rowsData, {});
+      colIn = new Data(colsData, {});
+      serOut = serIn.flatten();
+      rowOut = rowIn.flatten();
+      colOut = colIn.flatten();
+    });
+
+    it('should return an array of value objects from every series', function () {
+      expect(serOut.every(_.isObject)).to.be(true);
+    });
+
+    it('should return all points from every series', testLength(seriesData));
+    it('should return all points from every series', testLength(rowsData));
+    it('should return all points from every series', testLength(colsData));
+
+    function testLength(inputData) {
+      return function () {
+        var data = new Data(inputData, {});
+        var len = _.reduce(data.chartData(), function (sum, chart) {
+          return sum + chart.series.reduce(function (sum, series) {
+            return sum + series.values.length;
+          }, 0);
+        }, 0);
+
+        expect(data.flatten()).to.have.length(len);
+      };
+    }
+  });
+
+  describe('getYMin method', function () {
+    var visData;
+    var visDataNeg;
+    var visDataStacked;
+    var minValue = 4;
+    var minValueNeg = -41;
+    var minValueStacked = 15;
+
+    beforeEach(function () {
+      visData = new Data(dataSeries, {});
+      visDataNeg = new Data(dataSeriesNeg, {});
+      visDataStacked = new Data(dataStacked, { type: 'histogram' });
+    });
+
+    // The first value in the time series is less than the min date in the
+    // date range. It also has the largest y value. This value should be excluded
+    // when calculating the Y max value since it falls outside of the range.
+    it('should return the Y domain min value', function () {
+      expect(visData.getYMin()).to.be(minValue);
+      expect(visDataNeg.getYMin()).to.be(minValueNeg);
+      expect(visDataStacked.getYMin()).to.be(minValueStacked);
+    });
+
+    it('should have a minimum date value that is greater than the max value within the date range', function () {
+      var series = _.pluck(visData.chartData(), 'series');
+      var stackedSeries = _.pluck(visDataStacked.chartData(), 'series');
+      expect(_.min(series.values, function (d) { return d.x; })).to.be.greaterThan(minValue);
+      expect(_.min(stackedSeries.values, function (d) { return d.x; })).to.be.greaterThan(minValueStacked);
+    });
+
+    it('allows passing a value getter for manipulating the values considered', function () {
+      var realMin = visData.getYMin();
+      var multiplier = 13.2;
+      expect(visData.getYMin(function (d) { return d.y * multiplier; })).to.be(realMin * multiplier);
+    });
+  });
+
+  describe('getYMax method', function () {
+    var visData;
+    var visDataNeg;
+    var visDataStacked;
+    var maxValue = 41;
+    var maxValueNeg = -4;
+    var maxValueStacked = 115;
+
+    beforeEach(function () {
+      visData = new Data(dataSeries, {});
+      visDataNeg = new Data(dataSeriesNeg, {});
+      visDataStacked = new Data(dataStacked, { type: 'histogram' });
+    });
+
+    // The first value in the time series is less than the min date in the
+    // date range. It also has the largest y value. This value should be excluded
+    // when calculating the Y max value since it falls outside of the range.
+    it('should return the Y domain min value', function () {
+      expect(visData.getYMax()).to.be(maxValue);
+      expect(visDataNeg.getYMax()).to.be(maxValueNeg);
+      expect(visDataStacked.getYMax()).to.be(maxValueStacked);
+    });
+
+    it('should have a minimum date value that is greater than the max value within the date range', function () {
+      var series = _.pluck(visData.chartData(), 'series');
+      var stackedSeries = _.pluck(visDataStacked.chartData(), 'series');
+      expect(_.min(series, function (d) { return d.x; })).to.be.greaterThan(maxValue);
+      expect(_.min(stackedSeries, function (d) { return d.x; })).to.be.greaterThan(maxValueStacked);
+    });
+
+    it('allows passing a value getter for manipulating the values considered', function () {
+      var realMax = visData.getYMax();
+      var multiplier = 13.2;
+      expect(visData.getYMax(function (d) { return d.y * multiplier; })).to.be(realMax * multiplier);
+    });
+  });
+
+  describe('geohashGrid methods', function () {
+    var data;
+    var geohashGridData = {
+      hits: 3954,
+      rows: [{
+        title: 'Top 5 _type: apache',
+        label: 'Top 5 _type: apache',
+        geoJson: {
+          type: 'FeatureCollection',
+          features: [],
+          properties: {
+            min: 2,
+            max: 331,
+            zoom: 3,
+            center: [
+              47.517200697839414,
+              -112.06054687499999
+            ]
+          }
+        },
+      }, {
+        title: 'Top 5 _type: nginx',
+        label: 'Top 5 _type: nginx',
+        geoJson: {
+          type: 'FeatureCollection',
+          features: [],
+          properties: {
+            min: 1,
+            max: 88,
+            zoom: 3,
+            center: [
+              47.517200697839414,
+              -112.06054687499999
+            ]
+          }
+        },
+      }]
+    };
+
+    beforeEach(function () {
+      data = new Data(geohashGridData, {});
+    });
+
+    describe('getVisData', function () {
+      it('should return the rows property', function () {
+        var visData = data.getVisData();
+        expect(visData).to.eql(geohashGridData.rows);
+      });
+    });
+
+    describe('getGeoExtents', function () {
+      it('should return the min and max geoJson properties', function () {
+        var minMax = data.getGeoExtents();
+        expect(minMax.min).to.be(1);
+        expect(minMax.max).to.be(331);
+      });
+    });
+  });
+
+  describe('null value check', function () {
+    it('should return false', function () {
+      var data = new Data(rowsData, {});
+      expect(data.hasNullValues()).to.be(false);
+    });
+
+    it('should return true', function () {
+      var nullRowData = { rows: rowsData.rows.slice(0) };
+      nullRowData.rows.push({
+        'label': 'e',
+        'series': [
+          {
+            'label': '200',
+            'values': [{x: 0, y: 1}, {x: 1, y: null}, {x: 2, y: 3}]
+          }
+        ]
+      });
+
+      var data = new Data(nullRowData, {});
+      expect(data.hasNullValues()).to.be(true);
+    });
+  });
+});
diff --git a/src/ui/public/vislib/__tests__/lib/dispatch.js b/src/ui/public/vislib/__tests__/lib/dispatch.js
new file mode 100644
index 0000000000000..7025f7dd9a874
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/lib/dispatch.js
@@ -0,0 +1,150 @@
+var angular = require('angular');
+var _ = require('lodash');
+var $ = require('jquery');
+var d3 = require('d3');
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+
+// Data
+var data = require('fixtures/vislib/mock_data/date_histogram/_series');
+
+describe('Vislib Dispatch Class Test Suite', function () {
+
+  function destroyVis(vis) {
+    $(vis.el).remove();
+    vis = null;
+  }
+
+  function getEls(el, n, type) {
+    return d3.select(el).data(new Array(n)).enter().append(type);
+  }
+
+  describe('', function () {
+    var vis;
+    var SimpleEmitter;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      vis = Private(require('fixtures/vislib/_vis_fixture'))();
+      vis.render(data);
+      SimpleEmitter = require('ui/utils/SimpleEmitter');
+    }));
+
+    afterEach(function () {
+      destroyVis(vis);
+    });
+
+    it('extends the SimpleEmitter class', function () {
+      var events = _.pluck(vis.handler.charts, 'events');
+      expect(events.length).to.be.above(0);
+      events.forEach(function (dispatch) {
+        expect(dispatch).to.be.a(SimpleEmitter);
+      });
+    });
+  });
+
+  describe('Stock event handlers', function () {
+    var vis;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      vis = Private(require('fixtures/vislib/_vis_fixture'))();
+      vis.on('brush', _.noop);
+      vis.render(data);
+    }));
+
+    afterEach(function () {
+      destroyVis(vis);
+    });
+
+    describe('addEvent method', function () {
+      it('returns a function that binds the passed event to a selection', function () {
+        var chart = _.first(vis.handler.charts);
+        var apply = chart.events.addEvent('event', _.noop);
+        expect(apply).to.be.a('function');
+
+        var els = getEls(vis.el, 3, 'div');
+        apply(els);
+        els.each(function () {
+          expect(d3.select(this).on('event')).to.be(_.noop);
+        });
+      });
+    });
+
+    // test the addHoverEvent, addClickEvent, addBrushEvent methods by
+    // checking that they return function which bind the events expected
+    function checkBoundAddMethod(name, event) {
+      describe(name + ' method', function () {
+        it('should be a function', function () {
+          vis.handler.charts.forEach(function (chart) {
+            expect(chart.events[name]).to.be.a('function');
+          });
+        });
+
+        it('returns a function that binds ' + event + ' events to a selection', function () {
+          var chart = _.first(vis.handler.charts);
+          var apply = chart.events[name](d3.select(document.createElement('svg')));
+          expect(apply).to.be.a('function');
+
+          var els = getEls(vis.el, 3, 'div');
+          apply(els);
+          els.each(function () {
+            expect(d3.select(this).on(event)).to.be.a('function');
+          });
+        });
+      });
+    }
+
+    checkBoundAddMethod('addHoverEvent', 'mouseover');
+    checkBoundAddMethod('addMouseoutEvent', 'mouseout');
+    checkBoundAddMethod('addClickEvent', 'click');
+    checkBoundAddMethod('addBrushEvent', 'mousedown');
+
+    describe('addMousePointer method', function () {
+      it('should be a function', function () {
+        vis.handler.charts.forEach(function (chart) {
+          var pointer = chart.events.addMousePointer;
+
+          expect(_.isFunction(pointer)).to.be(true);
+        });
+      });
+    });
+  });
+
+  describe('Custom event handlers', function () {
+    it('should attach whatever gets passed on vis.on() to chart.events', function (done) {
+      var vis;
+      var chart;
+      ngMock.module('kibana');
+      ngMock.inject(function (Private) {
+        vis = Private(require('fixtures/vislib/_vis_fixture'))();
+        vis.on('someEvent', _.noop);
+        vis.render(data);
+
+        vis.handler.charts.forEach(function (chart) {
+          expect(chart.events.listenerCount('someEvent')).to.be(1);
+        });
+
+        destroyVis(vis);
+        done();
+      });
+    });
+
+    it('can be added after rendering', function () {
+      var vis;
+      var chart;
+      ngMock.module('kibana');
+      ngMock.inject(function (Private) {
+        vis = Private(require('fixtures/vislib/_vis_fixture'))();
+        vis.render(data);
+        vis.on('someEvent', _.noop);
+
+        vis.handler.charts.forEach(function (chart) {
+          expect(chart.events.listenerCount('someEvent')).to.be(1);
+        });
+
+        destroyVis(vis);
+      });
+    });
+  });
+});
diff --git a/src/ui/public/vislib/__tests__/lib/error_handler.js b/src/ui/public/vislib/__tests__/lib/error_handler.js
new file mode 100644
index 0000000000000..a56e3135c6472
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/lib/error_handler.js
@@ -0,0 +1,36 @@
+
+var expect = require('expect.js');
+var angular = require('angular');
+var ngMock = require('ngMock');
+
+describe('Vislib ErrorHandler Test Suite', function () {
+  var ErrorHandler;
+  var errorHandler;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    ErrorHandler = Private(require('ui/vislib/lib/_error_handler'));
+    errorHandler = new ErrorHandler();
+  }));
+
+  describe('validateWidthandHeight Method', function () {
+    it('should throw an error when width and/or height is 0', function () {
+      expect(function () {
+        errorHandler.validateWidthandHeight(0, 200);
+      }).to.throwError();
+      expect(function () {
+        errorHandler.validateWidthandHeight(200, 0);
+      }).to.throwError();
+    });
+
+    it('should throw an error when width and/or height is NaN', function () {
+      expect(function () {
+        errorHandler.validateWidthandHeight(null, 200);
+      }).to.throwError();
+      expect(function () {
+        errorHandler.validateWidthandHeight(200, null);
+      }).to.throwError();
+    });
+  });
+
+});
diff --git a/src/ui/public/vislib/__tests__/lib/handler/handler.js b/src/ui/public/vislib/__tests__/lib/handler/handler.js
new file mode 100644
index 0000000000000..78bdd8462ddb9
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/lib/handler/handler.js
@@ -0,0 +1,133 @@
+
+var angular = require('angular');
+var $ = require('jquery');
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+
+// Data
+var series = require('fixtures/vislib/mock_data/date_histogram/_series');
+var columns = require('fixtures/vislib/mock_data/date_histogram/_columns');
+var rows = require('fixtures/vislib/mock_data/date_histogram/_rows');
+var stackedSeries = require('fixtures/vislib/mock_data/date_histogram/_stacked_series');
+var dateHistogramArray = [
+  series,
+  columns,
+  rows,
+  stackedSeries
+];
+var names = [
+  'series',
+  'columns',
+  'rows',
+  'stackedSeries'
+];
+
+dateHistogramArray.forEach(function (data, i) {
+  describe('Vislib Handler Test Suite for ' + names[i] + ' Data', function () {
+    var Handler;
+    var vis;
+    var events = [
+      'click',
+      'brush'
+    ];
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      Handler = Private(require('ui/vislib/lib/handler/handler'));
+      vis = Private(require('fixtures/vislib/_vis_fixture'))();
+      vis.render(data);
+    }));
+
+    afterEach(function () {
+      $(vis.el).remove();
+      vis = null;
+    });
+
+    describe('render Method', function () {
+      it('should render charts', function () {
+        expect(vis.handler.charts.length).to.be.greaterThan(0);
+        vis.handler.charts.forEach(function (chart) {
+          expect($(chart.chartEl).find('svg').length).to.be(1);
+        });
+      });
+    });
+
+    describe('enable Method', function () {
+      var charts;
+
+      beforeEach(function () {
+        charts = vis.handler.charts;
+
+        charts.forEach(function (chart) {
+          events.forEach(function (event) {
+            vis.handler.enable(event, chart);
+          });
+        });
+      });
+
+      it('should add events to chart and emit to the Events class', function () {
+        charts.forEach(function (chart) {
+          events.forEach(function (event) {
+            expect(chart.events.listenerCount(event)).to.be.above(0);
+          });
+        });
+      });
+    });
+
+    describe('disable Method', function () {
+      var charts;
+
+      beforeEach(function () {
+        charts = vis.handler.charts;
+
+        charts.forEach(function (chart) {
+          events.forEach(function (event) {
+            vis.handler.disable(event, chart);
+          });
+        });
+      });
+
+      it('should remove events from the chart', function () {
+        charts.forEach(function (chart) {
+          events.forEach(function (event) {
+            expect(chart.events.listenerCount(event)).to.be(0);
+          });
+        });
+      });
+
+    });
+
+    describe('removeAll Method', function () {
+      beforeEach(function () {
+        ngMock.inject(function () {
+          vis.handler.removeAll(vis.el);
+        });
+      });
+
+      it('should remove all DOM elements from the el', function () {
+        expect($(vis.el).children().length).to.be(0);
+      });
+    });
+
+    describe('error Method', function () {
+      beforeEach(function () {
+        vis.handler.error('This is an error!');
+      });
+
+      it('should return an error classed DOM element with a text message', function () {
+        expect($(vis.el).find('.error').length).to.be(1);
+        expect($('.error h4').html()).to.be('This is an error!');
+      });
+    });
+
+    describe('destroy Method', function () {
+      beforeEach(function () {
+        vis.handler.destroy();
+      });
+
+      it('should destroy all the charts in the visualization', function () {
+        expect(vis.handler.charts.length).to.be(0);
+      });
+    });
+  });
+});
diff --git a/src/ui/public/vislib/__tests__/lib/layout/layout.js b/src/ui/public/vislib/__tests__/lib/layout/layout.js
new file mode 100644
index 0000000000000..61b19bf2ce5d0
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/lib/layout/layout.js
@@ -0,0 +1,142 @@
+var d3 = require('d3');
+var angular = require('angular');
+var $ = require('jquery');
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+
+// Data
+var series = require('fixtures/vislib/mock_data/date_histogram/_series');
+var columns = require('fixtures/vislib/mock_data/date_histogram/_columns');
+var rows = require('fixtures/vislib/mock_data/date_histogram/_rows');
+var stackedSeries = require('fixtures/vislib/mock_data/date_histogram/_stacked_series');
+var dateHistogramArray = [
+  series,
+  columns,
+  rows,
+  stackedSeries
+];
+var names = [
+  'series',
+  'columns',
+  'rows',
+  'stackedSeries'
+];
+
+dateHistogramArray.forEach(function (data, i) {
+  describe('Vislib Layout Class Test Suite for ' + names[i] + ' Data', function () {
+    var Layout;
+    var vis;
+    var numberOfCharts;
+    var testLayout;
+
+    beforeEach(ngMock.module('kibana'));
+
+    beforeEach(function () {
+      ngMock.inject(function (Private) {
+        Layout = Private(require('ui/vislib/lib/layout/layout'));
+        vis = Private(require('fixtures/vislib/_vis_fixture'))();
+        vis.render(data);
+        numberOfCharts = vis.handler.charts.length;
+      });
+    });
+
+    afterEach(function () {
+      $(vis.el).remove();
+      vis = null;
+    });
+
+    describe('createLayout Method', function () {
+      it('should append all the divs', function () {
+        expect($(vis.el).find('.vis-wrapper').length).to.be(1);
+        expect($(vis.el).find('.y-axis-col-wrapper').length).to.be(1);
+        expect($(vis.el).find('.vis-col-wrapper').length).to.be(1);
+        expect($(vis.el).find('.legend-col-wrapper').length).to.be(1);
+        expect($(vis.el).find('.y-axis-col').length).to.be(1);
+        expect($(vis.el).find('.y-axis-title').length).to.be(1);
+        expect($(vis.el).find('.y-axis-div-wrapper').length).to.be(1);
+        expect($(vis.el).find('.y-axis-spacer-block').length).to.be(1);
+        expect($(vis.el).find('.chart-wrapper').length).to.be(numberOfCharts);
+        expect($(vis.el).find('.x-axis-wrapper').length).to.be(1);
+        expect($(vis.el).find('.x-axis-div-wrapper').length).to.be(1);
+        expect($(vis.el).find('.x-axis-title').length).to.be(1);
+      });
+    });
+
+    describe('layout Method', function () {
+      beforeEach(function () {
+        testLayout = new Layout(vis.el, vis.data, 'histogram');
+      });
+
+      it('should append a div with the correct class name', function () {
+        expect($(vis.el).find('.chart').length).to.be(numberOfCharts);
+      });
+
+      it('should bind data to the DOM element', function () {
+        expect(!!$(vis.el).find('.chart').data()).to.be(true);
+      });
+
+      it('should create children', function () {
+        expect(typeof $(vis.el).find('.x-axis-div')).to.be('object');
+      });
+
+      it('should call split function when provided', function () {
+        expect(typeof $(vis.el).find('.x-axis-div')).to.be('object');
+      });
+
+      it('should throw errors when incorrect arguments provided', function () {
+        expect(function () {
+          testLayout.layout({
+            parent: vis.el,
+            type: undefined,
+            class: 'chart'
+          });
+        }).to.throwError();
+
+        expect(function () {
+          testLayout.layout({
+            type: 'div',
+            class: 'chart'
+          });
+        }).to.throwError();
+
+        expect(function () {
+          testLayout.layout({
+            parent: 'histogram',
+            type: 'div'
+          });
+        }).to.throwError();
+
+        expect(function () {
+          testLayout.layout({
+            parent: vis.el,
+            type: function (d) { return d; },
+            class: 'chart'
+          });
+        }).to.throwError();
+      });
+    });
+
+    describe('appendElem Method', function () {
+      beforeEach(function () {
+        vis.handler.layout.appendElem(vis.el, 'svg', 'column');
+        vis.handler.layout.appendElem('.visualize-chart', 'div', 'test');
+      });
+
+      it('should append DOM element to el with a class name', function () {
+        expect(typeof $(vis.el).find('.column')).to.be('object');
+        expect(typeof $(vis.el).find('.test')).to.be('object');
+      });
+    });
+
+    describe('removeAll Method', function () {
+      beforeEach(function () {
+        d3.select(vis.el).append('div').attr('class', 'visualize');
+        vis.handler.layout.removeAll(vis.el);
+      });
+
+      it('should remove all DOM elements from the el', function () {
+        expect($(vis.el).children().length).to.be(0);
+      });
+    });
+  });
+});
diff --git a/src/ui/public/vislib/__tests__/lib/layout/layout_types.js b/src/ui/public/vislib/__tests__/lib/layout/layout_types.js
new file mode 100644
index 0000000000000..a60a188a3f854
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/lib/layout/layout_types.js
@@ -0,0 +1,23 @@
+var angular = require('angular');
+var _ = require('lodash');
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+
+describe('Vislib Layout Types Test Suite', function () {
+  var layoutType;
+  var layoutFunc;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    layoutType = Private(require('ui/vislib/lib/layout/layout_types'));
+    layoutFunc = layoutType.histogram;
+  }));
+
+  it('should be an object', function () {
+    expect(_.isObject(layoutType)).to.be(true);
+  });
+
+  it('should return a function', function () {
+    expect(typeof layoutFunc).to.be('function');
+  });
+});
diff --git a/src/ui/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js b/src/ui/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js
new file mode 100644
index 0000000000000..9cb339150214c
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js
@@ -0,0 +1,258 @@
+var d3 = require('d3');
+var angular = require('angular');
+var $ = require('jquery');
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+
+describe('Vislib Split Function Test Suite', function () {
+  describe('Column Chart', function () {
+    var chartSplit;
+    var chartTitleSplit;
+    var xAxisSplit;
+    var yAxisSplit;
+    var el;
+    var data = {
+      rows: [
+        {
+          hits      : 621,
+          label     : '',
+          ordered   : {
+            date    : true,
+            interval: 30000,
+            max     : 1408734982458,
+            min     : 1408734082458
+          },
+          series    : [
+            {
+              values: [
+                {
+                  x: 1408734060000,
+                  y: 8
+                },
+                {
+                  x: 1408734090000,
+                  y: 23
+                },
+                {
+                  x: 1408734120000,
+                  y: 30
+                },
+                {
+                  x: 1408734150000,
+                  y: 28
+                },
+                {
+                  x: 1408734180000,
+                  y: 36
+                },
+                {
+                  x: 1408734210000,
+                  y: 30
+                },
+                {
+                  x: 1408734240000,
+                  y: 26
+                },
+                {
+                  x: 1408734270000,
+                  y: 22
+                },
+                {
+                  x: 1408734300000,
+                  y: 29
+                },
+                {
+                  x: 1408734330000,
+                  y: 24
+                }
+              ]
+            }
+          ],
+          xAxisLabel: 'Date Histogram',
+          yAxisLabel: 'Count'
+        },
+        {
+          hits      : 621,
+          label     : '',
+          ordered   : {
+            date    : true,
+            interval: 30000,
+            max     : 1408734982458,
+            min     : 1408734082458
+          },
+          series    : [
+            {
+              values: [
+                {
+                  x: 1408734060000,
+                  y: 8
+                },
+                {
+                  x: 1408734090000,
+                  y: 23
+                },
+                {
+                  x: 1408734120000,
+                  y: 30
+                },
+                {
+                  x: 1408734150000,
+                  y: 28
+                },
+                {
+                  x: 1408734180000,
+                  y: 36
+                },
+                {
+                  x: 1408734210000,
+                  y: 30
+                },
+                {
+                  x: 1408734240000,
+                  y: 26
+                },
+                {
+                  x: 1408734270000,
+                  y: 22
+                },
+                {
+                  x: 1408734300000,
+                  y: 29
+                },
+                {
+                  x: 1408734330000,
+                  y: 24
+                }
+              ]
+            }
+          ],
+          xAxisLabel: 'Date Histogram',
+          yAxisLabel: 'Count'
+        }
+      ]
+    };
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      chartSplit = Private(require('ui/vislib/lib/layout/splits/column_chart/chart_split'));
+      chartTitleSplit = Private(require('ui/vislib/lib/layout/splits/column_chart/chart_title_split'));
+      xAxisSplit = Private(require('ui/vislib/lib/layout/splits/column_chart/x_axis_split'));
+      yAxisSplit = Private(require('ui/vislib/lib/layout/splits/column_chart/y_axis_split'));
+
+      el = d3.select('body').append('div')
+        .attr('class', 'visualization')
+        .datum(data);
+    }));
+
+    afterEach(function () {
+      el.remove();
+    });
+
+    describe('chart split function', function () {
+      var fixture;
+
+      beforeEach(ngMock.inject(function () {
+        fixture = d3.select('.visualization').call(chartSplit);
+      }));
+
+      afterEach(function () {
+        fixture.remove();
+      });
+
+      it('should append the correct number of divs', function () {
+        expect($('.chart').length).to.be(2);
+      });
+
+      it('should add the correct class name', function () {
+        expect(!!$('.chart-wrapper-row').length).to.be(true);
+      });
+    });
+
+    describe('chart title split function', function () {
+      var newEl;
+      var fixture;
+
+      beforeEach(ngMock.inject(function () {
+        el.append('div').attr('class', 'x-axis-chart-title');
+        el.append('div').attr('class', 'y-axis-chart-title');
+        d3.select('.x-axis-chart-title').call(chartTitleSplit);
+        d3.select('.y-axis-chart-title').call(chartTitleSplit);
+
+        newEl = d3.select('body').append('div')
+          .attr('class', 'series')
+          .datum({ series: []});
+
+        newEl.append('div').attr('class', 'x-axis-chart-title');
+        newEl.append('div').attr('class', 'y-axis-chart-title');
+        newEl.select('.x-axis-chart-title').call(chartTitleSplit);
+        newEl.select('.y-axis-chart-title').call(chartTitleSplit);
+
+        fixture = newEl.selectAll(this.childNodes)[0].length;
+      }));
+
+      afterEach(function () {
+        newEl.remove();
+      });
+
+      it('should append the correct number of divs', function () {
+        expect($('.chart-title').length).to.be(2);
+      });
+
+      it('should remove the correct div', function () {
+        expect($('.y-axis-chart-title').length).to.be(1);
+        expect($('.x-axis-chart-title').length).to.be(0);
+      });
+
+      it('should remove all chart title divs when only one chart is rendered', function () {
+        expect(fixture).to.be(0);
+      });
+    });
+
+    describe('x axis split function', function () {
+      var fixture;
+      var divs;
+
+      beforeEach(ngMock.inject(function () {
+        fixture = d3.select('body').append('div')
+          .attr('class', 'columns')
+          .datum({ columns: [{}, {}] });
+        d3.select('.columns').call(xAxisSplit);
+        divs = d3.selectAll('.x-axis-div')[0];
+      }));
+
+      afterEach(function () {
+        fixture.remove();
+        $(divs).remove();
+      });
+
+      it('should append the correct number of divs', function () {
+        expect(divs.length).to.be(2);
+      });
+    });
+
+    describe('y axis split function', function () {
+      var fixture;
+      var divs;
+
+      beforeEach(ngMock.inject(function () {
+        fixture = d3.select('body').append('div')
+          .attr('class', 'rows')
+          .datum({ rows: [{}, {}] });
+
+        d3.select('.rows').call(yAxisSplit);
+
+        divs = d3.selectAll('.y-axis-div')[0];
+      }));
+
+      afterEach(function () {
+        fixture.remove();
+        $(divs).remove();
+      });
+
+      it('should append the correct number of divs', function () {
+        expect(divs.length).to.be(2);
+      });
+    });
+
+  });
+});
diff --git a/src/ui/public/vislib/__tests__/lib/layout/types/column_layout.js b/src/ui/public/vislib/__tests__/lib/layout/types/column_layout.js
new file mode 100644
index 0000000000000..ceef4687ee1d7
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/lib/layout/types/column_layout.js
@@ -0,0 +1,89 @@
+var d3 = require('d3');
+var angular = require('angular');
+var _ = require('lodash');
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+
+describe('Vislib Column Layout Test Suite', function () {
+  var layoutType;
+  var columnLayout;
+  var el;
+  var data = {
+    hits: 621,
+    label: '',
+    ordered: {
+      date: true,
+      interval: 30000,
+      max: 1408734982458,
+      min: 1408734082458
+    },
+    series: [
+      {
+        values: [
+          {
+            x: 1408734060000,
+            y: 8
+          },
+          {
+            x: 1408734090000,
+            y: 23
+          },
+          {
+            x: 1408734120000,
+            y: 30
+          },
+          {
+            x: 1408734150000,
+            y: 28
+          },
+          {
+            x: 1408734180000,
+            y: 36
+          },
+          {
+            x: 1408734210000,
+            y: 30
+          },
+          {
+            x: 1408734240000,
+            y: 26
+          },
+          {
+            x: 1408734270000,
+            y: 22
+          },
+          {
+            x: 1408734300000,
+            y: 29
+          },
+          {
+            x: 1408734330000,
+            y: 24
+          }
+        ]
+      }
+    ],
+    xAxisLabel: 'Date Histogram',
+    yAxisLabel: 'Count'
+  };
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    layoutType = Private(require('ui/vislib/lib/layout/layout_types'));
+    el = d3.select('body').append('div').attr('class', 'visualization');
+    columnLayout = layoutType.histogram(el, data);
+  }));
+
+  afterEach(function () {
+    el.remove();
+  });
+
+  it('should return an array of objects', function () {
+    expect(_.isArray(columnLayout)).to.be(true);
+    expect(_.isObject(columnLayout[0])).to.be(true);
+  });
+
+  it('should throw an error when the wrong number or no arguments provided', function () {
+    expect(function () { layoutType.histogram(el); }).to.throwError();
+  });
+});
diff --git a/src/ui/public/vislib/__tests__/lib/legend.js b/src/ui/public/vislib/__tests__/lib/legend.js
new file mode 100644
index 0000000000000..e43029e719882
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/lib/legend.js
@@ -0,0 +1,122 @@
+var d3 = require('d3');
+var angular = require('angular');
+var _ = require('lodash');
+var $ = require('jquery');
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+
+var slices = require('fixtures/vislib/mock_data/histogram/_slices');
+var stackedSeries = require('fixtures/vislib/mock_data/date_histogram/_stacked_series');
+var histogramSlices = require('fixtures/vislib/mock_data/histogram/_slices');
+
+var dataArray = [
+  stackedSeries,
+  slices,
+  histogramSlices,
+  stackedSeries,
+  stackedSeries
+];
+
+var chartTypes = [
+  'histogram',
+  'pie',
+  'pie',
+  'area',
+  'line'
+];
+
+var chartSelectors = {
+  histogram: '.chart rect',
+  pie: '.chart path',
+  area: '.chart path',
+  line: '.chart circle'
+};
+
+dataArray.forEach(function (data, i) {
+  describe('Vislib Legend Class Test Suite for ' + chartTypes[i] + ' data', function () {
+    var visLibParams = {
+      type: chartTypes[i],
+      addLegend: true
+    };
+    var Legend;
+    var vis;
+    var $el;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      vis = Private(require('fixtures/vislib/_vis_fixture'))(visLibParams);
+      Legend = Private(require('ui/vislib/lib/legend'));
+      $el = d3.select('body').append('div').attr('class', 'fake-legend');
+      vis.render(data);
+    }));
+
+    afterEach(function () {
+      $(vis.el).remove();
+      $('.fake-legend').remove();
+      vis = null;
+    });
+
+    describe('legend item label matches vis item label', function () {
+      it('should match the slice label', function () {
+        var chartType = chartTypes[i];
+        var paths = $(vis.el).find(chartSelectors[chartType]).toArray();
+        var items = vis.handler.legend.labels;
+
+        items.forEach(function (d) {
+          var path = _.find(paths, function (path) {
+            return path.getAttribute('data-label') === String(d.label);
+          });
+
+          expect(path).to.be.ok();
+        });
+      });
+    });
+
+    describe('header method', function () {
+      it('should append the legend header', function () {
+        expect($(vis.el).find('.header').length).to.be(1);
+        expect($(vis.el).find('.column-labels').length).to.be(1);
+      });
+    });
+
+    describe('list method', function () {
+      it('should append the legend list', function () {
+        expect($(vis.el).find('.legend-ul').length).to.be(1);
+      });
+      it('should contain a list of items', function () {
+        expect($(vis.el).find('li').length).to.be.greaterThan(1);
+      });
+      it('should not return an undefined value', function () {
+        var emptyObject = {
+          label: ''
+        };
+        var labels = [emptyObject, emptyObject, emptyObject];
+        var args = {
+          _attr: {isOpen: true},
+          color: function () { return 'blue'; }
+        };
+
+        Legend.prototype._list($el, labels, args);
+
+        $el.selectAll('li').each(function (d) {
+          expect(d.label).not.to.be(undefined);
+        });
+      });
+    });
+
+    describe('render method', function () {
+      it('should create a legend toggle', function () {
+        expect($('.legend-toggle').length).to.be(1);
+      });
+
+      it('should have an onclick listener', function () {
+        expect(!!$('.legend-toggle')[0].__onclick).to.be(true);
+        expect(!!$('li.color')[0].__onclick).to.be(true);
+      });
+
+      it('should attach onmouseover listener', function () {
+        expect(!!$('li.color')[0].__onmouseover).to.be(true);
+      });
+    });
+  });
+});
diff --git a/src/ui/public/vislib/__tests__/lib/resize_checker.js b/src/ui/public/vislib/__tests__/lib/resize_checker.js
new file mode 100644
index 0000000000000..17f8610c69b8f
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/lib/resize_checker.js
@@ -0,0 +1,200 @@
+
+describe('Vislib Resize Checker', function () {
+  var $ = require('jquery');
+  var _ = require('lodash');
+  var Promise = require('bluebird');
+  var ngMock = require('ngMock');
+  var expect = require('expect.js');
+
+  var sinon = require('auto-release-sinon');
+  require('testUtils/noDigestPromises').activateForSuite();
+
+  var ResizeChecker;
+  var EventEmitter;
+  var checker;
+  var reflowWatcher;
+  var reflowSpies = {};
+
+  beforeEach(ngMock.module('kibana'));
+
+  beforeEach(ngMock.inject(function (Private) {
+    ResizeChecker = Private(require('ui/vislib/lib/resize_checker'));
+    EventEmitter = Private(require('ui/events'));
+    reflowWatcher = Private(require('ui/reflow_watcher'));
+    reflowSpies.on = sinon.spy(reflowWatcher, 'on');
+    reflowSpies.off = sinon.spy(reflowWatcher, 'off');
+
+    var $el = $(document.createElement('div'))
+    .appendTo('body')
+    .css('visibility', 'hidden')
+    .get(0);
+
+    checker = new ResizeChecker($el);
+  }));
+
+  afterEach(function () {
+    checker.$el.remove();
+    checker.destroy();
+  });
+
+  describe('basic functionality', function () {
+    it('is an event emitter', function () {
+      expect(checker).to.be.a(EventEmitter);
+    });
+
+    it('listens for the "reflow" event of the reflowWatchers', function () {
+      expect(reflowSpies.on).to.have.property('callCount', 1);
+      var call = reflowSpies.on.getCall(0);
+      expect(call.args[0]).to.be('reflow');
+    });
+
+    it('emits a "resize" event when the el is resized', function (done) {
+      checker.on('resize', function () {
+        done();
+      });
+
+      checker.$el.text('haz contents');
+      checker.check();
+    });
+  });
+
+  describe('#read', function () {
+    it('gets the proper dimensions for the element', function () {
+      var dimensions = checker.read();
+      var windowWidth = document.documentElement.clientWidth;
+
+      expect(dimensions.w).to.equal(windowWidth);
+      expect(dimensions.h).to.equal(0);
+    });
+  });
+
+  describe('#saveSize', function () {
+    it('calls #read() when no arg is passed', function () {
+      var stub = sinon.stub(checker, 'read').returns({});
+
+      checker.saveSize();
+
+      expect(stub).to.have.property('callCount', 1);
+    });
+
+    it('saves the size of the element', function () {
+      var football = {};
+      checker.saveSize(football);
+      expect(checker).to.have.property('_savedSize', football);
+    });
+
+    it('returns false if the size matches the previous value', function () {
+      expect(checker.saveSize(checker._savedSize)).to.be(false);
+    });
+
+    it('returns true if the size is different than previous value', function () {
+      expect(checker.saveSize({})).to.be(true);
+    });
+  });
+
+  describe('#check()', function () {
+    var emit;
+
+    beforeEach(function () {
+      emit = sinon.stub(checker, 'emit');
+
+      // prevent the checker from auto-checking
+      checker.destroy();
+      checker.startSchedule = checker.continueSchedule = _.noop;
+    });
+
+    it('does not emit "resize" immediately after a resize, but waits for changes to stop', function () {
+      expect(checker).to.have.property('_isDirty', false);
+
+      checker.$el.css('height', 100);
+      checker.check();
+
+      expect(checker).to.have.property('_isDirty', true);
+      expect(emit).to.have.property('callCount', 0);
+
+      // no change in el size
+      checker.check();
+
+      expect(checker).to.have.property('_isDirty', false);
+      expect(emit).to.have.property('callCount', 1);
+    });
+
+    it('emits "resize" based on MS_MAX_RESIZE_DELAY, even if el\'s constantly changing size', function () {
+      var steps = _.random(5, 10);
+      this.slow(steps * 10);
+
+      // we are going to fake the delay using the fake clock
+      var msStep = Math.floor(ResizeChecker.MS_MAX_RESIZE_DELAY / (steps - 1));
+      var clock = sinon.useFakeTimers();
+
+      _.times(steps, function step(i) {
+        checker.$el.css('height', 100 + i);
+        checker.check();
+
+        expect(checker).to.have.property('_isDirty', true);
+        expect(emit).to.have.property('callCount', i > steps ? 1 : 0);
+
+        clock.tick(msStep); // move the clock forward one step
+      });
+
+    });
+  });
+
+  describe('#destroy()', function () {
+    it('removes the "reflow" event from the reflowWatcher', function () {
+      var onCall = reflowSpies.on.getCall(0);
+      var handler = onCall.args[1];
+
+      checker.destroy();
+      expect(reflowSpies.off).to.have.property('callCount', 1);
+      expect(reflowSpies.off.calledWith('reflow', handler)).to.be.ok();
+    });
+
+    it('clears the timeout', function () {
+      var spy = sinon.spy(window, 'clearTimeout');
+      checker.destroy();
+      expect(spy).to.have.property('callCount', 1);
+    });
+  });
+
+  describe('scheduling', function () {
+    var clock;
+    var schedule;
+
+    beforeEach(function () {
+      // prevent the checker from running automatically
+      checker.destroy();
+      clock = sinon.useFakeTimers();
+
+      schedule = [];
+      _.times(25, function () {
+        schedule.push(_.random(3, 250));
+      });
+    });
+
+    it('walks the schedule, using each value as it\'s next timeout', function () {
+      var timerId = checker.startSchedule(schedule);
+
+      // start at 0 even though "start" used the first slot, we will still check it
+      for (var i = 0; i < schedule.length; i++) {
+        expect(clock.timers[timerId]).to.have.property('callAt', schedule[i]);
+        timerId = checker.continueSchedule();
+      }
+    });
+
+    it('repeats the last value in the schedule', function () {
+      var timerId = checker.startSchedule(schedule);
+
+      // start at 1, and go until there is one left
+      for (var i = 1; i < schedule.length - 1; i++) {
+        timerId = checker.continueSchedule();
+      }
+
+      var last = _.last(schedule);
+      _.times(5, function () {
+        var timer = clock.timers[checker.continueSchedule()];
+        expect(timer).to.have.property('callAt', last);
+      });
+    });
+  });
+});
diff --git a/src/ui/public/vislib/__tests__/lib/x_axis.js b/src/ui/public/vislib/__tests__/lib/x_axis.js
new file mode 100644
index 0000000000000..36d2620fa0a6b
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/lib/x_axis.js
@@ -0,0 +1,225 @@
+var d3 = require('d3');
+var angular = require('angular');
+var _ = require('lodash');
+var $ = require('jquery');
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+
+describe('Vislib xAxis Class Test Suite', function () {
+  var XAxis;
+  var Data;
+  var xAxis;
+  var el;
+  var fixture;
+  var dataObj;
+  var data = {
+    hits: 621,
+    label: '',
+    ordered: {
+      date: true,
+      interval: 30000,
+      max: 1408734982458,
+      min: 1408734082458
+    },
+    series: [
+      {
+        values: [
+          {
+            x: 1408734060000,
+            y: 8
+          },
+          {
+            x: 1408734090000,
+            y: 23
+          },
+          {
+            x: 1408734120000,
+            y: 30
+          },
+          {
+            x: 1408734150000,
+            y: 28
+          },
+          {
+            x: 1408734180000,
+            y: 36
+          },
+          {
+            x: 1408734210000,
+            y: 30
+          },
+          {
+            x: 1408734240000,
+            y: 26
+          },
+          {
+            x: 1408734270000,
+            y: 22
+          },
+          {
+            x: 1408734300000,
+            y: 29
+          },
+          {
+            x: 1408734330000,
+            y: 24
+          }
+        ]
+      }
+    ],
+    xAxisFormatter: function (thing) {
+      return new Date(thing);
+    },
+    xAxisLabel: 'Date Histogram',
+    yAxisLabel: 'Count'
+  };
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    Data = Private(require('ui/vislib/lib/data'));
+    XAxis = Private(require('ui/vislib/lib/x_axis'));
+
+    el = d3.select('body').append('div')
+      .attr('class', 'x-axis-wrapper')
+      .style('height', '40px');
+
+    fixture = el.append('div')
+      .attr('class', 'x-axis-div');
+
+    dataObj = new Data(data, {});
+    xAxis = new XAxis({
+      el: $('.x-axis-div')[0],
+      xValues: dataObj.xValues(),
+      ordered: dataObj.get('ordered'),
+      xAxisFormatter: dataObj.get('xAxisFormatter'),
+      _attr: {
+        margin: { top: 0, right: 0, bottom: 0, left: 0 }
+      }
+    });
+  }));
+
+  afterEach(function () {
+    fixture.remove();
+    el.remove();
+  });
+
+  describe('render Method', function () {
+    beforeEach(function () {
+      xAxis.render();
+    });
+
+    it('should append an svg to div', function () {
+      expect(el.selectAll('svg').length).to.be(1);
+    });
+
+    it('should append a g element to the svg', function () {
+      expect(el.selectAll('svg').select('g').length).to.be(1);
+    });
+
+    it('should append ticks with text', function () {
+      expect(!!el.selectAll('svg').selectAll('.tick text')).to.be(true);
+    });
+  });
+
+  describe('getScale, getDomain, getTimeDomain, getOrdinalDomain, and getRange Methods', function () {
+    var ordered;
+    var timeScale;
+    var timeDomain;
+    var ordinalScale;
+    var ordinalDomain;
+    var width;
+    var range;
+
+    beforeEach(function () {
+      timeScale = xAxis.getScale();
+      timeDomain = xAxis.getDomain(timeScale);
+      range = xAxis.getRange(timeDomain, width);
+      xAxis.ordered = {};
+      ordinalScale = xAxis.getScale();
+      ordinalDomain = ordinalScale.domain(['this', 'should', 'be', 'an', 'array']);
+      width = $('.x-axis-div').width();
+    });
+
+    it('should return a function', function () {
+      expect(_.isFunction(timeScale)).to.be(true);
+      expect(_.isFunction(ordinalScale)).to.be(true);
+    });
+
+    it('should return the correct domain', function () {
+      expect(_.isDate(timeDomain.domain()[0])).to.be(true);
+      expect(_.isDate(timeDomain.domain()[1])).to.be(true);
+    });
+
+    it('should return the min and max dates', function () {
+      expect(timeDomain.domain()[0].toDateString()).to.be(new Date(1408734060000).toDateString());
+      expect(timeDomain.domain()[1].toDateString()).to.be(new Date(1408734330000).toDateString());
+    });
+
+    it('should return an ordinal scale', function () {
+      expect(ordinalDomain.domain()[0]).to.be('this');
+      expect(ordinalDomain.domain()[4]).to.be('array');
+    });
+
+    it('should return an array of values', function () {
+      expect(_.isArray(ordinalDomain.domain())).to.be(true);
+    });
+
+    it('should return the correct range', function () {
+      expect(range.range()[0]).to.be(0);
+      expect(range.range()[1]).to.be(width);
+    });
+  });
+
+  describe('getXScale Method', function () {
+    var width;
+    var xScale;
+
+    beforeEach(function () {
+      width = $('.x-axis-div').width();
+      xScale = xAxis.getXScale(width);
+    });
+
+    it('should return a function', function () {
+      expect(_.isFunction(xScale)).to.be(true);
+    });
+
+    it('should return a domain', function () {
+      expect(_.isDate(xScale.domain()[0])).to.be(true);
+      expect(_.isDate(xScale.domain()[1])).to.be(true);
+    });
+
+    it('should return a range', function () {
+      expect(xScale.range()[0]).to.be(0);
+      expect(xScale.range()[1]).to.be(width);
+    });
+  });
+
+  describe('getXAxis Method', function () {
+    var width;
+    var axis;
+
+    beforeEach(function () {
+      width = $('.x-axis-div').width();
+      xAxis.getXAxis(width);
+    });
+
+    it('should create an xAxis function on the xAxis class', function () {
+      expect(_.isFunction(xAxis.xAxis)).to.be(true);
+    });
+
+    it('should create an xScale function on the xAxis class', function () {
+      expect(_.isFunction(xAxis.xScale)).to.be(true);
+    });
+
+    it('should create an xAxisFormatter function on the xAxis class', function () {
+      expect(_.isFunction(xAxis.xAxisFormatter)).to.be(true);
+    });
+  });
+
+  describe('draw Method', function () {
+    it('should be a function', function () {
+      expect(_.isFunction(xAxis.draw())).to.be(true);
+    });
+  });
+
+});
diff --git a/src/ui/public/vislib/__tests__/lib/y_axis.js b/src/ui/public/vislib/__tests__/lib/y_axis.js
new file mode 100644
index 0000000000000..dbd446ad66f6e
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/lib/y_axis.js
@@ -0,0 +1,407 @@
+var _ = require('lodash');
+var d3 = require('d3');
+var $ = require('jquery');
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+
+var YAxis;
+var Data;
+var el;
+var buildYAxis;
+var yAxis;
+var yAxisDiv;
+
+var timeSeries = [
+  1408734060000,
+  1408734090000,
+  1408734120000,
+  1408734150000,
+  1408734180000,
+  1408734210000,
+  1408734240000,
+  1408734270000,
+  1408734300000,
+  1408734330000
+];
+
+var defaultGraphData = [
+  [ 8, 23, 30, 28, 36, 30, 26, 22, 29, 24 ],
+  [ 2, 13, 20, 18, 26, 20, 16, 12, 19, 14 ]
+];
+
+function makeSeriesData(data) {
+  return timeSeries.map(function (timestamp, i) {
+    return {
+      x: timestamp,
+      y: data[i] || 0
+    };
+  });
+}
+
+function createData(seriesData) {
+  var data = {
+    hits: 621,
+    label: 'test',
+    ordered: {
+      date: true,
+      interval: 30000,
+      max: 1408734982458,
+      min: 1408734082458
+    },
+    series: seriesData.map(function (series) {
+      return { values: makeSeriesData(series) };
+    }),
+    xAxisLabel: 'Date Histogram',
+    yAxisLabel: 'Count'
+  };
+
+  var node = $('<div>').css({
+    height: 40,
+    width: 40
+  })
+  .appendTo('body')
+  .addClass('y-axis-wrapper')
+  .get(0);
+
+  el = d3.select(node).datum(data);
+
+  yAxisDiv = el.append('div')
+  .attr('class', 'y-axis-div');
+
+  var dataObj = new Data(data, {
+    defaultYMin: true
+  });
+
+  buildYAxis = function (params) {
+    return new YAxis(_.merge({}, params, {
+      el: node,
+      yMin: dataObj.getYMin(),
+      yMax: dataObj.getYMax(),
+      _attr: {
+        margin: { top: 0, right: 0, bottom: 0, left: 0 },
+        defaultYMin: true,
+        setYExtents: false,
+        yAxis: {}
+      }
+    }));
+  };
+
+  yAxis = buildYAxis();
+}
+
+describe('Vislib yAxis Class Test Suite', function () {
+  beforeEach(ngMock.module('kibana'));
+
+  beforeEach(ngMock.inject(function (Private) {
+    Data = Private(require('ui/vislib/lib/data'));
+    YAxis = Private(require('ui/vislib/lib/y_axis'));
+
+    expect($('.y-axis-wrapper')).to.have.length(0);
+  }));
+
+  afterEach(function () {
+    el.remove();
+    yAxisDiv.remove();
+  });
+
+  describe('render Method', function () {
+    beforeEach(function () {
+      createData(defaultGraphData);
+      expect(d3.select(yAxis.el).selectAll('.y-axis-div')).to.have.length(1);
+      yAxis.render();
+    });
+
+    it('should append an svg to div', function () {
+      expect(el.selectAll('svg').length).to.be(1);
+    });
+
+    it('should append a g element to the svg', function () {
+      expect(el.selectAll('svg').select('g').length).to.be(1);
+    });
+
+    it('should append ticks with text', function () {
+      expect(!!el.selectAll('svg').selectAll('.tick text')).to.be(true);
+    });
+  });
+
+  describe('getYScale Method', function () {
+    var yScale;
+    var graphData;
+    var domain;
+    var height = 50;
+
+    function checkDomain(min, max) {
+      var domain = yScale.domain();
+      expect(domain[0]).to.be.lessThan(min + 1);
+      expect(domain[1]).to.be.greaterThan(max - 1);
+      return domain;
+    }
+
+    function checkRange() {
+      expect(yScale.range()[0]).to.be(height);
+      expect(yScale.range()[1]).to.be(0);
+    }
+
+    describe('API', function () {
+      beforeEach(function () {
+        createData(defaultGraphData);
+        yScale = yAxis.getYScale(height);
+      });
+
+      it('should return a function', function () {
+        expect(_.isFunction(yScale)).to.be(true);
+      });
+    });
+
+    describe('should return log values', function () {
+      var domain;
+      var extents;
+
+      it('should return 1', function () {
+        yAxis._attr.scale = 'log';
+        extents = [0, 400];
+        domain = yAxis._getExtents(extents);
+
+        // Log scales have a yMin value of 1
+        expect(domain[0]).to.be(1);
+      });
+    });
+
+    describe('positive values', function () {
+      beforeEach(function () {
+        graphData = defaultGraphData;
+        createData(graphData);
+        yScale = yAxis.getYScale(height);
+      });
+
+
+      it('should have domain between 0 and max value', function () {
+        var min = 0;
+        var max = _.max(_.flattenDeep(graphData));
+        var domain = checkDomain(min, max);
+        expect(domain[1]).to.be.greaterThan(0);
+        checkRange();
+      });
+    });
+
+    describe('negative values', function () {
+      beforeEach(function () {
+        graphData = [
+          [ -8, -23, -30, -28, -36, -30, -26, -22, -29, -24 ],
+          [ -22, -8, -30, -4, 0, 0, -3, -22, -14, -24 ]
+        ];
+        createData(graphData);
+        yScale = yAxis.getYScale(height);
+      });
+
+      it('should have domain between min value and 0', function () {
+        var min = _.min(_.flattenDeep(graphData));
+        var max = 0;
+        var domain = checkDomain(min, max);
+        expect(domain[0]).to.be.lessThan(0);
+        checkRange();
+      });
+    });
+
+    describe('positive and negative values', function () {
+      beforeEach(function () {
+        graphData = [
+          [ 8, 23, 30, 28, 36, 30, 26, 22, 29, 24 ],
+          [ 22, 8, -30, -4, 0, 0, 3, -22, 14, 24 ]
+        ];
+        createData(graphData);
+        yScale = yAxis.getYScale(height);
+      });
+
+      it('should have domain between min and max values', function () {
+        var min = _.min(_.flattenDeep(graphData));
+        var max = _.max(_.flattenDeep(graphData));
+        var domain = checkDomain(min, max);
+        expect(domain[0]).to.be.lessThan(0);
+        expect(domain[1]).to.be.greaterThan(0);
+        checkRange();
+      });
+    });
+
+    describe('validate user defined values', function () {
+      beforeEach(function () {
+        yAxis._attr.mode = 'stacked';
+        yAxis._attr.setYExtents = false;
+        yAxis._attr.yAxis = {};
+      });
+
+      it('should throw a NaN error', function () {
+        var min = 'Not a number';
+        var max = 12;
+
+        expect(function () {
+          yAxis._validateUserExtents(min, max);
+        }).to.throwError();
+      });
+
+      it('should return a decimal value', function () {
+        yAxis._attr.mode = 'percentage';
+        yAxis._attr.setYExtents = true;
+        domain = [];
+        domain[0] = yAxis._attr.yAxis.min = 20;
+        domain[1] = yAxis._attr.yAxis.max = 80;
+        var newDomain = yAxis._validateUserExtents(domain);
+
+        expect(newDomain[0]).to.be(domain[0] / 100);
+        expect(newDomain[1]).to.be(domain[1] / 100);
+      });
+
+      it('should return the user defined value', function () {
+        domain = [20, 50];
+        var newDomain = yAxis._validateUserExtents(domain);
+
+        expect(newDomain[0]).to.be(domain[0]);
+        expect(newDomain[1]).to.be(domain[1]);
+      });
+    });
+
+    describe('should throw an error when', function () {
+      it('min === max', function () {
+        var min = 12;
+        var max = 12;
+
+        expect(function () {
+          yAxis._validateAxisExtents(min, max);
+        }).to.throwError();
+      });
+
+      it('min > max', function () {
+        var min = 30;
+        var max = 10;
+
+        expect(function () {
+          yAxis._validateAxisExtents(min, max);
+        }).to.throwError();
+      });
+    });
+  });
+
+  describe('getScaleType method', function () {
+    var fnNames = ['linear', 'log', 'square root'];
+
+    it('should return a function', function () {
+      fnNames.forEach(function (fnName) {
+        expect(yAxis._getScaleType(fnName)).to.be.a(Function);
+      });
+
+      // if no value is provided to the function, scale should default to a linear scale
+      expect(yAxis._getScaleType()).to.be.a(Function);
+    });
+
+    it('should throw an error if function name is undefined', function () {
+      expect(function () {
+        yAxis._getScaleType('square');
+      }).to.throwError();
+    });
+  });
+
+  describe('_logDomain method', function () {
+    it('should throw an error', function () {
+      expect(function () {
+        yAxis._logDomain(-10, -5);
+      }).to.throwError();
+      expect(function () {
+        yAxis._logDomain(-10, 5);
+      }).to.throwError();
+      expect(function () {
+        yAxis._logDomain(0, -5);
+      }).to.throwError();
+    });
+
+    it('should return a yMin value of 1', function () {
+      var yMin = yAxis._logDomain(0, 200)[0];
+      expect(yMin).to.be(1);
+    });
+  });
+
+  describe('getYAxis method', function () {
+    var mode, yMax, yScale;
+    beforeEach(function () {
+      createData(defaultGraphData);
+      mode = yAxis._attr.mode;
+      yMax = yAxis.yMax;
+      yScale = yAxis.getYScale;
+    });
+
+    afterEach(function () {
+      yAxis._attr.mode = mode;
+      yAxis.yMax = yMax;
+      yAxis.getYScale = yScale;
+    });
+
+    it('should use percentage format for percentages', function () {
+      yAxis._attr.mode = 'percentage';
+      var tickFormat = yAxis.getYAxis().tickFormat();
+      expect(tickFormat(1)).to.be('100%');
+    });
+
+    it('should use decimal format for small values', function () {
+      yAxis.yMax = 1;
+      var tickFormat = yAxis.getYAxis().tickFormat();
+      expect(tickFormat(0.8)).to.be('0.8');
+    });
+
+    it('should throw an error if yScale is NaN', function () {
+      yAxis.getYScale = function () { return NaN; };
+      expect(function () {
+        yAxis.getYAxis();
+      }).to.throwError();
+    });
+  });
+
+  describe('draw Method', function () {
+    beforeEach(function () {
+      createData(defaultGraphData);
+    });
+
+    it('should be a function', function () {
+      expect(_.isFunction(yAxis.draw())).to.be(true);
+    });
+  });
+
+  describe('tickScale Method', function () {
+    beforeEach(function () {
+      createData(defaultGraphData);
+    });
+
+    it('should return the correct number of ticks', function () {
+      expect(yAxis.tickScale(1000)).to.be(11);
+      expect(yAxis.tickScale(40)).to.be(3);
+      expect(yAxis.tickScale(20)).to.be(0);
+    });
+  });
+
+  describe('#tickFormat()', function () {
+    var formatter = function () {};
+
+    it('returns a basic number formatter by default', function () {
+      var yAxis = buildYAxis();
+      expect(yAxis.tickFormat()).to.not.be(formatter);
+      expect(yAxis.tickFormat()(1)).to.be('1');
+    });
+
+    it('returns the yAxisFormatter when passed', function () {
+      var yAxis = buildYAxis({
+        yAxisFormatter: formatter
+      });
+      expect(yAxis.tickFormat()).to.be(formatter);
+    });
+
+    it('returns a percentage formatter when the vis is in percentage mode', function () {
+      var yAxis = buildYAxis({
+        yAxisFormatter: formatter,
+        _attr: {
+          mode: 'percentage'
+        }
+      });
+
+      expect(yAxis.tickFormat()).to.not.be(formatter);
+      expect(yAxis.tickFormat()(1)).to.be('100%');
+    });
+  });
+});
diff --git a/src/ui/public/vislib/__tests__/vis.js b/src/ui/public/vislib/__tests__/vis.js
new file mode 100644
index 0000000000000..f5d14fcae5b04
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/vis.js
@@ -0,0 +1,261 @@
+var _ = require('lodash');
+var $ = require('jquery');
+var d3 = require('d3');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+var series = require('fixtures/vislib/mock_data/date_histogram/_series');
+var columns = require('fixtures/vislib/mock_data/date_histogram/_columns');
+var rows = require('fixtures/vislib/mock_data/date_histogram/_rows');
+var stackedSeries = require('fixtures/vislib/mock_data/date_histogram/_stacked_series');
+
+var dataArray = [
+  series,
+  columns,
+  rows,
+  stackedSeries
+];
+
+var names = [
+  'series',
+  'columns',
+  'rows',
+  'stackedSeries'
+];
+
+
+dataArray.forEach(function (data, i) {
+  describe('Vislib Vis Test Suite for ' + names[i] + ' Data', function () {
+    var beforeEvent = 'click';
+    var afterEvent = 'brush';
+    var vis;
+    var secondVis;
+    var numberOfCharts;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      vis = Private(require('fixtures/vislib/_vis_fixture'))();
+      secondVis = Private(require('fixtures/vislib/_vis_fixture'))();
+    }));
+
+    afterEach(function () {
+      $(vis.el).remove();
+      $(secondVis.el).remove();
+      vis = null;
+    });
+
+    describe('render Method', function () {
+      beforeEach(function () {
+        vis.render(data);
+        numberOfCharts = vis.handler.charts.length;
+      });
+
+      it('should bind data to this object', function () {
+        expect(_.isObject(vis.data)).to.be(true);
+      });
+
+      it('should instantiate a handler object', function () {
+        expect(_.isObject(vis.handler)).to.be(true);
+      });
+
+      it('should append a chart', function () {
+        expect($('.chart').length).to.be(numberOfCharts);
+      });
+
+    });
+
+    describe('resize Method', function () {
+      beforeEach(function () {
+        vis.render(data);
+        vis.resize();
+        numberOfCharts = vis.handler.charts.length;
+      });
+
+      it('should throw an error', function () {
+        expect(function () {
+          vis.data = undefined;
+          vis.render();
+        }).to.throwError();
+      });
+
+      it('should resize the visualization', function () {
+        expect(vis.handler.charts.length).to.be(numberOfCharts);
+      });
+    });
+
+    describe('destroy Method', function () {
+      beforeEach(function () {
+        vis.render(data);
+        secondVis.render(data);
+        secondVis.destroy();
+      });
+
+      it('should remove all DOM elements from el', function () {
+        expect($(secondVis.el).find('.vis-wrapper').length).to.be(0);
+      });
+
+      it('should not remove visualizations that have not been destroyed', function () {
+        expect($(vis.el).find('.vis-wrapper').length).to.be(1);
+      });
+    });
+
+    describe('set Method', function () {
+      beforeEach(function () {
+        vis.render(data);
+        vis.set('addLegend', false);
+        vis.set('offset', 'wiggle');
+      });
+
+      it('should set an attribute', function () {
+        expect(vis.get('addLegend')).to.be(false);
+        expect(vis.get('offset')).to.be('wiggle');
+      });
+    });
+
+    describe('get Method', function () {
+      beforeEach(function () {
+        vis.render(data);
+      });
+
+      it('should get attribue values', function () {
+        expect(vis.get('addLegend')).to.be(true);
+        expect(vis.get('addTooltip')).to.be(true);
+        expect(vis.get('type')).to.be('histogram');
+      });
+    });
+
+    describe('on Method', function () {
+      var events = [
+        beforeEvent,
+        afterEvent
+      ];
+      var listeners;
+      var listener1;
+      var listener2;
+
+      beforeEach(function () {
+        listeners = [
+          listener1 = function () {},
+          listener2 = function () {}
+        ];
+
+        // Add event and listeners to chart
+        listeners.forEach(function (listener) {
+          vis.on(beforeEvent, listener);
+        });
+
+        // Render chart
+        vis.render(data);
+
+        // Add event after charts have rendered
+        listeners.forEach(function (listener) {
+          vis.on(afterEvent, listener);
+        });
+      });
+
+      afterEach(function () {
+        vis.off(beforeEvent);
+        vis.off(afterEvent);
+      });
+
+      it('should add an event and its listeners', function () {
+        listeners.forEach(function (listener) {
+          expect(vis.listeners(beforeEvent)).to.contain(listener);
+        });
+
+        listeners.forEach(function (listener) {
+          expect(vis.listeners(afterEvent)).to.contain(listener);
+        });
+      });
+
+      it('should cause a listener for each event to be attached to each chart', function () {
+        var charts = vis.handler.charts;
+
+        charts.forEach(function (chart, i) {
+          expect(chart.events.listenerCount(beforeEvent)).to.be.above(0);
+          expect(chart.events.listenerCount(afterEvent)).to.be.above(0);
+        });
+      });
+    });
+
+    describe('off Method', function () {
+      var listeners;
+      var listener1;
+      var listener2;
+
+      beforeEach(function () {
+        listeners = [];
+        listener1 = function () {};
+        listener2 = function () {};
+        listeners.push(listener1);
+        listeners.push(listener2);
+
+        // Add event and listeners to chart
+        listeners.forEach(function (listener) {
+          vis.on(beforeEvent, listener);
+        });
+
+        // Turn off event listener before chart rendered
+        vis.off(beforeEvent, listener1);
+
+        // Render chart
+        vis.render(data);
+
+        // Add event after charts have rendered
+        listeners.forEach(function (listener) {
+          vis.on(afterEvent, listener);
+        });
+
+        // Turn off event listener after chart is rendered
+        vis.off(afterEvent, listener1);
+      });
+
+      afterEach(function () {
+        vis.off(beforeEvent);
+        vis.off(afterEvent);
+      });
+
+      it('should remove a listener', function () {
+        var charts = vis.handler.charts;
+
+        expect(vis.listeners(beforeEvent)).to.not.contain(listener1);
+        expect(vis.listeners(beforeEvent)).to.contain(listener2);
+
+        expect(vis.listeners(afterEvent)).to.not.contain(listener1);
+        expect(vis.listeners(afterEvent)).to.contain(listener2);
+
+        // Events should still be attached to charts
+        charts.forEach(function (chart) {
+          expect(chart.events.listenerCount(beforeEvent)).to.be.above(0);
+          expect(chart.events.listenerCount(afterEvent)).to.be.above(0);
+        });
+      });
+
+      it('should remove the event and all listeners when only event passed an argument', function () {
+        var charts = vis.handler.charts;
+        vis.off(afterEvent);
+
+        // should remove 'brush' event
+        expect(vis.listeners(beforeEvent)).to.contain(listener2);
+        expect(vis.listeners(afterEvent)).to.not.contain(listener2);
+
+        // should remove the event from the charts
+        charts.forEach(function (chart) {
+          expect(chart.events.listenerCount(beforeEvent)).to.be.above(0);
+          expect(chart.events.listenerCount(afterEvent)).to.be(0);
+        });
+      });
+
+      it('should remove the event from the chart when the last listener is removed', function () {
+        var charts = vis.handler.charts;
+        vis.off(afterEvent, listener2);
+
+        expect(vis.listenerCount(afterEvent)).to.be(0);
+
+        charts.forEach(function (chart) {
+          expect(chart.events.listenerCount(afterEvent)).to.be(0);
+        });
+      });
+    });
+  });
+});
diff --git a/src/ui/public/vislib/__tests__/visualizations/area_chart.js b/src/ui/public/vislib/__tests__/visualizations/area_chart.js
new file mode 100644
index 0000000000000..66e6e292ba59e
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/visualizations/area_chart.js
@@ -0,0 +1,232 @@
+var d3 = require('d3');
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+var _ = require('lodash');
+var $ = require('jquery');
+
+var woahLotsOfVariables = require('fixtures/vislib/mock_data/date_histogram/_series');
+var notQuiteEnoughVariables = require('fixtures/vislib/mock_data/not_enough_data/_one_point');
+var someOtherVariables = {
+  'series pos': require('fixtures/vislib/mock_data/date_histogram/_series'),
+  'series pos neg': require('fixtures/vislib/mock_data/date_histogram/_series_pos_neg'),
+  'series neg': require('fixtures/vislib/mock_data/date_histogram/_series_neg'),
+  'term columns': require('fixtures/vislib/mock_data/terms/_columns'),
+  'range rows': require('fixtures/vislib/mock_data/range/_rows'),
+  'stackedSeries': require('fixtures/vislib/mock_data/date_histogram/_stacked_series')
+};
+
+var visLibParams = {
+  type: 'area',
+  addLegend: true,
+  addTooltip: true
+};
+
+
+_.forOwn(someOtherVariables, function (variablesAreCool, imaVariable) {
+  describe('Vislib Area Chart Test Suite for ' + imaVariable + ' Data', function () {
+    var vis;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      vis = Private(require('fixtures/vislib/_vis_fixture'))(visLibParams);
+      vis.on('brush', _.noop);
+      vis.render(variablesAreCool);
+    }));
+
+    afterEach(function () {
+      $(vis.el).remove();
+      vis = null;
+    });
+
+    describe('checkIfEnoughData method throws an error when not enough data', function () {
+      beforeEach(function () {
+        ngMock.inject(function () {
+          vis.render(notQuiteEnoughVariables);
+        });
+      });
+
+      it('should throw a Not Enough Data Error', function () {
+        vis.handler.charts.forEach(function (chart) {
+          expect(function () {
+            chart.checkIfEnoughData();
+          }).to.throwError();
+        });
+      });
+    });
+
+    describe('checkIfEnoughData method should not throw an error when enough data', function () {
+      beforeEach(function () {
+        ngMock.inject(function () {
+          vis.render(woahLotsOfVariables);
+        });
+      });
+
+      it('should not throw a Not Enough Data Error', function () {
+        vis.handler.charts.forEach(function (chart) {
+          expect(function () {
+            chart.checkIfEnoughData();
+          }).to.not.throwError();
+        });
+      });
+    });
+
+    describe('stackData method', function () {
+      var stackedData;
+      var isStacked;
+
+      beforeEach(function () {
+        vis.handler.charts.forEach(function (chart) {
+          stackedData = chart.stackData(chart.chartData);
+
+          isStacked = stackedData.every(function (arr) {
+            return arr.every(function (d) {
+              return _.isNumber(d.y0);
+            });
+          });
+        });
+      });
+
+      it('should append a d.y0 key to the data object', function () {
+        expect(isStacked).to.be(true);
+      });
+    });
+
+    describe('addPath method', function () {
+      it('should append a area paths', function () {
+        vis.handler.charts.forEach(function (chart) {
+          expect($(chart.chartEl).find('path').length).to.be.greaterThan(0);
+        });
+      });
+    });
+
+    describe('addCircleEvents method', function () {
+      var circle;
+      var brush;
+      var d3selectedCircle;
+      var onBrush;
+      var onClick;
+      var onMouseOver;
+
+      beforeEach(ngMock.inject(function () {
+        vis.handler.charts.forEach(function (chart) {
+          circle = $(chart.chartEl).find('circle')[0];
+          brush = $(chart.chartEl).find('.brush');
+          d3selectedCircle = d3.select(circle)[0][0];
+
+          // d3 instance of click and hover
+          onBrush = (!!brush);
+          onClick = (!!d3selectedCircle.__onclick);
+          onMouseOver = (!!d3selectedCircle.__onmouseover);
+        });
+      }));
+
+      // D3 brushing requires that a g element is appended that
+      // listens for mousedown events. This g element includes
+      // listeners, however, I was not able to test for the listener
+      // function being present. I will need to update this test
+      // in the future.
+      it('should attach a brush g element', function () {
+        vis.handler.charts.forEach(function () {
+          expect(onBrush).to.be(true);
+        });
+      });
+
+      it('should attach a click event', function () {
+        vis.handler.charts.forEach(function () {
+          expect(onClick).to.be(true);
+        });
+      });
+
+      it('should attach a hover event', function () {
+        vis.handler.charts.forEach(function () {
+          expect(onMouseOver).to.be(true);
+        });
+      });
+    });
+
+    describe('addCircles method', function () {
+      it('should append circles', function () {
+        vis.handler.charts.forEach(function (chart) {
+          expect($(chart.chartEl).find('circle').length).to.be.greaterThan(0);
+        });
+      });
+
+      it('should not draw circles where d.y === 0', function () {
+        vis.handler.charts.forEach(function (chart) {
+          var series = chart.chartData.series;
+          var isZero = series.some(function (d) {
+            return d.y === 0;
+          });
+          var circles = $.makeArray($(chart.chartEl).find('circle'));
+          var isNotDrawn = circles.some(function (d) {
+            return d.__data__.y === 0;
+          });
+
+          if (isZero) {
+            expect(isNotDrawn).to.be(false);
+          }
+        });
+      });
+    });
+
+    describe('draw method', function () {
+      it('should return a function', function () {
+        vis.handler.charts.forEach(function (chart) {
+          expect(_.isFunction(chart.draw())).to.be(true);
+        });
+      });
+
+      it('should return a yMin and yMax', function () {
+        vis.handler.charts.forEach(function (chart) {
+          var yAxis = chart.handler.yAxis;
+
+          expect(yAxis.domain[0]).to.not.be(undefined);
+          expect(yAxis.domain[1]).to.not.be(undefined);
+        });
+      });
+
+      it('should render a zero axis line', function () {
+        vis.handler.charts.forEach(function (chart) {
+          var yAxis = chart.handler.yAxis;
+
+          if (yAxis.yMin < 0 && yAxis.yMax > 0) {
+            expect($(chart.chartEl).find('line.zero-line').length).to.be(1);
+          }
+        });
+      });
+    });
+
+    describe('containerTooSmall error', function () {
+      beforeEach(function () {
+        $(vis.el).height(0);
+        $(vis.el).width(0);
+      });
+
+      it('should throw an error', function () {
+        vis.handler.charts.forEach(function (chart) {
+          expect(function () {
+            chart.render();
+          }).to.throwError();
+        });
+      });
+    });
+
+    describe('defaultYExtents is true', function () {
+      beforeEach(function () {
+        vis._attr.defaultYExtents = true;
+        vis.render(variablesAreCool);
+      });
+
+      it('should return yAxis extents equal to data extents', function () {
+        vis.handler.charts.forEach(function (chart) {
+          var yAxis = chart.handler.yAxis;
+          var yVals = [vis.handler.data.getYMin(), vis.handler.data.getYMax()];
+
+          expect(yAxis.domain[0]).to.equal(yVals[0]);
+          expect(yAxis.domain[1]).to.equal(yVals[1]);
+        });
+      });
+    });
+  });
+});
diff --git a/src/ui/public/vislib/__tests__/visualizations/chart.js b/src/ui/public/vislib/__tests__/visualizations/chart.js
new file mode 100644
index 0000000000000..8fb2e758d45bb
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/visualizations/chart.js
@@ -0,0 +1,125 @@
+var d3 = require('d3');
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+
+describe('Vislib _chart Test Suite', function () {
+  var ColumnChart;
+  var Chart;
+  var Data;
+  var Vis;
+  var chartData = {};
+  var vis;
+  var el;
+  var myChart;
+  var config;
+  var data = {
+    hits      : 621,
+    label     : '',
+    ordered   : {
+      date: true,
+      interval: 30000,
+      max     : 1408734982458,
+      min     : 1408734082458
+    },
+    series    : [
+      {
+        values: [
+          {
+            x: 1408734060000,
+            y: 8
+          },
+          {
+            x: 1408734090000,
+            y: 23
+          },
+          {
+            x: 1408734120000,
+            y: 30
+          },
+          {
+            x: 1408734150000,
+            y: 28
+          },
+          {
+            x: 1408734180000,
+            y: 36
+          },
+          {
+            x: 1408734210000,
+            y: 30
+          },
+          {
+            x: 1408734240000,
+            y: 26
+          },
+          {
+            x: 1408734270000,
+            y: 22
+          },
+          {
+            x: 1408734300000,
+            y: 29
+          },
+          {
+            x: 1408734330000,
+            y: 24
+          }
+        ]
+      }
+    ],
+    tooltipFormatter: function (datapoint) {
+      return datapoint;
+    },
+    xAxisFormatter: function (thing) {
+      return thing;
+    },
+    xAxisLabel: 'Date Histogram',
+    yAxisLabel: 'Count'
+  };
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    Vis = Private(require('ui/vislib/vis'));
+    Data = Private(require('ui/vislib/lib/data'));
+    ColumnChart = Private(require('ui/vislib/visualizations/column_chart'));
+    Chart = Private(require('ui/vislib/visualizations/_chart'));
+
+    el = d3.select('body').append('div').attr('class', 'column-chart');
+
+    config = {
+      type: 'histogram',
+      shareYAxis: true,
+      addTooltip: true,
+      addLegend: true,
+      stack: d3.layout.stack(),
+    };
+
+    vis = new Vis(el[0][0], config);
+    vis.data = new Data(data, config);
+
+    myChart = new ColumnChart(vis, el, chartData);
+  }));
+
+  afterEach(function () {
+    el.remove();
+  });
+
+  it('should be a constructor for visualization modules', function () {
+    expect(myChart instanceof Chart).to.be(true);
+  });
+
+  it('should have a render method', function () {
+    expect(typeof myChart.render === 'function').to.be(true);
+  });
+
+  it('should destroy the chart element', function () {
+    // Once destroy is called, a chart should not be able to be drawn
+    myChart.destroy();
+
+    expect(function () {
+      myChart.draw();
+    }).to.throwError();
+  });
+
+});
diff --git a/src/ui/public/vislib/__tests__/visualizations/column_chart.js b/src/ui/public/vislib/__tests__/visualizations/column_chart.js
new file mode 100644
index 0000000000000..eb211d04e72f6
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/visualizations/column_chart.js
@@ -0,0 +1,201 @@
+
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+var _ = require('lodash');
+var $ = require('jquery');
+var d3 = require('d3');
+
+// Data
+var series = require('fixtures/vislib/mock_data/date_histogram/_series');
+var seriesPosNeg = require('fixtures/vislib/mock_data/date_histogram/_series_pos_neg');
+var seriesNeg = require('fixtures/vislib/mock_data/date_histogram/_series_neg');
+var termsColumns = require('fixtures/vislib/mock_data/terms/_columns');
+//var histogramRows = require('fixtures/vislib/mock_data/histogram/_rows');
+var stackedSeries = require('fixtures/vislib/mock_data/date_histogram/_stacked_series');
+
+// tuple, with the format [description, mode, data]
+var dataTypesArray = [
+  ['series', 'stacked', series],
+  ['series with positive and negative values', 'stacked', seriesPosNeg],
+  ['series with negative values', 'stacked', seriesNeg],
+  ['terms columns', 'grouped', termsColumns],
+  // ['histogram rows', 'percentage', histogramRows],
+  ['stackedSeries', 'stacked', stackedSeries],
+];
+
+dataTypesArray.forEach(function (dataType, i) {
+  var name = dataType[0];
+  var mode = dataType[1];
+  var data = dataType[2];
+
+  describe('Vislib Column Chart Test Suite for ' + name + ' Data', function () {
+    var vis;
+    var visLibParams = {
+      type: 'histogram',
+      addLegend: true,
+      addTooltip: true,
+      mode: mode
+    };
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      vis = Private(require('fixtures/vislib/_vis_fixture'))(visLibParams);
+      vis.on('brush', _.noop);
+      vis.render(data);
+    }));
+
+    afterEach(function () {
+      $(vis.el).remove();
+      vis = null;
+    });
+
+    describe('stackData method', function () {
+      var stackedData;
+      var isStacked;
+
+      beforeEach(function () {
+        vis.handler.charts.forEach(function (chart) {
+          stackedData = chart.stackData(chart.chartData);
+
+          isStacked = stackedData.every(function (arr) {
+            return arr.every(function (d) {
+              return _.isNumber(d.y0);
+            });
+          });
+        });
+      });
+
+      it('should append a d.y0 key to the data object', function () {
+        expect(isStacked).to.be(true);
+      });
+    });
+
+    describe('addBars method', function () {
+      it('should append rects', function () {
+        var numOfSeries;
+        var numOfValues;
+        var product;
+
+        vis.handler.charts.forEach(function (chart) {
+          numOfSeries = chart.chartData.series.length;
+          numOfValues = chart.chartData.series[0].values.length;
+          product = numOfSeries * numOfValues;
+          expect($(chart.chartEl).find('.series rect')).to.have.length(product);
+        });
+      });
+    });
+
+    describe('updateBars method', function () {
+      beforeEach(function () {
+        vis.handler._attr.mode = 'grouped';
+        vis.render(vis.data);
+      });
+
+      it('should returned grouped bars', function () {
+        vis.handler.charts.forEach(function (chart) {});
+      });
+    });
+
+    describe('addBarEvents method', function () {
+      function checkChart(chart) {
+        var rect = $(chart.chartEl).find('.series rect').get(0);
+
+        // check for existance of stuff and things
+        return {
+          click: !!rect.__onclick,
+          mouseOver: !!rect.__onmouseover,
+          // D3 brushing requires that a g element is appended that
+          // listens for mousedown events. This g element includes
+          // listeners, however, I was not able to test for the listener
+          // function being present. I will need to update this test
+          // in the future.
+          brush: !!d3.select('.brush')[0][0]
+        };
+      }
+
+      it('should attach the brush if data is a set of ordered dates', function () {
+        vis.handler.charts.forEach(function (chart) {
+          var has = checkChart(chart);
+          var ordered = vis.handler.data.get('ordered');
+          var date = Boolean(ordered && ordered.date);
+          expect(has.brush).to.be(date);
+        });
+      });
+
+      it('should attach a click event', function () {
+        vis.handler.charts.forEach(function (chart) {
+          var has = checkChart(chart);
+          expect(has.click).to.be(true);
+        });
+      });
+
+      it('should attach a hover event', function () {
+        vis.handler.charts.forEach(function (chart) {
+          var has = checkChart(chart);
+          expect(has.mouseOver).to.be(true);
+        });
+      });
+    });
+
+    describe('draw method', function () {
+      it('should return a function', function () {
+        vis.handler.charts.forEach(function (chart) {
+          expect(_.isFunction(chart.draw())).to.be(true);
+        });
+      });
+
+      it('should return a yMin and yMax', function () {
+        vis.handler.charts.forEach(function (chart) {
+          var yAxis = chart.handler.yAxis;
+
+          expect(yAxis.domain[0]).to.not.be(undefined);
+          expect(yAxis.domain[1]).to.not.be(undefined);
+        });
+      });
+
+      it('should render a zero axis line', function () {
+        vis.handler.charts.forEach(function (chart) {
+          var yAxis = chart.handler.yAxis;
+
+          if (yAxis.yMin < 0 && yAxis.yMax > 0) {
+            expect($(chart.chartEl).find('line.zero-line').length).to.be(1);
+          }
+        });
+      });
+    });
+
+    describe('containerTooSmall error', function () {
+      beforeEach(function () {
+        $(vis.el).height(0);
+        $(vis.el).width(0);
+      });
+
+      it('should throw an error', function () {
+        vis.handler.charts.forEach(function (chart) {
+          expect(function () {
+            chart.render();
+          }).to.throwError();
+        });
+      });
+    });
+
+    describe('defaultYExtents is true', function () {
+      beforeEach(function () {
+        vis._attr.defaultYExtents = true;
+        vis.render(data);
+      });
+
+      it('should return yAxis extents equal to data extents', function () {
+        vis.handler.charts.forEach(function (chart) {
+          var yAxis = chart.handler.yAxis;
+          var min = vis.handler.data.getYMin();
+          var max = vis.handler.data.getYMax();
+
+          expect(yAxis.domain[0]).to.equal(min);
+          expect(yAxis.domain[1]).to.equal(max);
+        });
+      });
+    });
+  });
+});
diff --git a/src/ui/public/vislib/__tests__/visualizations/line_chart.js b/src/ui/public/vislib/__tests__/visualizations/line_chart.js
new file mode 100644
index 0000000000000..4b169437736e2
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/visualizations/line_chart.js
@@ -0,0 +1,183 @@
+var d3 = require('d3');
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+var _ = require('lodash');
+var $ = require('jquery');
+
+// Data
+var seriesPos = require('fixtures/vislib/mock_data/date_histogram/_series');
+var seriesPosNeg = require('fixtures/vislib/mock_data/date_histogram/_series_pos_neg');
+var seriesNeg = require('fixtures/vislib/mock_data/date_histogram/_series_neg');
+var histogramColumns = require('fixtures/vislib/mock_data/histogram/_columns');
+var rangeRows = require('fixtures/vislib/mock_data/range/_rows');
+var termSeries = require('fixtures/vislib/mock_data/terms/_series');
+
+var dataTypes = [
+  ['series pos', seriesPos],
+  ['series pos neg', seriesPosNeg],
+  ['series neg', seriesNeg],
+  ['histogram columns', histogramColumns],
+  ['range rows', rangeRows],
+  ['term series', termSeries],
+];
+
+describe('Vislib Line Chart', function () {
+  dataTypes.forEach(function (type, i) {
+    var name = type[0];
+    var data = type[1];
+
+    describe(name + ' Data', function () {
+      var vis;
+
+      beforeEach(ngMock.module('kibana'));
+      beforeEach(ngMock.inject(function (Private) {
+        var visLibParams = {
+          type: 'line',
+          addLegend: true,
+          addTooltip: true,
+          drawLinesBetweenPoints: true
+        };
+
+        vis = Private(require('fixtures/vislib/_vis_fixture'))(visLibParams);
+        vis.on('brush', _.noop);
+        vis.render(data);
+      }));
+
+      afterEach(function () {
+        $(vis.el).remove();
+        vis = null;
+      });
+
+      describe('addCircleEvents method', function () {
+        var circle;
+        var brush;
+        var d3selectedCircle;
+        var onBrush;
+        var onClick;
+        var onMouseOver;
+
+        beforeEach(ngMock.inject(function () {
+          vis.handler.charts.forEach(function (chart) {
+            circle = $(chart.chartEl).find('.circle')[0];
+            brush = $(chart.chartEl).find('.brush');
+            d3selectedCircle = d3.select(circle)[0][0];
+
+            // d3 instance of click and hover
+            onBrush = (!!brush);
+            onClick = (!!d3selectedCircle.__onclick);
+            onMouseOver = (!!d3selectedCircle.__onmouseover);
+          });
+        }));
+
+        // D3 brushing requires that a g element is appended that
+        // listens for mousedown events. This g element includes
+        // listeners, however, I was not able to test for the listener
+        // function being present. I will need to update this test
+        // in the future.
+        it('should attach a brush g element', function () {
+          vis.handler.charts.forEach(function () {
+            expect(onBrush).to.be(true);
+          });
+        });
+
+        it('should attach a click event', function () {
+          vis.handler.charts.forEach(function () {
+            expect(onClick).to.be(true);
+          });
+        });
+
+        it('should attach a hover event', function () {
+          vis.handler.charts.forEach(function () {
+            expect(onMouseOver).to.be(true);
+          });
+        });
+      });
+
+      describe('addCircles method', function () {
+        it('should append circles', function () {
+          vis.handler.charts.forEach(function (chart) {
+            expect($(chart.chartEl).find('circle').length).to.be.greaterThan(0);
+          });
+        });
+      });
+
+      describe('addLines method', function () {
+        it('should append a paths', function () {
+          vis.handler.charts.forEach(function (chart) {
+            expect($(chart.chartEl).find('path').length).to.be.greaterThan(0);
+          });
+        });
+      });
+
+      // Cannot seem to get these tests to work on the box
+      // They however pass in the browsers
+      //describe('addClipPath method', function () {
+      //  it('should append a clipPath', function () {
+      //    vis.handler.charts.forEach(function (chart) {
+      //      expect($(chart.chartEl).find('clipPath').length).to.be(1);
+      //    });
+      //  });
+      //});
+
+      describe('draw method', function () {
+        it('should return a function', function () {
+          vis.handler.charts.forEach(function (chart) {
+            expect(chart.draw()).to.be.a(Function);
+          });
+        });
+
+        it('should return a yMin and yMax', function () {
+          vis.handler.charts.forEach(function (chart) {
+            var yAxis = chart.handler.yAxis;
+
+            expect(yAxis.domain[0]).to.not.be(undefined);
+            expect(yAxis.domain[1]).to.not.be(undefined);
+          });
+        });
+
+        it('should render a zero axis line', function () {
+          vis.handler.charts.forEach(function (chart) {
+            var yAxis = chart.handler.yAxis;
+
+            if (yAxis.yMin < 0 && yAxis.yMax > 0) {
+              expect($(chart.chartEl).find('line.zero-line').length).to.be(1);
+            }
+          });
+        });
+      });
+
+      describe('containerTooSmall error', function () {
+        beforeEach(function () {
+          $(vis.el).height(0);
+          $(vis.el).width(0);
+        });
+
+        it('should throw an error', function () {
+          vis.handler.charts.forEach(function (chart) {
+            expect(function () {
+              chart.render();
+            }).to.throwError();
+          });
+        });
+      });
+
+      describe('defaultYExtents is true', function () {
+        beforeEach(function () {
+          vis._attr.defaultYExtents = true;
+          vis.render(data);
+        });
+
+        it('should return yAxis extents equal to data extents', function () {
+          vis.handler.charts.forEach(function (chart) {
+            var yAxis = chart.handler.yAxis;
+            var yVals = [vis.handler.data.getYMin(), vis.handler.data.getYMax()];
+
+            expect(yAxis.domain[0]).to.equal(yVals[0]);
+            expect(yAxis.domain[1]).to.equal(yVals[1]);
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/src/ui/public/vislib/__tests__/visualizations/pie_chart.js b/src/ui/public/vislib/__tests__/visualizations/pie_chart.js
new file mode 100644
index 0000000000000..695757a3fb918
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/visualizations/pie_chart.js
@@ -0,0 +1,290 @@
+var d3 = require('d3');
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+var _ = require('lodash');
+var $ = require('jquery');
+var fixtures = require('fixtures/fake_hierarchical_data');
+
+var rowAgg = [
+  { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
+  { type: 'terms', schema: 'split', params: { field: 'extension', rows: true }},
+  { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
+  { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
+];
+
+var colAgg = [
+  { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
+  { type: 'terms', schema: 'split', params: { field: 'extension', row: false }},
+  { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
+  { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
+];
+
+var sliceAgg = [
+  { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
+  { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
+  { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
+];
+
+var aggArray = [
+  rowAgg,
+  colAgg,
+  sliceAgg
+];
+
+var names = [
+  'rows',
+  'columns',
+  'slices'
+];
+
+var sizes = [
+  0,
+  5,
+  15,
+  30,
+  60,
+  120
+];
+
+describe('No global chart settings', function () {
+  var visLibParams1 = {
+    el: '<div class=chart1></div>',
+    type: 'pie',
+    addLegend: true,
+    addTooltip: true
+  };
+  var visLibParams2 = {
+    el: '<div class=chart2></div>',
+    type: 'pie',
+    addLegend: true,
+    addTooltip: true
+  };
+  var chart1;
+  var chart2;
+  var Vis;
+  var indexPattern;
+  var buildHierarchicalData;
+  var data1;
+  var data2;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    chart1 = Private(require('fixtures/vislib/_vis_fixture'))(visLibParams1);
+    chart2 = Private(require('fixtures/vislib/_vis_fixture'))(visLibParams2);
+    Vis = Private(require('ui/Vis'));
+    indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    buildHierarchicalData = Private(require('ui/agg_response/hierarchical/build_hierarchical_data'));
+
+    var id_1 = 1;
+    var id_2 = 1;
+    var stubVis1 = new Vis(indexPattern, {
+      type: 'pie',
+      aggs: rowAgg
+    });
+    var stubVis2 = new Vis(indexPattern, {
+      type: 'pie',
+      aggs: colAgg
+    });
+
+    // We need to set the aggs to a known value.
+    _.each(stubVis1.aggs, function (agg) {
+      agg.id = 'agg_' + id_1++;
+    });
+    _.each(stubVis2.aggs, function (agg) {
+      agg.id = 'agg_' + id_2++;
+    });
+
+    data1 = buildHierarchicalData(stubVis1, fixtures.threeTermBuckets);
+    data2 = buildHierarchicalData(stubVis2, fixtures.threeTermBuckets);
+
+    chart1.render(data1);
+    chart2.render(data2);
+  }));
+
+  afterEach(function () {
+    chart1 = null;
+    chart2 = null;
+  });
+
+  it('should render chart titles for all charts', function () {
+    expect($(chart1.el).find('.y-axis-chart-title').length).to.be(1);
+    expect($(chart2.el).find('.x-axis-chart-title').length).to.be(1);
+  });
+
+  describe('_validatePieData method', function () {
+    var allZeros = [
+      { slices: { children: [] } },
+      { slices: { children: [] } },
+      { slices: { children: [] } }
+    ];
+
+    var someZeros = [
+      { slices: { children: [{}] } },
+      { slices: { children: [{}] } },
+      { slices: { children: [] } }
+    ];
+
+    var noZeros = [
+      { slices: { children: [{}] } },
+      { slices: { children: [{}] } },
+      { slices: { children: [{}] } }
+    ];
+
+    it('should throw an error when all charts contain zeros', function () {
+      expect(function () {
+        chart1.ChartClass.prototype._validatePieData(allZeros);
+      }).to.throwError();
+    });
+
+    it('should not throw an error when only some or no charts contain zeros', function () {
+      expect(function () {
+        chart1.ChartClass.prototype._validatePieData(someZeros);
+      }).to.not.throwError();
+      expect(function () {
+        chart1.ChartClass.prototype._validatePieData(noZeros);
+      }).to.not.throwError();
+    });
+  });
+});
+
+aggArray.forEach(function (dataAgg, i) {
+  describe('Vislib PieChart Class Test Suite for ' + names[i] + ' data', function () {
+    var visLibParams = {
+      type: 'pie',
+      addLegend: true,
+      addTooltip: true
+    };
+    var vis;
+    var Vis;
+    var indexPattern;
+    var buildHierarchicalData;
+    var data;
+
+    beforeEach(ngMock.module('kibana'));
+    beforeEach(ngMock.inject(function (Private) {
+      vis = Private(require('fixtures/vislib/_vis_fixture'))(visLibParams);
+      Vis = Private(require('ui/Vis'));
+      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+      buildHierarchicalData = Private(require('ui/agg_response/hierarchical/build_hierarchical_data'));
+
+      var id = 1;
+      var stubVis = new Vis(indexPattern, {
+        type: 'pie',
+        aggs: dataAgg
+      });
+
+      // We need to set the aggs to a known value.
+      _.each(stubVis.aggs, function (agg) { agg.id = 'agg_' + id++; });
+
+      data = buildHierarchicalData(stubVis, fixtures.threeTermBuckets);
+
+      vis.render(data);
+    }));
+
+    afterEach(function () {
+      $(vis.el).remove();
+      vis = null;
+    });
+
+    describe('addPathEvents method', function () {
+      var path;
+      var d3selectedPath;
+      var onClick;
+      var onMouseOver;
+
+      beforeEach(function () {
+        vis.handler.charts.forEach(function (chart) {
+          path = $(chart.chartEl).find('path')[0];
+          d3selectedPath = d3.select(path)[0][0];
+
+          // d3 instance of click and hover
+          onClick = (!!d3selectedPath.__onclick);
+          onMouseOver = (!!d3selectedPath.__onmouseover);
+        });
+      });
+
+      it('should attach a click event', function () {
+        vis.handler.charts.forEach(function () {
+          expect(onClick).to.be(true);
+        });
+      });
+
+      it('should attach a hover event', function () {
+        vis.handler.charts.forEach(function () {
+          expect(onMouseOver).to.be(true);
+        });
+      });
+    });
+
+    describe('addPath method', function () {
+      var width;
+      var height;
+      var svg;
+      var slices;
+
+      beforeEach(ngMock.inject(function () {
+        vis.handler.charts.forEach(function (chart) {
+          width = $(chart.chartEl).width();
+          height = $(chart.chartEl).height();
+          svg = d3.select($(chart.chartEl).find('svg')[0]);
+          slices = chart.chartData.slices;
+        });
+      }));
+
+      it('should return an SVG object', function () {
+        vis.handler.charts.forEach(function (chart) {
+          expect(_.isObject(chart.addPath(width, height, svg, slices))).to.be(true);
+        });
+      });
+
+      it('should draw path elements', function () {
+        vis.handler.charts.forEach(function (chart) {
+
+          // test whether path elements are drawn
+          expect($(chart.chartEl).find('path').length).to.be.greaterThan(0);
+        });
+      });
+    });
+
+    describe('draw method', function () {
+      it('should return a function', function () {
+        vis.handler.charts.forEach(function (chart) {
+          expect(_.isFunction(chart.draw())).to.be(true);
+        });
+      });
+    });
+
+    sizes.forEach(function (size) {
+      describe('containerTooSmall error', function () {
+        it('should throw an error', function () {
+          // 20px is the minimum height and width
+          vis.handler.charts.forEach(function (chart) {
+            $(chart.chartEl).height(size);
+            $(chart.chartEl).width(size);
+
+            if (size < 20) {
+              expect(function () {
+                chart.render();
+              }).to.throwError();
+            }
+          });
+        });
+
+        it('should not throw an error', function () {
+          vis.handler.charts.forEach(function (chart) {
+            $(chart.chartEl).height(size);
+            $(chart.chartEl).width(size);
+
+            if (size > 20) {
+              expect(function () {
+                chart.render();
+              }).to.not.throwError();
+            }
+          });
+        });
+      });
+    });
+
+  });
+});
diff --git a/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js b/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js
new file mode 100644
index 0000000000000..81d4e756d8b6e
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js
@@ -0,0 +1,194 @@
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+var _ = require('lodash');
+var $ = require('jquery');
+var L = require('leaflet');
+
+var sinon = require('auto-release-sinon');
+var geoJsonData = require('fixtures/vislib/mock_data/geohash/_geo_json');
+
+// // Data
+// var dataArray = [
+//   ['geojson', require('fixtures/vislib/mock_data/geohash/_geo_json')],
+//   ['columns', require('fixtures/vislib/mock_data/geohash/_columns')],
+//   ['rows', require('fixtures/vislib/mock_data/geohash/_rows')],
+// ];
+
+// // TODO: Test the specific behavior of each these
+// var mapTypes = [
+//   'Scaled Circle Markers',
+//   'Shaded Circle Markers',
+//   'Shaded Geohash Grid',
+//   'Heatmap'
+// ];
+
+describe('TileMap Map Tests', function () {
+  this.timeout(0);
+  var $mockMapEl = $('<div>');
+  var Map;
+  var leafletStubs = {};
+  var leafletMocks = {};
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    // mock parts of leaflet
+    leafletMocks.tileLayer = { on: sinon.stub() };
+    leafletMocks.map = { on: sinon.stub() };
+    leafletStubs.tileLayer = sinon.stub(L, 'tileLayer', _.constant(leafletMocks.tileLayer));
+    leafletStubs.map = sinon.stub(L, 'map', _.constant(leafletMocks.map));
+
+    Map = Private(require('ui/vislib/visualizations/_map'));
+  }));
+
+  describe('instantiation', function () {
+    var map;
+    var createStub;
+
+    beforeEach(function () {
+      createStub = sinon.stub(Map.prototype, '_createMap', _.noop);
+      map = new Map($mockMapEl, geoJsonData, {});
+    });
+
+    it('should create the map', function () {
+      expect(createStub.callCount).to.equal(1);
+    });
+
+    it('should add zoom controls', function () {
+      var mapOptions = createStub.firstCall.args[0];
+
+      expect(mapOptions).to.be.an('object');
+      if (mapOptions.zoomControl) expect(mapOptions.zoomControl).to.be.ok();
+      else expect(mapOptions.zoomControl).to.be(undefined);
+    });
+  });
+
+  describe('createMap', function () {
+    var map;
+    var mapStubs;
+
+    beforeEach(function () {
+      mapStubs = {
+        destroy: sinon.stub(Map.prototype, 'destroy'),
+        attachEvents: sinon.stub(Map.prototype, '_attachEvents'),
+        addMarkers: sinon.stub(Map.prototype, '_addMarkers'),
+      };
+
+      map = new Map($mockMapEl, geoJsonData, {});
+    });
+
+    it('should create the create leaflet objects', function () {
+      expect(leafletStubs.tileLayer.callCount).to.equal(1);
+      expect(leafletStubs.map.callCount).to.equal(1);
+
+      var callArgs = leafletStubs.map.firstCall.args;
+      var mapOptions = callArgs[1];
+      expect(callArgs[0]).to.be($mockMapEl.get(0));
+      expect(mapOptions).to.have.property('zoom');
+      expect(mapOptions).to.have.property('center');
+    });
+
+    it('should attach events and add markers', function () {
+      expect(mapStubs.attachEvents.callCount).to.equal(1);
+      expect(mapStubs.addMarkers.callCount).to.equal(1);
+    });
+
+    it('should call destroy only if a map exists', function () {
+      expect(mapStubs.destroy.callCount).to.equal(0);
+      map._createMap({});
+      expect(mapStubs.destroy.callCount).to.equal(1);
+    });
+  });
+
+  describe('attachEvents', function () {
+    var map;
+
+    beforeEach(function () {
+      sinon.stub(Map.prototype, '_createMap', function () {
+        this._tileLayer = leafletMocks.tileLayer;
+        this.map = leafletMocks.map;
+        this._attachEvents();
+      });
+      map = new Map($mockMapEl, geoJsonData, {});
+    });
+
+    it('should attach interaction events', function () {
+      var expectedTileEvents = ['tileload'];
+      var expectedMapEvents = ['draw:created', 'moveend', 'zoomend', 'unload'];
+      var matchedEvents = {
+        tiles: 0,
+        maps: 0,
+      };
+
+      _.times(leafletMocks.tileLayer.on.callCount, function (index) {
+        var ev = leafletMocks.tileLayer.on.getCall(index).args[0];
+        if (_.includes(expectedTileEvents, ev)) matchedEvents.tiles++;
+      });
+      expect(matchedEvents.tiles).to.equal(expectedTileEvents.length);
+
+      _.times(leafletMocks.map.on.callCount, function (index) {
+        var ev = leafletMocks.map.on.getCall(index).args[0];
+        if (_.includes(expectedMapEvents, ev)) matchedEvents.maps++;
+      });
+      expect(matchedEvents.maps).to.equal(expectedMapEvents.length);
+    });
+  });
+
+
+  describe('addMarkers', function () {
+    var map;
+    var createStub;
+
+    beforeEach(function () {
+      sinon.stub(Map.prototype, '_createMap');
+      createStub = sinon.stub(Map.prototype, '_createMarkers', _.constant({ addLegend: _.noop }));
+      map = new Map($mockMapEl, geoJsonData, {});
+    });
+
+    it('should pass the map options to the marker', function () {
+      map._addMarkers();
+
+      var args = createStub.firstCall.args[0];
+      expect(args).to.have.property('tooltipFormatter');
+      expect(args).to.have.property('valueFormatter');
+      expect(args).to.have.property('attr');
+    });
+
+    it('should destroy existing markers', function () {
+      var destroyStub = sinon.stub();
+      map._markers = { destroy: destroyStub };
+      map._addMarkers();
+
+      expect(destroyStub.callCount).to.be(1);
+    });
+  });
+
+  describe('getDataRectangles', function () {
+    var map;
+
+    beforeEach(function () {
+      sinon.stub(Map.prototype, '_createMap');
+      map = new Map($mockMapEl, geoJsonData, {});
+    });
+
+    it('should return an empty array if no data', function () {
+      map = new Map($mockMapEl, {}, {});
+      var rects = map._getDataRectangles();
+      expect(rects).to.have.length(0);
+    });
+
+    it('should return an array of arrays of rectangles', function () {
+      var rects = map._getDataRectangles();
+      _.times(5, function () {
+        var index = _.random(rects.length - 1);
+        var rect = rects[index];
+        var featureRect = geoJsonData.geoJson.features[index].properties.rectangle;
+        expect(rect.length).to.equal(featureRect.length);
+
+        // should swap the array
+        var checkIndex = _.random(rect.length - 1);
+        expect(rect[checkIndex]).to.eql(featureRect[checkIndex]);
+      });
+    });
+  });
+});
diff --git a/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js b/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js
new file mode 100644
index 0000000000000..9bdcb96d8ec2e
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js
@@ -0,0 +1,363 @@
+
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+var _ = require('lodash');
+var $ = require('jquery');
+var L = require('leaflet');
+var sinon = require('auto-release-sinon');
+var geoJsonData = require('fixtures/vislib/mock_data/geohash/_geo_json');
+// defaults to roughly the lower 48 US states
+var defaultSWCoords = [13.496, -143.789];
+var defaultNECoords = [55.526, -57.919];
+var bounds = {};
+var MarkerType;
+var map;
+
+angular.module('MarkerFactory', ['kibana']);
+
+function setBounds(southWest, northEast) {
+  bounds.southWest = L.latLng(southWest || defaultSWCoords);
+  bounds.northEast = L.latLng(northEast || defaultNECoords);
+}
+
+function getBounds() {
+  return L.latLngBounds(bounds.southWest, bounds.northEast);
+}
+
+var mockMap = {
+  addLayer: _.noop,
+  closePopup: _.noop,
+  getBounds: getBounds,
+  removeControl: _.noop,
+  removeLayer: _.noop,
+  getZoom: _.constant(5)
+};
+
+describe('Marker Tests', function () {
+  var mapData;
+  var markerLayer;
+
+  function createMarker(MarkerClass, geoJson) {
+    mapData = _.assign({}, geoJsonData.geoJson, geoJson || {});
+    mapData.properties.allmin = mapData.properties.min;
+    mapData.properties.allmax = mapData.properties.max;
+
+    return new MarkerClass(mockMap, mapData, {
+      valueFormatter: geoJsonData.valueFormatter
+    });
+  }
+
+  beforeEach(function () {
+    setBounds();
+  });
+
+  afterEach(function () {
+    if (markerLayer) {
+      markerLayer.destroy();
+      markerLayer = undefined;
+    }
+  });
+
+  describe('Base Methods', function () {
+    var MarkerClass;
+
+    beforeEach(ngMock.module('MarkerFactory'));
+    beforeEach(ngMock.inject(function (Private) {
+      MarkerClass = Private(require('ui/vislib/visualizations/marker_types/base_marker'));
+      markerLayer = createMarker(MarkerClass);
+    }));
+
+    describe('filterToMapBounds', function () {
+      it('should not filter any features', function () {
+        // set bounds to the entire world
+        setBounds([-87.252, -343.828], [87.252, 343.125]);
+        var boundFilter = markerLayer._filterToMapBounds();
+        var mapFeature = mapData.features.filter(boundFilter);
+
+        expect(mapFeature.length).to.equal(mapData.features.length);
+      });
+
+      it('should filter out data points that are outside of the map bounds', function () {
+        // set bounds to roughly US southwest
+        setBounds([31.690, -124.387], [42.324, -102.919]);
+        var boundFilter = markerLayer._filterToMapBounds();
+        var mapFeature = mapData.features.filter(boundFilter);
+
+        expect(mapFeature.length).to.be.lessThan(mapData.features.length);
+      });
+    });
+
+    describe('legendQuantizer', function () {
+      it('should return a range of hex colors', function () {
+        var minColor = markerLayer._legendQuantizer(mapData.properties.allmin);
+        var maxColor = markerLayer._legendQuantizer(mapData.properties.allmax);
+
+        expect(minColor.substring(0, 1)).to.equal('#');
+        expect(minColor).to.have.length(7);
+        expect(maxColor.substring(0, 1)).to.equal('#');
+        expect(maxColor).to.have.length(7);
+        expect(minColor).to.not.eql(maxColor);
+      });
+
+      it('should return a color with 1 color', function () {
+        var geoJson = { properties: { min: 1, max: 1 } };
+        markerLayer = createMarker(MarkerClass, geoJson);
+
+        // ensure the quantizer domain is correct
+        var color = markerLayer._legendQuantizer(1);
+        expect(color).to.not.be(undefined);
+        expect(color.substring(0, 1)).to.equal('#');
+
+        // should always get the same color back
+        _.times(5, function () {
+          var num = _.random(0, 100);
+          var randColor = markerLayer._legendQuantizer(0);
+          expect(randColor).to.equal(color);
+        });
+      });
+    });
+
+    describe('applyShadingStyle', function () {
+      it('should return a style object', function () {
+        var style = markerLayer.applyShadingStyle(100);
+        expect(style).to.be.an('object');
+
+        var keys = _.keys(style);
+        var expected = ['fillColor', 'color'];
+        _.each(expected, function (key) {
+          expect(keys).to.contain(key);
+        });
+      });
+
+      it('should use the legendQuantizer', function () {
+        var spy = sinon.spy(markerLayer, '_legendQuantizer');
+        var style = markerLayer.applyShadingStyle(100);
+        expect(spy.callCount).to.equal(1);
+      });
+    });
+
+    describe('showTooltip', function () {
+      it('should use the tooltip formatter', function () {
+        var content;
+        var sample = _.sample(mapData.features);
+
+        var stub = sinon.stub(markerLayer, '_tooltipFormatter', function (val) {
+          return;
+        });
+
+        markerLayer._showTooltip(sample);
+
+        expect(stub.callCount).to.equal(1);
+        expect(stub.firstCall.calledWith(sample)).to.be(true);
+      });
+    });
+
+    describe('addLegend', function () {
+      var addToSpy;
+      var leafletControlStub;
+
+      beforeEach(function () {
+        addToSpy = sinon.spy();
+        leafletControlStub = sinon.stub(L, 'control', function (options) {
+          return {
+            addTo: addToSpy
+          };
+        });
+      });
+
+      it('should do nothing if there is already a legend', function () {
+        markerLayer._legend = { legend: 'exists' }; // anything truthy
+
+        markerLayer.addLegend();
+        expect(leafletControlStub.callCount).to.equal(0);
+      });
+
+      it('should create a leaflet control', function () {
+        markerLayer.addLegend();
+        expect(leafletControlStub.callCount).to.equal(1);
+        expect(addToSpy.callCount).to.equal(1);
+        expect(addToSpy.firstCall.calledWith(markerLayer.map)).to.be(true);
+        expect(markerLayer._legend).to.have.property('onAdd');
+      });
+
+      it('should use the value formatter', function () {
+        var formatterSpy = sinon.spy(markerLayer, '_valueFormatter');
+        // called twice for every legend color defined
+        var expectedCallCount = markerLayer._legendColors.length * 2;
+
+        markerLayer.addLegend();
+        var legend = markerLayer._legend.onAdd();
+
+        expect(formatterSpy.callCount).to.equal(expectedCallCount);
+        expect(legend).to.be.a(HTMLDivElement);
+      });
+    });
+  });
+
+  describe('Shaded Circles', function () {
+    beforeEach(ngMock.module('MarkerFactory'));
+    beforeEach(ngMock.inject(function (Private) {
+      var MarkerClass = Private(require('ui/vislib/visualizations/marker_types/shaded_circles'));
+      markerLayer = createMarker(MarkerClass);
+    }));
+
+    describe('geohashMinDistance method', function () {
+      it('should return a finite number', function () {
+        var sample = _.sample(mapData.features);
+        var distance = markerLayer._geohashMinDistance(sample);
+
+        expect(distance).to.be.a('number');
+        expect(_.isFinite(distance)).to.be(true);
+      });
+    });
+  });
+
+  describe('Scaled Circles', function () {
+    var zoom;
+
+    beforeEach(ngMock.module('MarkerFactory'));
+    beforeEach(ngMock.inject(function (Private) {
+      zoom = _.random(1, 18);
+      sinon.stub(mockMap, 'getZoom', _.constant(zoom));
+      var MarkerClass = Private(require('ui/vislib/visualizations/marker_types/scaled_circles'));
+      markerLayer = createMarker(MarkerClass);
+    }));
+
+    describe('radiusScale method', function () {
+      var valueArray = [10, 20, 30, 40, 50, 60];
+      var max = _.max(valueArray);
+      var prev = -1;
+
+      it('should return 0 for value of 0', function () {
+        expect(markerLayer._radiusScale(0)).to.equal(0);
+      });
+
+      it('should return a scaled value for negative and positive numbers', function () {
+        var upperBound = markerLayer._radiusScale(max);
+        var results = [];
+
+        function roundValue(value) {
+          // round number to 6 decimal places
+          var r = Math.pow(10, 6);
+          return Math.round(value * r) / r;
+        }
+
+        _.each(valueArray, function (value, i) {
+          var ratio = Math.pow(value / max, 0.5);
+          var comparison = ratio * upperBound;
+          var radius = markerLayer._radiusScale(value);
+          var negRadius = markerLayer._radiusScale(value * -1);
+          results.push(radius);
+
+          expect(negRadius).to.equal(radius);
+          expect(roundValue(radius)).to.equal(roundValue(comparison));
+
+          // check that the radius is getting larger
+          if (i > 0) {
+            expect(radius).to.be.above(results[i - 1]);
+          }
+        });
+      });
+    });
+  });
+
+  describe('Heatmaps', function () {
+    beforeEach(ngMock.module('MarkerFactory'));
+    beforeEach(ngMock.inject(function (Private) {
+      var MarkerClass = Private(require('ui/vislib/visualizations/marker_types/heatmap'));
+      markerLayer = createMarker(MarkerClass);
+    }));
+
+    describe('dataToHeatArray', function () {
+      var max;
+
+      beforeEach(function () {
+        max = mapData.properties.allmax;
+      });
+
+      it('should return an array or values for each feature', function () {
+        var arr = markerLayer._dataToHeatArray(max);
+        expect(arr).to.be.an('array');
+        expect(arr).to.have.length(mapData.features.length);
+
+      });
+
+      it('should return an array item with lat, lng, metric for each feature', function () {
+        _.times(3, function () {
+          var arr = markerLayer._dataToHeatArray(max);
+          var index = _.random(mapData.features.length - 1);
+          var feature = mapData.features[index];
+          var featureValue = feature.properties.value;
+          var featureArr = feature.geometry.coordinates.slice(0).concat(featureValue);
+          expect(arr[index]).to.eql(featureArr);
+        });
+      });
+
+      it('should return an array item with lat, lng, normalized metric for each feature', function () {
+        _.times(5, function () {
+          markerLayer._attr.heatNormalizeData = true;
+
+          var arr = markerLayer._dataToHeatArray(max);
+          var index = _.random(mapData.features.length - 1);
+          var feature = mapData.features[index];
+          var featureValue = parseInt(feature.properties.value / max * 100);
+          var featureArr = feature.geometry.coordinates.slice(0).concat(featureValue);
+          expect(arr[index]).to.eql(featureArr);
+        });
+      });
+    });
+
+    describe('tooltipProximity', function () {
+      it('should return true if feature is close enough to event latlng', function () {
+        _.times(5, function () {
+          var feature = _.sample(mapData.features);
+          var point = markerLayer._getLatLng(feature);
+          var arr = markerLayer._tooltipProximity(point, feature);
+          expect(arr).to.be(true);
+        });
+      });
+
+      it('should return false if feature is not close enough to event latlng', function () {
+        _.times(5, function () {
+          var feature = _.sample(mapData.features);
+          var point = L.latLng(90, -180);
+          var arr = markerLayer._tooltipProximity(point, feature);
+          expect(arr).to.be(false);
+        });
+      });
+    });
+
+    describe('nearestFeature', function () {
+      it('should return nearest geoJson feature object', function () {
+        _.times(5, function () {
+          var feature = _.sample(mapData.features);
+          var point = markerLayer._getLatLng(feature);
+          var nearestPoint = markerLayer._nearestFeature(point);
+          expect(nearestPoint).to.equal(feature);
+        });
+      });
+    });
+
+    describe('getLatLng', function () {
+      it('should return a leaflet latLng object', function () {
+        var feature = _.sample(mapData.features);
+        var latLng = markerLayer._getLatLng(feature);
+        var compare = L.latLng(feature.geometry.coordinates.slice(0).reverse());
+        expect(latLng).to.eql(compare);
+      });
+
+      it('should memoize the result', function () {
+        var spy = sinon.spy(L, 'latLng');
+        var feature = _.sample(mapData.features);
+
+        markerLayer._getLatLng(feature);
+        expect(spy.callCount).to.be(1);
+
+        markerLayer._getLatLng(feature);
+        expect(spy.callCount).to.be(1);
+      });
+    });
+  });
+
+});
diff --git a/src/ui/public/vislib/__tests__/visualizations/tile_maps/tile_map.js b/src/ui/public/vislib/__tests__/visualizations/tile_maps/tile_map.js
new file mode 100644
index 0000000000000..27080689453fd
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/visualizations/tile_maps/tile_map.js
@@ -0,0 +1,132 @@
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+var _ = require('lodash');
+var $ = require('jquery');
+var sinon = require('auto-release-sinon');
+
+var geoJsonData = require('fixtures/vislib/mock_data/geohash/_geo_json');
+var MockMap = require('fixtures/tilemap_map');
+var mockChartEl = $('<div>');
+
+var TileMap;
+var extentsStub;
+
+function createTileMap(handler, chartEl, chartData) {
+  handler = handler || {};
+  chartEl = chartEl || mockChartEl;
+  chartData = chartData || geoJsonData;
+
+  var tilemap = new TileMap(handler, chartEl, chartData);
+  return tilemap;
+}
+
+describe('TileMap Tests', function () {
+  var tilemap;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    Private.stub(require('ui/vislib/visualizations/_map'), MockMap);
+    TileMap = Private(require('ui/vislib/visualizations/tile_map'));
+    extentsStub = sinon.stub(TileMap.prototype, '_appendGeoExtents', _.noop);
+  }));
+
+  beforeEach(function () {
+    tilemap = createTileMap();
+  });
+
+  it('should inherit props from chartData', function () {
+    _.each(geoJsonData, function (val, prop) {
+      expect(tilemap).to.have.property(prop, val);
+    });
+  });
+
+  it('should append geoExtents', function () {
+    expect(extentsStub.callCount).to.equal(1);
+  });
+
+  describe('draw', function () {
+    it('should return a function', function () {
+      expect(tilemap.draw()).to.be.a('function');
+    });
+
+    it('should call destroy for clean state', function () {
+      var destroySpy = sinon.spy(tilemap, 'destroy');
+      tilemap.draw();
+      expect(destroySpy.callCount).to.equal(1);
+    });
+  });
+
+  describe('appendMap', function () {
+    var $selection;
+
+    beforeEach(function () {
+      $selection = $('<div>');
+      expect(tilemap.maps).to.have.length(0);
+      tilemap._appendMap($selection);
+    });
+
+    it('should add the tilemap class', function () {
+      expect($selection.hasClass('tilemap')).to.equal(true);
+    });
+
+    it('should append maps and required controls', function () {
+      expect(tilemap.maps).to.have.length(1);
+      var map = tilemap.maps[0];
+      expect(map.addTitle.callCount).to.equal(0);
+      expect(map.addFitControl.callCount).to.equal(1);
+      expect(map.addBoundingControl.callCount).to.equal(1);
+    });
+
+    it('should only add controls if data exists', function () {
+      var noData = {
+        geoJson: {
+          features: [],
+          properties: {},
+          hits: 20
+        }
+      };
+      var tilemap = createTileMap(null, null, noData);
+
+      tilemap._appendMap($selection);
+      expect(tilemap.maps).to.have.length(1);
+
+      var map = tilemap.maps[0];
+      expect(map.addTitle.callCount).to.equal(0);
+      expect(map.addFitControl.callCount).to.equal(0);
+      expect(map.addBoundingControl.callCount).to.equal(0);
+    });
+
+    it('should append title if set in the data object', function () {
+      var mapTitle = 'Test Title';
+      var tilemap = createTileMap(null, null, _.assign({ title: mapTitle }, geoJsonData));
+      tilemap._appendMap($selection);
+      var map = tilemap.maps[0];
+
+      expect(map.addTitle.callCount).to.equal(1);
+      expect(map.addTitle.firstCall.calledWith(mapTitle)).to.equal(true);
+    });
+  });
+
+  describe('destroy', function () {
+    var maps = [];
+    var mapCount = 5;
+
+    beforeEach(function () {
+      _.times(mapCount, function () {
+        maps.push(new MockMap());
+      });
+      tilemap.maps = maps;
+      expect(tilemap.maps).to.have.length(mapCount);
+      tilemap.destroy();
+    });
+
+    it('should destroy all the maps', function () {
+      expect(tilemap.maps).to.have.length(0);
+      expect(maps).to.have.length(mapCount);
+      _.each(maps, function (map) {
+        expect(map.destroy.callCount).to.equal(1);
+      });
+    });
+  });
+});
diff --git a/src/ui/public/vislib/__tests__/visualizations/time_marker.js b/src/ui/public/vislib/__tests__/visualizations/time_marker.js
new file mode 100644
index 0000000000000..b60bd0cab4b6f
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/visualizations/time_marker.js
@@ -0,0 +1,122 @@
+var d3 = require('d3');
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+var _ = require('lodash');
+var $ = require('jquery');
+var fixtures = require('fixtures/fake_hierarchical_data');
+var series = require('fixtures/vislib/mock_data/date_histogram/_series');
+var terms = require('fixtures/vislib/mock_data/terms/_columns');
+
+describe('Vislib Time Marker Test Suite', function () {
+  var height = 50;
+  var color = '#ff0000';
+  var opacity = 0.5;
+  var width = 3;
+  var customClass = 'custom-time-marker';
+  var dateMathTimes = ['now-1m', 'now-5m', 'now-15m'];
+  var myTimes = dateMathTimes.map(function (dateMathString) {
+    return {
+      time: dateMathString,
+      class: customClass,
+      color: color,
+      opacity: opacity,
+      width: width
+    };
+  });
+  var getExtent = function (dataArray, func) {
+    return func(dataArray, function (obj) {
+      return func(obj.values, function (d) {
+        return d.x;
+      });
+    });
+  };
+  var times = [];
+  var TimeMarker;
+  var defaultMarker;
+  var customMarker;
+  var selection;
+  var xScale;
+  var minDomain;
+  var maxDomain;
+  var domain;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    TimeMarker = Private(require('ui/vislib/visualizations/time_marker'));
+    minDomain = getExtent(series.series, d3.min);
+    maxDomain = getExtent(series.series, d3.max);
+    domain = [minDomain, maxDomain];
+    xScale = d3.time.scale().domain(domain).range([0, 500]);
+    defaultMarker = new TimeMarker(times, xScale, height);
+    customMarker = new TimeMarker(myTimes, xScale, height);
+
+    selection = d3.select('body').append('div').attr('class', 'marker');
+    selection.datum(series);
+  }));
+
+  afterEach(function () {
+    selection.remove('*');
+    selection = null;
+    defaultMarker = null;
+  });
+
+  describe('_isTimeBaseChart method', function () {
+    var boolean;
+    var newSelection;
+
+    it('should return true when data is time based', function () {
+      boolean = defaultMarker._isTimeBasedChart(selection);
+      expect(boolean).to.be(true);
+    });
+
+    it('should return false when data is not time based', function () {
+      newSelection = selection.datum(terms);
+      boolean = defaultMarker._isTimeBasedChart(newSelection);
+      expect(boolean).to.be(false);
+    });
+  });
+
+  describe('render method', function () {
+    var lineArray;
+
+    beforeEach(function () {
+      defaultMarker.render(selection);
+      customMarker.render(selection);
+      lineArray = document.getElementsByClassName('custom-time-marker');
+    });
+
+    it('should render the default line', function () {
+      expect(!!$('line.time-marker').length).to.be(true);
+    });
+
+    it('should render the custom (user defined) lines', function () {
+      expect($('line.custom-time-marker').length).to.be(myTimes.length);
+    });
+
+    it('should set the class', function () {
+      Array.prototype.forEach.call(lineArray, function (line) {
+        expect(line.getAttribute('class')).to.be(customClass);
+      });
+    });
+
+    it('should set the stroke', function () {
+      Array.prototype.forEach.call(lineArray, function (line) {
+        expect(line.getAttribute('stroke')).to.be(color);
+      });
+    });
+
+    it('should set the stroke-opacity', function () {
+      Array.prototype.forEach.call(lineArray, function (line) {
+        expect(+line.getAttribute('stroke-opacity')).to.be(opacity);
+      });
+    });
+
+    it('should set the stroke-width', function () {
+      Array.prototype.forEach.call(lineArray, function (line) {
+        expect(+line.getAttribute('stroke-width')).to.be(width);
+      });
+    });
+  });
+
+});
diff --git a/src/ui/public/vislib/__tests__/visualizations/vis_types.js b/src/ui/public/vislib/__tests__/visualizations/vis_types.js
new file mode 100644
index 0000000000000..24a401ab89aeb
--- /dev/null
+++ b/src/ui/public/vislib/__tests__/visualizations/vis_types.js
@@ -0,0 +1,23 @@
+var angular = require('angular');
+var expect = require('expect.js');
+var ngMock = require('ngMock');
+var _ = require('lodash');
+
+describe('Vislib Vis Types Test Suite', function () {
+  var visTypes;
+  var visFunc;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    visTypes = Private(require('ui/vislib/visualizations/vis_types'));
+    visFunc = visTypes.histogram;
+  }));
+
+  it('should be an object', function () {
+    expect(_.isObject(visTypes)).to.be(true);
+  });
+
+  it('should return a function', function () {
+    expect(typeof visFunc).to.be('function');
+  });
+});
diff --git a/src/ui/public/vislib/components/Tooltip/Tooltip.js b/src/ui/public/vislib/components/Tooltip/Tooltip.js
new file mode 100644
index 0000000000000..d8688c801214e
--- /dev/null
+++ b/src/ui/public/vislib/components/Tooltip/Tooltip.js
@@ -0,0 +1,194 @@
+var d3 = require('d3');
+var _ = require('lodash');
+var $ = require('jquery');
+var positionTooltip = require('./positionTooltip');
+
+var allContents = [];
+
+/**
+ * Add tooltip and listeners to visualization elements
+ *
+ * @class Tooltip
+ * @constructor
+ * @param el {HTMLElement} Reference to DOM element
+ * @param formatter {Function} Tooltip formatter
+ * @param events {Constructor} Allows tooltip to return event response data
+ */
+function Tooltip(id, el, formatter, events) {
+  if (!(this instanceof Tooltip)) {
+    return new Tooltip(id, el, formatter, events);
+  }
+
+  this.id = id; // unique id for this tooltip type
+  this.el = el;
+  this.order = 100; // higher ordered contents are rendered below the others
+  this.formatter = formatter;
+  this.events = events;
+  this.containerClass = 'vis-wrapper';
+  this.tooltipClass = 'vis-tooltip';
+  this.tooltipSizerClass = 'vis-tooltip-sizing-clone';
+  this.showCondition = _.constant(true);
+}
+
+/**
+ * Get jquery reference to the tooltip node
+ *
+ * @return {Object} jQuery node object
+ */
+Tooltip.prototype.$get = _.once(function () {
+  return $('<div>').addClass(this.tooltipClass).appendTo(document.body);
+});
+
+/**
+ * Get jquery reference to the tooltip sizer node
+ *
+ * @return {Object} jQuery node object
+ */
+Tooltip.prototype.$getSizer = _.once(function () {
+  return this.$get()
+  .clone()
+  .removeClass(this.tooltipClass)
+  .addClass(this.tooltipSizerClass)
+  .appendTo(document.body);
+});
+
+/**
+ * Show the tooltip, positioning it based on the content and chart container
+ */
+Tooltip.prototype.show = function () {
+  var $tooltip = this.$get();
+  var $chart = this.$getChart();
+  var html = $tooltip.html();
+
+  if (!$chart) return;
+
+  var placement = positionTooltip({
+    $window: $(window),
+    $chart: $chart,
+    $el: $tooltip,
+    $sizer: this.$getSizer(),
+    event: d3.event
+  }, html);
+
+  $tooltip.css({
+    visibility: 'visible',
+    left: placement.left,
+    top: placement.top
+  });
+};
+
+/**
+ * Hide the tooltip, clearing its contents
+ */
+Tooltip.prototype.hide = function () {
+  var $tooltip = this.$get();
+  allContents = [];
+  $tooltip.css({
+    visibility: 'hidden',
+    left: '-500px',
+    top: '-500px'
+  });
+};
+
+/**
+ * Get the jQuery chart node, based on the container object
+ * NOTE: the container is a d3 selection
+ *
+ * @return {Object} jQuery node for the chart
+ */
+Tooltip.prototype.$getChart = function () {
+  var chart = $(this.container && this.container.node());
+  return chart.size() ? chart : false;
+};
+
+/**
+ * Renders tooltip
+ *
+ * @method render
+ * @return {Function} Renders tooltip on a D3 selection
+ */
+Tooltip.prototype.render = function () {
+  var self = this;
+
+  /**
+   * Calculates values for the tooltip placement
+   *
+   * @param {Object} selection D3 selection object
+   */
+  return function (selection) {
+    var $tooltip = self.$get();
+    var id = self.id;
+    var order = self.order;
+
+    var tooltipSelection = d3.select($tooltip.get(0));
+
+    if (self.container === undefined || self.container !== d3.select(self.el).select('.' + self.containerClass)) {
+      self.container = d3.select(self.el).select('.' + self.containerClass);
+    }
+
+    var $chart = self.$getChart();
+    if ($chart) {
+      $chart.on('mouseleave', function (event) {
+        // only clear when we leave the chart, so that
+        // moving between points doesn't make it reposition
+        $chart.removeData('previousPlacement');
+      });
+    }
+
+    selection.each(function (d, i) {
+      var element = d3.select(this);
+
+      function render(html) {
+        allContents = _.filter(allContents, function (content) {
+          return content.id !== id;
+        });
+
+        if (html) allContents.push({ id: id, html: html, order: order });
+
+        var allHtml = _(allContents)
+        .sortBy('order')
+        .pluck('html')
+        .compact()
+        .join('\n');
+
+        if (allHtml) {
+          $tooltip.html(allHtml);
+          self.show();
+        } else {
+          self.hide();
+        }
+      }
+
+      fakeD3Bind(this, 'mousemove', function () {
+        if (!self.showCondition.call(element, d, i)) {
+          return render();
+        }
+
+        var events = self.events ? self.events.eventResponse(d, i) : d;
+        return render(self.formatter(events));
+      });
+
+      fakeD3Bind(this, 'mouseleave', function () {
+        render();
+      });
+
+    });
+  };
+};
+
+function fakeD3Bind(el, event, handler) {
+  $(el).on(event, function (e) {
+    // mimick https://github.com/mbostock/d3/blob/3abb00113662463e5c19eb87cd33f6d0ddc23bc0/src/selection/on.js#L87-L94
+    var o = d3.event; // Events can be reentrant (e.g., focus).
+    d3.event = e;
+    try {
+      handler.apply(this, [this.__data__]);
+    } finally {
+      d3.event = o;
+    }
+  });
+}
+
+module.exports = function TooltipFactoryProvider() {
+  return Tooltip;
+};
diff --git a/src/ui/public/vislib/components/Tooltip/__tests__/positioning.js b/src/ui/public/vislib/components/Tooltip/__tests__/positioning.js
new file mode 100644
index 0000000000000..ae2dd95ddbb25
--- /dev/null
+++ b/src/ui/public/vislib/components/Tooltip/__tests__/positioning.js
@@ -0,0 +1,227 @@
+var expect = require('expect.js');
+
+describe('Tooltip Positioning', function () {
+  var $ = require('jquery');
+  var _ = require('lodash');
+  var sinon = require('auto-release-sinon');
+
+  var posTT = require('../positionTooltip');
+  var positions = ['north', 'south', 'east', 'west'];
+  var bounds = ['top', 'left', 'bottom', 'right'];
+  var $window;
+  var $chart;
+  var $tooltip;
+  var $sizer;
+
+  function testEl(width, height, $children) {
+    var $el = $('<div>');
+
+    var size = {
+      width: _.random(width[0], width[1]),
+      height: _.random(height[0], height[1])
+    };
+
+    $el.css({
+      width: size.width,
+      height: size.height,
+      visibility: 'hidden'
+    })
+    .appendTo('body');
+
+    if ($children) {
+      $el.append($children);
+    }
+
+    $el.testSize = size;
+
+    return $el;
+  }
+
+  beforeEach(function () {
+    $window = testEl([500, 1000], [600, 800],
+      $chart = testEl([600, 750], [350, 550],
+        $tooltip = testEl([50, 100], [35, 75])
+      )
+    );
+
+    $sizer = $tooltip.clone().appendTo($window);
+  });
+
+  afterEach(function () {
+    $window.remove();
+    $window = $chart = $tooltip = $sizer = null;
+    posTT.removeClone();
+  });
+
+  function makeEvent(xPercent, yPercent) {
+    xPercent = xPercent || 0.5;
+    yPercent = yPercent || 0.5;
+
+    var base = $chart.offset();
+
+    return {
+      clientX: base.left + ($chart.testSize.width * xPercent),
+      clientY: base.top + ($chart.testSize.height * yPercent)
+    };
+  }
+
+  describe('getTtSize()', function () {
+    it('should measure the outer-size of the tooltip using an un-obstructed clone', function () {
+      var w = sinon.spy($.fn, 'outerWidth');
+      var h = sinon.spy($.fn, 'outerHeight');
+
+      posTT.getTtSize($tooltip.html(), $sizer);
+
+      [w, h].forEach(function (spy) {
+        expect(spy).to.have.property('callCount', 1);
+        var matchHtml = w.thisValues.filter(function ($t) {
+          return !$t.is($tooltip) && $t.html() === $tooltip.html();
+        });
+        expect(matchHtml).to.have.length(1);
+      });
+    });
+  });
+
+  describe('getBasePosition()', function () {
+    it('calculates the offset values for the four positions', function () {
+      var size = posTT.getTtSize($tooltip.html(), $sizer);
+      var pos = posTT.getBasePosition(size, makeEvent());
+
+      positions.forEach(function (p) {
+        expect(pos).to.have.property(p);
+      });
+
+      expect(pos.north).to.be.lessThan(pos.south);
+      expect(pos.east).to.be.greaterThan(pos.west);
+    });
+  });
+
+  describe('getBounds()', function () {
+    it('returns the offsets for the tlrb of the element', function () {
+      var cbounds = posTT.getBounds($chart);
+
+      bounds.forEach(function (b) {
+        expect(cbounds).to.have.property(b);
+      });
+
+      expect(cbounds.top).to.be.lessThan(cbounds.bottom);
+      expect(cbounds.left).to.be.lessThan(cbounds.right);
+    });
+  });
+
+  describe('getOverflow()', function () {
+    it('determines how much the base placement overflows the containing bounds in each direction', function () {
+      // size the tooltip very small so it won't collide with the edges
+      $tooltip.css({ width: 15, height: 15 });
+      $sizer.css({ width: 15, height: 15 });
+      var size = posTT.getTtSize($tooltip.html(), $sizer);
+      expect(size).to.have.property('width', 15);
+      expect(size).to.have.property('height', 15);
+
+      // position the element based on a mouse that is in the middle of the chart
+      var pos = posTT.getBasePosition(size, makeEvent(0.5, 0.5));
+
+      var overflow = posTT.getOverflow(size, pos, [$chart, $window]);
+      positions.forEach(function (p) {
+        expect(overflow).to.have.property(p);
+
+        // all positions should be less than 0 because the tooltip is so much smaller than the chart
+        expect(overflow[p]).to.be.lessThan(0);
+      });
+    });
+
+    it('identifies an overflow with a positive value in that direction', function () {
+      var size = posTT.getTtSize($tooltip.html(), $sizer);
+
+      // position the element based on a mouse that is in the bottom right hand courner of the chart
+      var pos = posTT.getBasePosition(size, makeEvent(0.99, 0.99));
+      var overflow = posTT.getOverflow(size, pos, [$chart, $window]);
+
+      positions.forEach(function (p) {
+        expect(overflow).to.have.property(p);
+
+        if (p === 'south' || p === 'east') {
+          expect(overflow[p]).to.be.greaterThan(0);
+        } else {
+          expect(overflow[p]).to.be.lessThan(0);
+        }
+      });
+    });
+  });
+
+  describe('positionTooltip() integration', function () {
+    it('returns nothing if the $chart or $tooltip are not passed in', function () {
+      expect(posTT() === void 0).to.be(true);
+      expect(posTT(null, null, null) === void 0).to.be(true);
+      expect(posTT(null, $(), $()) === void 0).to.be(true);
+    });
+
+    function check(xPercent, yPercent/*, prev, directions... */) {
+      var directions = _.drop(arguments, 2);
+      var event = makeEvent(xPercent, yPercent);
+      var placement = posTT({
+        $window: $window,
+        $chart: $chart,
+        $sizer: $sizer,
+        event: event,
+        $el: $tooltip,
+        prev: _.isObject(directions[0]) ? directions.shift() : null
+      });
+
+      expect(placement).to.have.property('top').and.property('left');
+
+      directions.forEach(function (dir) {
+        switch (dir) {
+        case 'top':
+          expect(placement.top).to.be.lessThan(event.clientY);
+          return;
+        case 'bottom':
+          expect(placement.top).to.be.greaterThan(event.clientY);
+          return;
+        case 'right':
+          expect(placement.left).to.be.greaterThan(event.clientX);
+          return;
+        case 'left':
+          expect(placement.left).to.be.lessThan(event.clientX);
+          return;
+        }
+      });
+
+      return placement;
+    }
+
+    describe('calculates placement of the tooltip properly', function () {
+      it('mouse is in the middle', function () {
+        check(0.50, 0.50, 'bottom', 'right');
+      });
+
+      it('mouse is in the top left', function () {
+        check(0.10, 0.10, 'bottom', 'right');
+      });
+
+      it('mouse is in the top right', function () {
+        check(0.99, 0.10, 'bottom', 'left');
+      });
+
+      it('mouse is in the bottom right', function () {
+        check(0.99, 0.99, 'top', 'left');
+      });
+
+      it('mouse is in the bottom left', function () {
+        check(0.10, 0.99, 'top', 'right');
+      });
+    });
+
+    describe('maintain the direction of the tooltip on reposition', function () {
+      it('mouse moves from the top right to the middle', function () {
+        var pos = check(0.99, 0.10, 'bottom', 'left');
+        check(0.50, 0.50, pos, 'bottom', 'left');
+      });
+
+      it('mouse moves from the bottom left to the middle', function () {
+        var pos = check(0.10, 0.99, 'top', 'right');
+        check(0.50, 0.50, pos, 'top', 'right');
+      });
+    });
+  });
+});
diff --git a/src/ui/public/vislib/components/Tooltip/positionTooltip.js b/src/ui/public/vislib/components/Tooltip/positionTooltip.js
new file mode 100644
index 0000000000000..cd299af804d34
--- /dev/null
+++ b/src/ui/public/vislib/components/Tooltip/positionTooltip.js
@@ -0,0 +1,146 @@
+var _ = require('lodash');
+var $ = require('jquery');
+
+var OFFSET = 10;
+var $clone;
+
+// translate css properties into their basic direction
+var propDirs = {
+  top: 'north',
+  left: 'west'
+};
+
+function positionTooltip(opts, html) {
+  if (!opts) return;
+  var $chart = $(opts.$chart);
+  var $el = $(opts.$el);
+  var $window = $(opts.$window || window);
+  var $sizer = $(opts.$sizer);
+  var prev = $chart.data('previousPlacement') || {};
+  var event = opts.event;
+
+  if (!$chart.size() || !$el.size()) return;
+
+  var size = getTtSize(html || $el.html(), $sizer);
+  var pos = getBasePosition(size, event);
+  var overflow = getOverflow(size, pos, [$chart, $window]);
+
+  var placement = placeToAvoidOverflow(pos, prev, overflow);
+  $chart.data('previousPlacement', placement);
+  return placement;
+}
+
+function getTtSize(ttHtml, $sizer) {
+  if ($sizer.html() !== ttHtml) {
+    $sizer.html(ttHtml);
+  }
+
+  var size = {
+    width: $sizer.outerWidth(),
+    height: $sizer.outerHeight()
+  };
+
+  return size;
+}
+
+function getBasePosition(size, event) {
+  return {
+    east: event.clientX + OFFSET,
+    west: event.clientX - size.width - OFFSET,
+    south: event.clientY + OFFSET,
+    north: event.clientY - size.height - OFFSET
+  };
+}
+
+function getBounds($el) {
+  // in testing, $window is not actually a window, so we need to add
+  // the offsets to make it work right.
+  var bounds = $el.offset() || { top: 0, left: 0 };
+  bounds.top += $el.scrollTop();
+  bounds.left += $el.scrollLeft();
+  bounds.bottom = bounds.top + $el.outerHeight();
+  bounds.right = bounds.left + $el.outerWidth();
+  return bounds;
+}
+
+function getOverflow(size, pos, containers) {
+  var overflow = {};
+
+  containers.map(getBounds).forEach(function (bounds) {
+    // number of pixels that the toolip would overflow it's far
+    // side, if we placed it that way. (negative === no overflow)
+    mergeOverflows(overflow, {
+      north: bounds.top - pos.north,
+      east: (pos.east + size.width) - bounds.right,
+      south: (pos.south + size.height) - bounds.bottom,
+      west: bounds.left - pos.west
+    });
+  });
+
+  (window.overflows || (window.overflows = [])).push(overflow);
+  return overflow;
+}
+
+function mergeOverflows(dest, src) {
+  return _.merge(dest, src, function (a, b) {
+    if (a == null || b == null) return a || b;
+    if (a < 0 && b < 0) return Math.min(a, b);
+    return Math.max(a, b);
+  });
+}
+
+function pickPlacement(prop, pos, overflow, prev, pref, fallback, placement) {
+  var stash = '_' + prop;
+
+  // list of directions in order of preference
+  var dirs = _.unique([prev[stash], pref, fallback].filter(Boolean));
+
+  var dir;
+  var value;
+
+  // find the first direction that doesn't overflow
+  for (var i = 0; i < dirs.length; i++) {
+    dir = dirs[i];
+    if (overflow[dir] > 0) continue;
+    value = pos[dir];
+    break;
+  }
+
+  // if we don't find one that doesn't overflow, use
+  // the first choice and offset based on overflo
+  if (value == null) {
+    dir = dirs[0];
+
+    var offset = overflow[dir];
+    if (propDirs[prop] === dir) {
+      // when the property represents the same direction
+      // as dir, we flip the overflow
+      offset = offset * -1;
+    }
+
+    value = pos[dir] - offset;
+  }
+
+  placement[prop] = value;
+  placement[stash] = dir;
+}
+
+function placeToAvoidOverflow(pos, prev, overflow) {
+  var placement = {};
+  pickPlacement('top', pos, overflow, prev, 'south', 'north', placement);
+  pickPlacement('left', pos, overflow, prev, 'east', 'west', placement);
+  return placement;
+}
+
+// expose units/helpers for testing
+positionTooltip.getTtSize = getTtSize;
+positionTooltip.getBasePosition = getBasePosition;
+positionTooltip.getOverflow = getOverflow;
+positionTooltip.getBounds = getBounds;
+positionTooltip.placeToAvoidOverflow = placeToAvoidOverflow;
+positionTooltip.removeClone = function () {
+  $clone && $clone.remove();
+  $clone = null;
+};
+
+module.exports = positionTooltip;
diff --git a/src/ui/public/vislib/components/color/color.js b/src/ui/public/vislib/components/color/color.js
new file mode 100644
index 0000000000000..30d0131740e0f
--- /dev/null
+++ b/src/ui/public/vislib/components/color/color.js
@@ -0,0 +1,40 @@
+define(function (require) {
+  return function ColorUtilService(Private) {
+    var _ = require('lodash');
+
+    var createColorPalette = Private(require('ui/vislib/components/color/color_palette'));
+    var MappedColors = Private(require('ui/vislib/components/color/mapped_colors'));
+    var mappedColors = new MappedColors();
+
+    /*
+     * Accepts an array of strings or numbers that are used to create a
+     * a lookup table that associates the values (key) with a hex color (value).
+     * Returns a function that accepts a value (i.e. a string or number)
+     * and returns a hex color associated with that value.
+     */
+
+    return function (arrayOfStringsOrNumbers) {
+      if (!_.isArray(arrayOfStringsOrNumbers)) {
+        throw new Error('ColorUtil expects an array');
+      }
+
+      arrayOfStringsOrNumbers.forEach(function (val) {
+        if (!_.isString(val) && !_.isNumber(val) && !_.isUndefined(val)) {
+          throw new TypeError('ColorUtil expects an array of strings, numbers, or undefined values');
+        }
+      });
+
+      var arrayLength = arrayOfStringsOrNumbers.length;
+      var colors = createColorPalette(arrayLength + mappedColors.count());
+      var uniqueColors = _.difference(colors, mappedColors.all()).slice(0, arrayLength + 1);
+      var colorObj = _.zipObject(arrayOfStringsOrNumbers, uniqueColors);
+
+      return function (value) {
+        if (!mappedColors.get(value)) {
+          mappedColors.add(value, colorObj[value]);
+        }
+        return mappedColors.get(value);
+      };
+    };
+  };
+});
diff --git a/src/kibana/components/vislib/components/color/color_palette.js b/src/ui/public/vislib/components/color/color_palette.js
similarity index 88%
rename from src/kibana/components/vislib/components/color/color_palette.js
rename to src/ui/public/vislib/components/color/color_palette.js
index 6c6e3efb39ad4..6213d1c201c85 100644
--- a/src/kibana/components/vislib/components/color/color_palette.js
+++ b/src/ui/public/vislib/components/color/color_palette.js
@@ -1,8 +1,9 @@
 define(function (require) {
-  return function ColorPaletteUtilService(d3, Private) {
+  return function ColorPaletteUtilService(Private) {
+    var d3 = require('d3');
     var _ = require('lodash');
 
-    var seedColors = Private(require('components/vislib/components/color/seed_colors'));
+    var seedColors = Private(require('ui/vislib/components/color/seed_colors'));
 
 
     /*
@@ -57,4 +58,4 @@ define(function (require) {
     };
 
   };
-});
\ No newline at end of file
+});
diff --git a/src/kibana/components/vislib/components/color/mapped_colors.js b/src/ui/public/vislib/components/color/mapped_colors.js
similarity index 100%
rename from src/kibana/components/vislib/components/color/mapped_colors.js
rename to src/ui/public/vislib/components/color/mapped_colors.js
diff --git a/src/kibana/components/vislib/components/color/seed_colors.js b/src/ui/public/vislib/components/color/seed_colors.js
similarity index 100%
rename from src/kibana/components/vislib/components/color/seed_colors.js
rename to src/ui/public/vislib/components/color/seed_colors.js
diff --git a/src/kibana/components/vislib/components/labels/data_array.js b/src/ui/public/vislib/components/labels/data_array.js
similarity index 83%
rename from src/kibana/components/vislib/components/labels/data_array.js
rename to src/ui/public/vislib/components/labels/data_array.js
index de2f41976ae3f..8ba95c0c94b6c 100644
--- a/src/kibana/components/vislib/components/labels/data_array.js
+++ b/src/ui/public/vislib/components/labels/data_array.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function GetArrayUtilService(Private) {
     var _ = require('lodash');
-    var flattenSeries = Private(require('components/vislib/components/labels/flatten_series'));
+    var flattenSeries = Private(require('ui/vislib/components/labels/flatten_series'));
 
     /*
      * Accepts a Kibana data object and returns an array of values objects.
@@ -15,4 +15,4 @@ define(function (require) {
       return obj.series;
     };
   };
-});
\ No newline at end of file
+});
diff --git a/src/kibana/components/vislib/components/labels/flatten_series.js b/src/ui/public/vislib/components/labels/flatten_series.js
similarity index 100%
rename from src/kibana/components/vislib/components/labels/flatten_series.js
rename to src/ui/public/vislib/components/labels/flatten_series.js
diff --git a/src/ui/public/vislib/components/labels/labels.js b/src/ui/public/vislib/components/labels/labels.js
new file mode 100644
index 0000000000000..b9440c660f3cf
--- /dev/null
+++ b/src/ui/public/vislib/components/labels/labels.js
@@ -0,0 +1,22 @@
+define(function (require) {
+  return function LabelUtilService(Private) {
+    var _ = require('lodash');
+
+    var createArr = Private(require('ui/vislib/components/labels/data_array'));
+    var getArrOfUniqLabels = Private(require('ui/vislib/components/labels/uniq_labels'));
+    var getPieLabels = Private(require('ui/vislib/components/labels/pie/pie_labels'));
+
+    /*
+     * Accepts a Kibana data object and returns an array of unique labels (strings).
+     * Extracts the field formatter from the raw object and passes it to the
+     * getArrOfUniqLabels function.
+     *
+     * Currently, this service is only used for vertical bar charts and line charts.
+     */
+    return function (obj, chartType) {
+      if (!_.isObject(obj)) { throw new TypeError('LabelUtil expects an object'); }
+      if (chartType === 'pie') { return getPieLabels(obj); }
+      return getArrOfUniqLabels(createArr(obj));
+    };
+  };
+});
diff --git a/src/kibana/components/vislib/components/labels/pie/get_pie_names.js b/src/ui/public/vislib/components/labels/pie/get_pie_names.js
similarity index 80%
rename from src/kibana/components/vislib/components/labels/pie/get_pie_names.js
rename to src/ui/public/vislib/components/labels/pie/get_pie_names.js
index 01cf2fc2f12fc..38a69707984cd 100644
--- a/src/kibana/components/vislib/components/labels/pie/get_pie_names.js
+++ b/src/ui/public/vislib/components/labels/pie/get_pie_names.js
@@ -2,7 +2,7 @@ define(function (require) {
   var _ = require('lodash');
 
   return function GetPieNames(Private) {
-    var returnNames = Private(require('components/vislib/components/labels/pie/return_pie_names'));
+    var returnNames = Private(require('ui/vislib/components/labels/pie/return_pie_names'));
 
     return function (data, columns) {
       var slices = data.slices;
diff --git a/src/ui/public/vislib/components/labels/pie/pie_labels.js b/src/ui/public/vislib/components/labels/pie/pie_labels.js
new file mode 100644
index 0000000000000..b57f6b4a6b25a
--- /dev/null
+++ b/src/ui/public/vislib/components/labels/pie/pie_labels.js
@@ -0,0 +1,26 @@
+define(function (require) {
+  var _ = require('lodash');
+
+  return function PieLabels(Private) {
+    var removeZeroSlices = Private(require('ui/vislib/components/labels/pie/remove_zero_slices'));
+    var getNames = Private(require('ui/vislib/components/labels/pie/get_pie_names'));
+
+    return function (obj) {
+      if (!_.isObject(obj)) { throw new TypeError('PieLabel expects an object'); }
+
+      var data = obj.columns || obj.rows || [obj];
+      var names = [];
+
+      data.forEach(function (obj) {
+        var columns = obj.raw ? obj.raw.columns : undefined;
+        obj.slices = removeZeroSlices(obj.slices);
+
+        getNames(obj, columns).forEach(function (name) {
+          names.push(name);
+        });
+      });
+
+      return _.uniq(names);
+    };
+  };
+});
diff --git a/src/kibana/components/vislib/components/labels/pie/remove_zero_slices.js b/src/ui/public/vislib/components/labels/pie/remove_zero_slices.js
similarity index 100%
rename from src/kibana/components/vislib/components/labels/pie/remove_zero_slices.js
rename to src/ui/public/vislib/components/labels/pie/remove_zero_slices.js
diff --git a/src/kibana/components/vislib/components/labels/pie/return_pie_names.js b/src/ui/public/vislib/components/labels/pie/return_pie_names.js
similarity index 100%
rename from src/kibana/components/vislib/components/labels/pie/return_pie_names.js
rename to src/ui/public/vislib/components/labels/pie/return_pie_names.js
diff --git a/src/kibana/components/vislib/components/labels/uniq_labels.js b/src/ui/public/vislib/components/labels/uniq_labels.js
similarity index 100%
rename from src/kibana/components/vislib/components/labels/uniq_labels.js
rename to src/ui/public/vislib/components/labels/uniq_labels.js
diff --git a/src/kibana/components/vislib/components/zero_injection/flatten_data.js b/src/ui/public/vislib/components/zero_injection/flatten_data.js
similarity index 100%
rename from src/kibana/components/vislib/components/zero_injection/flatten_data.js
rename to src/ui/public/vislib/components/zero_injection/flatten_data.js
diff --git a/src/kibana/components/vislib/components/zero_injection/inject_zeros.js b/src/ui/public/vislib/components/zero_injection/inject_zeros.js
similarity index 80%
rename from src/kibana/components/vislib/components/zero_injection/inject_zeros.js
rename to src/ui/public/vislib/components/zero_injection/inject_zeros.js
index bd56b6657935a..35e527544a333 100644
--- a/src/kibana/components/vislib/components/zero_injection/inject_zeros.js
+++ b/src/ui/public/vislib/components/zero_injection/inject_zeros.js
@@ -2,9 +2,9 @@ define(function (require) {
   return function ZeroInjectionUtilService(Private) {
     var _ = require('lodash');
 
-    var orderXValues = Private(require('components/vislib/components/zero_injection/ordered_x_keys'));
-    var createZeroFilledArray = Private(require('components/vislib/components/zero_injection/zero_filled_array'));
-    var zeroFillDataArray = Private(require('components/vislib/components/zero_injection/zero_fill_data_array'));
+    var orderXValues = Private(require('ui/vislib/components/zero_injection/ordered_x_keys'));
+    var createZeroFilledArray = Private(require('ui/vislib/components/zero_injection/zero_filled_array'));
+    var zeroFillDataArray = Private(require('ui/vislib/components/zero_injection/zero_fill_data_array'));
 
     /*
      * A Kibana data object may have multiple series with different array lengths.
diff --git a/src/kibana/components/vislib/components/zero_injection/ordered_x_keys.js b/src/ui/public/vislib/components/zero_injection/ordered_x_keys.js
similarity index 94%
rename from src/kibana/components/vislib/components/zero_injection/ordered_x_keys.js
rename to src/ui/public/vislib/components/zero_injection/ordered_x_keys.js
index 8c96eb8fa7960..3f19f3268ed75 100644
--- a/src/kibana/components/vislib/components/zero_injection/ordered_x_keys.js
+++ b/src/ui/public/vislib/components/zero_injection/ordered_x_keys.js
@@ -2,7 +2,7 @@ define(function (require) {
   return function OrderedXKeysUtilService(Private) {
     var _ = require('lodash');
     var moment = require('moment');
-    var getUniqKeys = Private(require('components/vislib/components/zero_injection/uniq_keys'));
+    var getUniqKeys = Private(require('ui/vislib/components/zero_injection/uniq_keys'));
 
     /*
      * Accepts a Kibana data object and returns
diff --git a/src/kibana/components/vislib/components/zero_injection/uniq_keys.js b/src/ui/public/vislib/components/zero_injection/uniq_keys.js
similarity index 93%
rename from src/kibana/components/vislib/components/zero_injection/uniq_keys.js
rename to src/ui/public/vislib/components/zero_injection/uniq_keys.js
index 9947e69c00c7e..afdffcf2eef71 100644
--- a/src/kibana/components/vislib/components/zero_injection/uniq_keys.js
+++ b/src/ui/public/vislib/components/zero_injection/uniq_keys.js
@@ -2,7 +2,7 @@ define(function (require) {
   return function UniqueXValuesUtilService(Private) {
     var _ = require('lodash');
 
-    var flattenDataArray = Private(require('components/vislib/components/zero_injection/flatten_data'));
+    var flattenDataArray = Private(require('ui/vislib/components/zero_injection/flatten_data'));
 
     /*
      * Accepts a Kibana data object.
diff --git a/src/kibana/components/vislib/components/zero_injection/zero_fill_data_array.js b/src/ui/public/vislib/components/zero_injection/zero_fill_data_array.js
similarity index 100%
rename from src/kibana/components/vislib/components/zero_injection/zero_fill_data_array.js
rename to src/ui/public/vislib/components/zero_injection/zero_fill_data_array.js
diff --git a/src/kibana/components/vislib/components/zero_injection/zero_filled_array.js b/src/ui/public/vislib/components/zero_injection/zero_filled_array.js
similarity index 100%
rename from src/kibana/components/vislib/components/zero_injection/zero_filled_array.js
rename to src/ui/public/vislib/components/zero_injection/zero_filled_array.js
diff --git a/src/kibana/components/vislib/lib/_data_label.js b/src/ui/public/vislib/lib/_data_label.js
similarity index 100%
rename from src/kibana/components/vislib/lib/_data_label.js
rename to src/ui/public/vislib/lib/_data_label.js
diff --git a/src/ui/public/vislib/lib/_error_handler.js b/src/ui/public/vislib/lib/_error_handler.js
new file mode 100644
index 0000000000000..178f36811a248
--- /dev/null
+++ b/src/ui/public/vislib/lib/_error_handler.js
@@ -0,0 +1,35 @@
+define(function (require) {
+  var _ = require('lodash');
+  var errors = require('ui/errors');
+
+  return function ErrorHandlerFactory() {
+
+    /**
+     * Common errors shared between constructors
+     *
+     * @class ErrorHandler
+     * @constructor
+     */
+    function ErrorHandler() {}
+
+    /**
+     * Validates the height and width are > 0
+     * min size must be at least 1 px
+     *
+     * @method validateWidthandHeight
+     * @param width {Number} HTMLElement width
+     * @param height {Number} HTMLElement height
+     * @returns {HTMLElement} HTML div with an error message
+     */
+    ErrorHandler.prototype.validateWidthandHeight = function (width, height) {
+      var badWidth = _.isNaN(width) || width <= 0;
+      var badHeight = _.isNaN(height) || height <= 0;
+
+      if (badWidth || badHeight) {
+        throw new errors.ContainerTooSmall();
+      }
+    };
+
+    return ErrorHandler;
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/components/vislib/lib/alerts.js b/src/ui/public/vislib/lib/alerts.js
similarity index 97%
rename from src/kibana/components/vislib/lib/alerts.js
rename to src/ui/public/vislib/lib/alerts.js
index 49b4eecb6f6e6..1aedb9a27e6c5 100644
--- a/src/kibana/components/vislib/lib/alerts.js
+++ b/src/ui/public/vislib/lib/alerts.js
@@ -1,5 +1,6 @@
 define(function (require) {
-  return function AlertsFactory(d3, Private) {
+  return function AlertsFactory(Private) {
+    var d3 = require('d3');
     var $ = require('jquery');
     var _ = require('lodash');
 
diff --git a/src/ui/public/vislib/lib/axis_title.js b/src/ui/public/vislib/lib/axis_title.js
new file mode 100644
index 0000000000000..97410107361e7
--- /dev/null
+++ b/src/ui/public/vislib/lib/axis_title.js
@@ -0,0 +1,77 @@
+define(function (require) {
+  return function AxisTitleFactory(Private) {
+    var d3 = require('d3');
+    var $ = require('jquery');
+    var _ = require('lodash');
+
+    var ErrorHandler = Private(require('ui/vislib/lib/_error_handler'));
+
+    /**
+     * Appends axis title(s) to the visualization
+     *
+     * @class AxisTitle
+     * @constructor
+     * @param el {HTMLElement} DOM element
+     * @param xTitle {String} X-axis title
+     * @param yTitle {String} Y-axis title
+     */
+    _.class(AxisTitle).inherits(ErrorHandler);
+    function AxisTitle(el, xTitle, yTitle) {
+      if (!(this instanceof AxisTitle)) {
+        return new AxisTitle(el, xTitle, yTitle);
+      }
+
+      this.el = el;
+      this.xTitle = xTitle;
+      this.yTitle = yTitle;
+    }
+
+    /**
+     * Renders both x and y axis titles
+     *
+     * @method render
+     * @returns {HTMLElement} DOM Element with axis titles
+     */
+    AxisTitle.prototype.render = function () {
+      d3.select(this.el).select('.x-axis-title').call(this.draw(this.xTitle));
+      d3.select(this.el).select('.y-axis-title').call(this.draw(this.yTitle));
+    };
+
+    /**
+     * Appends an SVG with title text
+     *
+     * @method draw
+     * @param title {String} Axis title
+     * @returns {Function} Appends axis title to a D3 selection
+     */
+    AxisTitle.prototype.draw = function (title) {
+      var self = this;
+
+      return function (selection) {
+        selection.each(function () {
+          var el = this;
+          var div = d3.select(el);
+          var width = $(el).width();
+          var height = $(el).height();
+
+          self.validateWidthandHeight(width, height);
+
+          div.append('svg')
+          .attr('width', width)
+          .attr('height', height)
+          .append('text')
+          .attr('transform', function () {
+            if (div.attr('class') === 'x-axis-title') {
+              return 'translate(' + width / 2 + ',11)';
+            }
+            return 'translate(11,' + height / 2 + ')rotate(270)';
+          })
+          .attr('text-anchor', 'middle')
+          .text(title);
+        });
+      };
+    };
+
+    return AxisTitle;
+  };
+});
diff --git a/src/ui/public/vislib/lib/chart_title.js b/src/ui/public/vislib/lib/chart_title.js
new file mode 100644
index 0000000000000..9ca6eb9a4f9bb
--- /dev/null
+++ b/src/ui/public/vislib/lib/chart_title.js
@@ -0,0 +1,131 @@
+define(function (require) {
+  return function ChartTitleFactory(Private) {
+    var d3 = require('d3');
+    var $ = require('jquery');
+    var _ = require('lodash');
+
+    var ErrorHandler = Private(require('ui/vislib/lib/_error_handler'));
+    var Tooltip = Private(require('ui/vislib/components/Tooltip'));
+
+    /**
+     * Appends chart titles to the visualization
+     *
+     * @class ChartTitle
+     * @constructor
+     * @param el {HTMLElement} Reference to DOM element
+     */
+    _.class(ChartTitle).inherits(ErrorHandler);
+    function ChartTitle(el) {
+      if (!(this instanceof ChartTitle)) {
+        return new ChartTitle(el);
+      }
+
+      this.el = el;
+      this.tooltip = new Tooltip('chart-title', el, function (d) {
+        return '<p>' + _.escape(d.label) + '</p>';
+      });
+    }
+
+    /**
+     * Renders chart titles
+     *
+     * @method render
+     * @returns {D3.Selection|D3.Transition.Transition} DOM element with chart titles
+     */
+    ChartTitle.prototype.render = function () {
+      var el = d3.select(this.el).select('.chart-title').node();
+      var width = el ? el.clientWidth : 0;
+      var height = el ? el.clientHeight : 0;
+
+      return d3.select(this.el).selectAll('.chart-title').call(this.draw(width, height));
+    };
+
+    /**
+     * Truncates chart title text
+     *
+     * @method truncate
+     * @param size {Number} Height or width of the HTML Element
+     * @returns {Function} Truncates text
+     */
+    ChartTitle.prototype.truncate = function (size) {
+      var self = this;
+
+      return function (selection) {
+        selection.each(function () {
+          var text = d3.select(this);
+          var n = text[0].length;
+          var maxWidth = size / n * 0.9;
+          var length = this.getComputedTextLength();
+          var str;
+          var avg;
+          var end;
+
+          if (length > maxWidth) {
+            str = text.text();
+            avg = length / str.length;
+            end = Math.floor(maxWidth / avg) - 5;
+            str = str.substr(0, end) + '...';
+            self.addMouseEvents(text);
+
+            return text.text(str);
+          }
+
+          return text.text();
+        });
+      };
+    };
+
+    /**
+     * Adds tooltip events on truncated chart titles
+     *
+     * @method addMouseEvents
+     * @param target {HTMLElement} DOM element to attach event listeners
+     * @returns {*} DOM element with event listeners attached
+     */
+    ChartTitle.prototype.addMouseEvents = function (target) {
+      if (this.tooltip) {
+        return target.call(this.tooltip.render());
+      }
+    };
+
+    /**
+     * Appends chart titles to the visualization
+     *
+     * @method draw
+     * @returns {Function} Appends chart titles to a D3 selection
+     */
+    ChartTitle.prototype.draw = function (width, height) {
+      var self = this;
+
+      return function (selection) {
+        selection.each(function () {
+          var div = d3.select(this);
+          var dataType = this.parentNode.__data__.rows ? 'rows' : 'columns';
+          var size = dataType === 'rows' ? height : width;
+          var txtHtOffset = 11;
+
+          self.validateWidthandHeight(width, height);
+
+          div.append('svg')
+          .attr('width', width)
+          .attr('height', height)
+          .append('text')
+          .attr('transform', function () {
+            if (dataType === 'rows') {
+              return 'translate(' + txtHtOffset + ',' + height / 2 + ')rotate(270)';
+            }
+            return 'translate(' + width / 2 + ',' + txtHtOffset + ')';
+          })
+          .attr('text-anchor', 'middle')
+          .text(function (d) { return d.label; });
+
+          // truncate long chart titles
+          div.selectAll('text')
+          .call(self.truncate(size));
+        });
+      };
+    };
+
+    return ChartTitle;
+  };
+});
diff --git a/src/ui/public/vislib/lib/data.js b/src/ui/public/vislib/lib/data.js
new file mode 100644
index 0000000000000..b88f455d5b490
--- /dev/null
+++ b/src/ui/public/vislib/lib/data.js
@@ -0,0 +1,712 @@
+define(function (require) {
+  return function DataFactory(Private) {
+    var d3 = require('d3');
+    var _ = require('lodash');
+
+    var injectZeros = Private(require('ui/vislib/components/zero_injection/inject_zeros'));
+    var orderKeys = Private(require('ui/vislib/components/zero_injection/ordered_x_keys'));
+    var getLabels = Private(require('ui/vislib/components/labels/labels'));
+    var color = Private(require('ui/vislib/components/color/color'));
+    var errors = require('ui/errors');
+
+    /**
+     * Provides an API for pulling values off the data
+     * and calculating values using the data
+     *
+     * @class Data
+     * @constructor
+     * @param data {Object} Elasticsearch query results
+     * @param attr {Object|*} Visualization options
+     */
+    function Data(data, attr) {
+      if (!(this instanceof Data)) {
+        return new Data(data, attr);
+      }
+
+      var self = this;
+      var offset;
+
+      if (attr.mode === 'stacked') {
+        offset = 'zero';
+      } else if (attr.mode === 'percentage') {
+        offset = 'expand';
+      } else if (attr.mode === 'grouped') {
+        offset = 'group';
+      } else {
+        offset = attr.mode;
+      }
+
+      this.data = data;
+      this.type = this.getDataType();
+
+      this.labels = this._getLabels(this.data);
+      this.color = this.labels ? color(this.labels) : undefined;
+      this._normalizeOrdered();
+
+      this._attr = _.defaults(attr || {}, {
+        stack: d3.layout.stack()
+          .x(function (d) { return d.x; })
+          .y(function (d) {
+            if (offset === 'expand') {
+              return Math.abs(d.y);
+            }
+            return d.y;
+          })
+          .offset(offset || 'zero')
+      });
+
+      if (attr.mode === 'stacked' && attr.type === 'histogram') {
+        this._attr.stack.out(function (d, y0, y) {
+          return self._stackNegAndPosVals(d, y0, y);
+        });
+      }
+    }
+
+    Data.prototype._updateData = function () {
+      if (this.data.rows) {
+        _.map(this.data.rows, this._updateDataSeriesLabel, this);
+      } else if (this.data.columns) {
+        _.map(this.data.columns, this._updateDataSeriesLabel, this);
+      } else {
+        this._updateDataSeriesLabel(this.data);
+      }
+    };
+
+    Data.prototype._updateDataSeriesLabel = function (eachData) {
+      if (eachData.series) {
+        eachData.series[0].label = this.get('yAxisLabel');
+      }
+    };
+
+    Data.prototype._getLabels = function (data) {
+      if (this.type === 'series') {
+        var noLabel = getLabels(data).length === 1 && getLabels(data)[0] === '';
+        if (noLabel) {
+          this._updateData();
+          return [(this.get('yAxisLabel'))];
+        }
+        return getLabels(data);
+      }
+      return this.pieNames();
+    };
+
+    /**
+     * Returns true for positive numbers
+     */
+    Data.prototype._isPositive = function (num) {
+      return num >= 0;
+    };
+
+    /**
+     * Returns true for negative numbers
+     */
+    Data.prototype._isNegative = function (num) {
+      return num < 0;
+    };
+
+    /**
+     * Adds two input values
+     */
+    Data.prototype._addVals = function (a, b) {
+      return a + b;
+    };
+
+    /**
+     * Returns the results of the addition of numbers in a filtered array.
+     */
+    Data.prototype._sumYs = function (arr, callback) {
+      var filteredArray = arr.filter(callback);
+
+      return (filteredArray.length) ? filteredArray.reduce(this._addVals) : 0;
+    };
+
+    /**
+     * Calculates the d.y0 value for stacked data in D3.
+     */
+    Data.prototype._calcYZero = function (y, arr) {
+      if (y >= 0) return this._sumYs(arr, this._isPositive);
+      return this._sumYs(arr, this._isNegative);
+    };
+
+    /**
+     *
+     */
+    Data.prototype._getCounts = function (i, j) {
+      var data = this.chartData();
+      var dataLengths = {};
+
+      dataLengths.charts = data.length;
+      dataLengths.stacks = dataLengths.charts ? data[i].series.length : 0;
+      dataLengths.values = dataLengths.stacks ? data[i].series[j].values.length : 0;
+
+      return dataLengths;
+    };
+
+    /**
+     *
+     */
+    Data.prototype._createCache = function () {
+      var cache = {
+        index: {
+          chart: 0,
+          stack: 0,
+          value: 0
+        },
+        yValsArr: []
+      };
+
+      cache.count = this._getCounts(cache.index.chart, cache.index.stack);
+
+      return cache;
+    };
+
+    /**
+     * Stacking function passed to the D3 Stack Layout `.out` API.
+     * See: https://github.com/mbostock/d3/wiki/Stack-Layout
+     * It is responsible for calculating the correct d.y0 value for
+     * mixed datasets containing both positive and negative values.
+     */
+    Data.prototype._stackNegAndPosVals = function (d, y0, y) {
+      var data = this.chartData();
+
+      // Storing counters and data characteristics needed to stack values properly
+      if (!this._cache) {
+        this._cache = this._createCache();
+      }
+
+      d.y0 = this._calcYZero(y, this._cache.yValsArr);
+      ++this._cache.index.stack;
+
+
+      // last stack, or last value, reset the stack count and y value array
+      var lastStack = (this._cache.index.stack >= this._cache.count.stacks);
+      if (lastStack) {
+        this._cache.index.stack = 0;
+        ++this._cache.index.value;
+        this._cache.yValsArr = [];
+      // still building the stack collection, push v value to array
+      } else if (y !== 0) {
+        this._cache.yValsArr.push(y);
+      }
+
+      // last value, prepare for the next chart, if one exists
+      var lastValue = (this._cache.index.value >= this._cache.count.values);
+      if (lastValue) {
+        this._cache.index.value = 0;
+        ++this._cache.index.chart;
+
+        // no more charts, reset the queue and finish
+        if (this._cache.index.chart >= this._cache.count.charts) {
+          this._cache = this._createCache();
+          return;
+        }
+
+        // get stack and value count for next chart
+        var chartSeries = data[this._cache.index.chart].series;
+        this._cache.count.stacks = chartSeries.length;
+        this._cache.count.values = chartSeries.length ? chartSeries[this._cache.index.stack].values.length : 0;
+      }
+    };
+
+    Data.prototype.getDataType = function () {
+      var data = this.getVisData();
+      var type;
+
+      data.forEach(function (obj) {
+        if (obj.series) {
+          type = 'series';
+        } else if (obj.slices) {
+          type = 'slices';
+        } else if (obj.geoJson) {
+          type = 'geoJson';
+        }
+      });
+
+      return type;
+    };
+
+    /**
+     * Returns an array of the actual x and y data value objects
+     * from data with series keys
+     *
+     * @method chartData
+     * @returns {*} Array of data objects
+     */
+    Data.prototype.chartData = function () {
+      if (!this.data.series) {
+        var arr = this.data.rows ? this.data.rows : this.data.columns;
+        return _.toArray(arr);
+      }
+      return [this.data];
+    };
+
+    /**
+     * Returns an array of chart data objects
+     *
+     * @method getVisData
+     * @returns {*} Array of chart data objects
+     */
+    Data.prototype.getVisData = function () {
+      var visData;
+
+      if (this.data.rows) {
+        visData = this.data.rows;
+      } else if (this.data.columns) {
+        visData = this.data.columns;
+      } else {
+        visData = [this.data];
+      }
+
+      return visData;
+    };
+
+    /**
+     * get min and max for all cols, rows of data
+     *
+     * @method getMaxMin
+     * @return {Object}
+     */
+    Data.prototype.getGeoExtents = function () {
+      var visData = this.getVisData();
+
+      return _.reduce(_.pluck(visData, 'geoJson.properties'), function (minMax, props) {
+        return {
+          min: Math.min(props.min, minMax.min),
+          max: Math.max(props.max, minMax.max)
+        };
+      }, { min: Infinity, max: -Infinity });
+    };
+
+    /**
+     * Returns array of chart data objects for pie data objects
+     *
+     * @method pieData
+     * @returns {*} Array of chart data objects
+     */
+    Data.prototype.pieData = function () {
+      if (!this.data.slices) {
+        return this.data.rows ? this.data.rows : this.data.columns;
+      }
+      return [this.data];
+    };
+
+    /**
+     * Get attributes off the data, e.g. `tooltipFormatter` or `xAxisFormatter`
+     * pulls the value off the first item in the array
+     * these values are typically the same between data objects of the same chart
+     * TODO: May need to verify this or refactor
+     *
+     * @method get
+     * @param thing {String} Data object key
+     * @returns {*} Data object value
+     */
+    Data.prototype.get = function (thing, def) {
+      var source = (this.data.rows || this.data.columns || [this.data])[0];
+      return _.get(source, thing, def);
+    };
+
+    /**
+     * Returns true if null values are present
+     * @returns {*}
+     */
+    Data.prototype.hasNullValues = function () {
+      var chartData = this.chartData();
+
+      return chartData.some(function (chart) {
+        return chart.series.some(function (obj) {
+          return obj.values.some(function (d) {
+            return d.y === null;
+          });
+        });
+      });
+    };
+
+    /**
+     * Return an array of all value objects
+     * Pluck the data.series array from each data object
+     * Create an array of all the value objects from the series array
+     *
+     * @method flatten
+     * @returns {Array} Value objects
+     */
+    Data.prototype.flatten = function () {
+      return _(this.chartData())
+      .pluck('series')
+      .flattenDeep()
+      .pluck('values')
+      .flattenDeep()
+      .value();
+    };
+
+    /**
+     * Determines whether histogram charts should be stacked
+     * TODO: need to make this more generic
+     *
+     * @method shouldBeStacked
+     * @returns {boolean}
+     */
+    Data.prototype.shouldBeStacked = function () {
+      var isHistogram = (this._attr.type === 'histogram');
+      var isArea = (this._attr.type === 'area');
+      var isOverlapping = (this._attr.mode === 'overlap');
+      var grouped = (this._attr.mode === 'grouped');
+
+      var stackedHisto = isHistogram && !grouped;
+      var stackedArea = isArea && !isOverlapping;
+
+      return stackedHisto || stackedArea;
+    };
+
+    /**
+     * Validates that the Y axis min value defined by user input
+     * is a number.
+     *
+     * @param val {Number} Y axis min value
+     * @returns {Number} Y axis min value
+     */
+    Data.prototype.validateUserDefinedYMin = function (val) {
+      if (!_.isNumber(val)) {
+        throw new Error('validateUserDefinedYMin expects a number');
+      }
+      return val;
+    };
+
+    /**
+     * Calculates the lowest Y value across all charts, taking
+     * stacking into consideration.
+     *
+     * @method getYMin
+     * @param {function} [getValue] - optional getter that will receive a
+     *                              point and should return the value that should
+     *                              be considered
+     * @returns {Number} Min y axis value
+     */
+    Data.prototype.getYMin = function (getValue) {
+      var self = this;
+      var arr = [];
+
+      if (this._attr.mode === 'percentage' || this._attr.mode === 'wiggle' ||
+        this._attr.mode === 'silhouette') {
+        return 0;
+      }
+
+      var flat = this.flatten();
+      // if there is only one data point and its less than zero,
+      // return 0 as the yMax value.
+      if (!flat.length || flat.length === 1 && flat[0].y > 0) {
+        return 0;
+      }
+
+      var min = Infinity;
+
+      // for each object in the dataArray,
+      // push the calculated y value to the initialized array (arr)
+      _.each(this.chartData(), function (chart) {
+        var calculatedMin = self._getYExtent(chart, 'min', getValue);
+        if (!_.isUndefined(calculatedMin)) {
+          min = Math.min(min, calculatedMin);
+        }
+      });
+
+      return min;
+    };
+
+    /**
+     * Calculates the highest Y value across all charts, taking
+     * stacking into consideration.
+     *
+     * @method getYMax
+     * @param {function} [getValue] - optional getter that will receive a
+     *                              point and should return the value that should
+     *                              be considered
+     * @returns {Number} Max y axis value
+     */
+    Data.prototype.getYMax = function (getValue) {
+      var self = this;
+      var arr = [];
+
+      if (self._attr.mode === 'percentage') {
+        return 1;
+      }
+
+      var flat = this.flatten();
+      // if there is only one data point and its less than zero,
+      // return 0 as the yMax value.
+      if (!flat.length || flat.length === 1 && flat[0].y < 0) {
+        return 0;
+      }
+
+      var max = -Infinity;
+
+      // for each object in the dataArray,
+      // push the calculated y value to the initialized array (arr)
+      _.each(this.chartData(), function (chart) {
+        var calculatedMax = self._getYExtent(chart, 'max', getValue);
+        if (!_.isUndefined(calculatedMax)) {
+          max = Math.max(max, calculatedMax);
+        }
+      });
+
+      return max;
+    };
+
+    /**
+     * Calculates the stacked values for each data object
+     *
+     * @method stackData
+     * @param series {Array} Array of data objects
+     * @returns {*} Array of data objects with x, y, y0 keys
+     */
+    Data.prototype.stackData = function (series) {
+      // Should not stack values on line chart
+      if (this._attr.type === 'line') return series;
+      return this._attr.stack(series);
+    };
+
+    /**
+     * Returns the max Y axis value for a `series` array based on
+     * a specified callback function (calculation).
+     * @param {function} [getValue] - Optional getter that will be used to read
+     *                              values from points when calculating the extent.
+     *                              default is either this._getYStack or this.getY
+     *                              based on this.shouldBeStacked().
+     */
+    Data.prototype._getYExtent = function (chart, extent, getValue) {
+      if (this.shouldBeStacked()) {
+        this.stackData(_.pluck(chart.series, 'values'));
+        getValue = getValue || this._getYStack;
+      } else {
+        getValue = getValue || this._getY;
+      }
+
+      var points = chart.series
+      .reduce(function (points, series) {
+        return points.concat(series.values);
+      }, [])
+      .map(getValue);
+
+      return d3[extent](points);
+    };
+
+    /**
+     * Calculates the y stack value for each data object
+     */
+    Data.prototype._getYStack = function (d) {
+      return d.y0 + d.y;
+    };
+
+    /**
+     * Calculates the Y max value
+     */
+    Data.prototype._getY = function (d) {
+      return d.y;
+    };
+
+    /**
+     * Helper function for getNames
+     * Returns an array of objects with a name (key) value and an index value.
+     * The index value allows us to sort the names in the correct nested order.
+     *
+     * @method returnNames
+     * @param array {Array} Array of data objects
+     * @param index {Number} Number of times the object is nested
+     * @param columns {Object} Contains name formatter information
+     * @returns {Array} Array of labels (strings)
+     */
+    Data.prototype.returnNames = function (array, index, columns) {
+      var names = [];
+      var self = this;
+
+      _.forEach(array, function (obj) {
+        names.push({ label: obj.name, values: obj, index: index });
+
+        if (obj.children) {
+          var plusIndex = index + 1;
+
+          _.forEach(self.returnNames(obj.children, plusIndex, columns), function (namedObj) {
+            names.push(namedObj);
+          });
+        }
+      });
+
+      return names;
+    };
+
+    /**
+     * Flattens hierarchical data into an array of objects with a name and index value.
+     * The indexed value determines the order of nesting in the data.
+     * Returns an array with names sorted by the index value.
+     *
+     * @method getNames
+     * @param data {Object} Chart data object
+     * @param columns {Object} Contains formatter information
+     * @returns {Array} Array of names (strings)
+     */
+    Data.prototype.getNames = function (data, columns) {
+      var slices = data.slices;
+
+      if (slices.children) {
+        var namedObj = this.returnNames(slices.children, 0, columns);
+
+        return _(namedObj)
+        .sortBy(function (obj) {
+          return obj.index;
+        })
+        .unique(function (d) {
+          return d.label;
+        })
+        .value();
+      }
+    };
+
+    /**
+     * Removes zeros from pie chart data
+     * @param slices
+     * @returns {*}
+     */
+    Data.prototype._removeZeroSlices = function (slices) {
+      var self = this;
+
+      if (!slices.children) return slices;
+
+      slices = _.clone(slices);
+      slices.children = slices.children.reduce(function (children, child) {
+        if (child.size !== 0) {
+          children.push(self._removeZeroSlices(child));
+        }
+        return children;
+      }, []);
+
+      return slices;
+    };
+
+    /**
+     * Returns an array of names ordered by appearance in the nested array
+     * of objects
+     *
+     * @method pieNames
+     * @returns {Array} Array of unique names (strings)
+     */
+    Data.prototype.pieNames = function (data) {
+      var self = this;
+      var names = [];
+
+      _.forEach(data, function (obj) {
+        var columns = obj.raw ? obj.raw.columns : undefined;
+        obj.slices = self._removeZeroSlices(obj.slices);
+
+        _.forEach(self.getNames(obj, columns), function (name) {
+          names.push(name);
+        });
+      });
+
+      return _.uniq(names, 'label');
+    };
+
+    /**
+     * Inject zeros into the data
+     *
+     * @method injectZeros
+     * @returns {Object} Data object with zeros injected
+     */
+    Data.prototype.injectZeros = function () {
+      return injectZeros(this.data);
+    };
+
+    /**
+     * Returns an array of all x axis values from the data
+     *
+     * @method xValues
+     * @returns {Array} Array of x axis values
+     */
+    Data.prototype.xValues = function () {
+      return orderKeys(this.data);
+    };
+
+    /**
+     * Return an array of unique labels
+     * Curently, only used for vertical bar and line charts,
+     * or any data object with series values
+     *
+     * @method getLabels
+     * @returns {Array} Array of labels (strings)
+     */
+    Data.prototype.getLabels = function () {
+      return getLabels(this.data);
+    };
+
+    /**
+     * Returns a function that does color lookup on labels
+     *
+     * @method getColorFunc
+     * @returns {Function} Performs lookup on string and returns hex color
+     */
+    Data.prototype.getColorFunc = function () {
+      return color(this.getLabels());
+    };
+
+    /**
+     * Returns a function that does color lookup on names for pie charts
+     *
+     * @method getPieColorFunc
+     * @returns {Function} Performs lookup on string and returns hex color
+     */
+    Data.prototype.getPieColorFunc = function () {
+      return color(this.pieNames(this.getVisData()).map(function (d) {
+        return d.label;
+      }));
+    };
+
+    /**
+     * ensure that the datas ordered property has a min and max
+     * if the data represents an ordered date range.
+     *
+     * @return {undefined}
+     */
+    Data.prototype._normalizeOrdered = function () {
+      if (!this.data.ordered || !this.data.ordered.date) return;
+
+      var missingMin = this.data.ordered.min == null;
+      var missingMax = this.data.ordered.max == null;
+
+      if (missingMax || missingMin) {
+        var extent = d3.extent(this.xValues());
+        if (missingMin) this.data.ordered.min = extent[0];
+        if (missingMax) this.data.ordered.max = extent[1];
+      }
+    };
+
+    /**
+     * Calculates min and max values for all map data
+     * series.rows is an array of arrays
+     * each row is an array of values
+     * last value in row array is bucket count
+     *
+     * @method mapDataExtents
+     * @param series {Array} Array of data objects
+     * @returns {Array} min and max values
+     */
+    Data.prototype.mapDataExtents = function (series) {
+      var values;
+      values = _.map(series.rows, function (row) {
+        return row[row.length - 1];
+      });
+      var extents = [_.min(values), _.max(values)];
+      return extents;
+    };
+
+    /**
+     * Get the maximum number of series, considering each chart
+     * individually.
+     *
+     * @return {number} - the largest number of series from all charts
+     */
+    Data.prototype.maxNumberOfSeries = function () {
+      return this.chartData().reduce(function (max, chart) {
+        return Math.max(max, chart.series.length);
+      }, 0);
+    };
+
+    return Data;
+  };
+});
diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js
new file mode 100644
index 0000000000000..fb13291d038d7
--- /dev/null
+++ b/src/ui/public/vislib/lib/dispatch.js
@@ -0,0 +1,318 @@
+define(function (require) {
+  return function DispatchClass(Private) {
+    var d3 = require('d3');
+    var _ = require('lodash');
+    var $ = require('jquery');
+    var Tooltip = Private(require('ui/vislib/components/Tooltip'));
+    var SimpleEmitter = require('ui/utils/SimpleEmitter');
+
+    /**
+     * Handles event responses
+     *
+     * @class Dispatch
+     * @constructor
+     * @param handler {Object} Reference to Handler Class Object
+     */
+
+    _.class(Dispatch).inherits(SimpleEmitter);
+    function Dispatch(handler) {
+      if (!(this instanceof Dispatch)) {
+        return new Dispatch(handler);
+      }
+
+      Dispatch.Super.call(this);
+      this.handler = handler;
+      this._listeners = {};
+    }
+
+    /**
+     * Response to click and hover events
+     *
+     * @param d {Object} Data point
+     * @param i {Number} Index number of data point
+     * @returns {{value: *, point: *, label: *, color: *, pointIndex: *,
+      * series: *, config: *, data: (Object|*),
+     * e: (d3.event|*), handler: (Object|*)}} Event response object
+     */
+    Dispatch.prototype.eventResponse = function (d, i) {
+      var datum = d._input || d;
+      var data = d3.event.target.nearestViewportElement ?
+        d3.event.target.nearestViewportElement.__data__ : d3.event.target.__data__;
+      var label = d.label ? d.label : d.name;
+      var isSeries = !!(data && data.series);
+      var isSlices = !!(data && data.slices);
+      var series = isSeries ? data.series : undefined;
+      var slices = isSlices ? data.slices : undefined;
+      var handler = this.handler;
+      var color = _.get(handler, 'data.color');
+      var isPercentage = (handler && handler._attr.mode === 'percentage');
+
+      var eventData = {
+        value: d.y,
+        point: datum,
+        datum: datum,
+        label: label,
+        color: color ? color(label) : undefined,
+        pointIndex: i,
+        series: series,
+        slices: slices,
+        config: handler && handler._attr,
+        data: data,
+        e: d3.event,
+        handler: handler
+      };
+
+      if (isSeries) {
+        // Find object with the actual d value and add it to the point object
+        var object = _.find(series, { 'label': d.label });
+        eventData.value = +object.values[i].y;
+
+        if (isPercentage) {
+          // Add the formatted percentage to the point object
+          eventData.percent = (100 * d.y).toFixed(1) + '%';
+        }
+      }
+
+      return eventData;
+    };
+
+    /**
+     * Returns a function that adds events and listeners to a D3 selection
+     *
+     * @method addEvent
+     * @param event {String}
+     * @param callback {Function}
+     * @returns {Function}
+     */
+    Dispatch.prototype.addEvent = function (event, callback) {
+      return function (selection) {
+        selection.each(function () {
+          var element = d3.select(this);
+
+          if (typeof callback === 'function') {
+            return element.on(event, callback);
+          }
+        });
+      };
+    };
+
+    /**
+     *
+     * @method addHoverEvent
+     * @returns {Function}
+     */
+    Dispatch.prototype.addHoverEvent = function () {
+      var self = this;
+      var isClickable = this.listenerCount('click') > 0;
+      var addEvent = this.addEvent;
+      var $el = this.handler.el;
+
+      function hover(d, i) {
+        // Add pointer if item is clickable
+        if (isClickable) {
+          self.addMousePointer.call(this, arguments);
+        }
+
+        self.highlightLegend.call(this, $el);
+        self.emit('hover', self.eventResponse(d, i));
+      }
+
+      return addEvent('mouseover', hover);
+    };
+
+    /**
+     *
+     * @method addMouseoutEvent
+     * @returns {Function}
+     */
+    Dispatch.prototype.addMouseoutEvent = function () {
+      var self = this;
+      var addEvent = this.addEvent;
+      var $el = this.handler.el;
+
+      function mouseout() {
+        self.unHighlightLegend.call(this, $el);
+      }
+
+      return addEvent('mouseout', mouseout);
+    };
+
+    /**
+     *
+     * @method addClickEvent
+     * @returns {Function}
+     */
+    Dispatch.prototype.addClickEvent = function () {
+      var self = this;
+      var addEvent = this.addEvent;
+
+      function click(d, i) {
+        self.emit('click', self.eventResponse(d, i));
+      }
+
+      return addEvent('click', click);
+    };
+
+    /**
+     * Determine if we will allow brushing
+     *
+     * @method allowBrushing
+     * @returns {Boolean}
+     */
+    Dispatch.prototype.allowBrushing = function () {
+      var xAxis = this.handler.xAxis;
+      return Boolean(xAxis.ordered && xAxis.xScale && _.isFunction(xAxis.xScale.invert));
+    };
+
+    /**
+     * Determine if brushing is currently enabled
+     *
+     * @method isBrushable
+     * @returns {Boolean}
+     */
+    Dispatch.prototype.isBrushable = function () {
+      return this.allowBrushing() && this.listenerCount('brush') > 0;
+    };
+
+    /**
+     *
+     * @param svg
+     * @returns {Function}
+     */
+    Dispatch.prototype.addBrushEvent = function (svg) {
+      if (!this.isBrushable()) return;
+
+      var xScale = this.handler.xAxis.xScale;
+      var yScale = this.handler.xAxis.yScale;
+      var brush = this.createBrush(xScale, svg);
+
+      function brushEnd() {
+        if (!validBrushClick(d3.event)) return;
+
+        var bar = d3.select(this);
+        var startX = d3.mouse(svg.node());
+        var startXInv = xScale.invert(startX[0]);
+
+        // Reset the brush value
+        brush.extent([startXInv, startXInv]);
+
+        // Magic!
+        // Need to call brush on svg to see brush when brushing
+        // while on top of bars.
+        // Need to call brush on bar to allow the click event to be registered
+        svg.call(brush);
+        bar.call(brush);
+      }
+
+      return this.addEvent('mousedown', brushEnd);
+    };
+
+
+    /**
+     * Mouseover Behavior
+     *
+     * @method addMousePointer
+     * @returns {D3.Selection}
+     */
+    Dispatch.prototype.addMousePointer = function () {
+      return d3.select(this).style('cursor', 'pointer');
+    };
+
+    /**
+     * Mouseover Behavior
+     *
+     * @param element {D3.Selection}
+     * @method highlightLegend
+     */
+    Dispatch.prototype.highlightLegend = function (element) {
+      var label = this.getAttribute('data-label');
+
+      if (!label) return;
+
+      d3.select(element)
+        .select('.legend-ul')
+        .selectAll('li.color')
+        .filter(function (d, i) {
+          return String(d.label) !== label;
+        })
+        .classed('blur_shape', true);
+    };
+
+    /**
+     * Mouseout Behavior
+     *
+     * @param element {D3.Selection}
+     * @method unHighlightLegend
+     */
+    Dispatch.prototype.unHighlightLegend = function (element) {
+      d3.select(element)
+        .select('.legend-ul')
+        .selectAll('li.color')
+        .classed('blur_shape', false);
+    };
+
+    /**
+     * Adds D3 brush to SVG and returns the brush function
+     *
+     * @param xScale {Function} D3 xScale function
+     * @param svg {HTMLElement} Reference to SVG
+     * @returns {*} Returns a D3 brush function and a SVG with a brush group attached
+     */
+    Dispatch.prototype.createBrush = function (xScale, svg) {
+      var self = this;
+      var attr = self.handler._attr;
+      var height = attr.height;
+      var margin = attr.margin;
+
+      // Brush scale
+      var brush = d3.svg.brush()
+      .x(xScale)
+      .on('brushend', function brushEnd() {
+
+        // Assumes data is selected at the chart level
+        // In this case, the number of data objects should always be 1
+        var data = d3.select(this).data()[0];
+        var isTimeSeries = (data.ordered && data.ordered.date);
+
+        // Allows for brushing on d3.scale.ordinal()
+        var selected = xScale.domain().filter(function (d) {
+          return (brush.extent()[0] <= xScale(d)) && (xScale(d) <= brush.extent()[1]);
+        });
+        var range = isTimeSeries ? brush.extent() : selected;
+
+        return self.emit('brush', {
+          range: range,
+          config: attr,
+          e: d3.event,
+          data: data
+        });
+      });
+
+      // if `addBrushing` is true, add brush canvas
+      if (self.listenerCount('brush')) {
+        svg.insert('g', 'g')
+        .attr('class', 'brush')
+        .call(brush)
+        .call(function (brushG) {
+          // hijack the brush start event to filter out right/middle clicks
+          var brushHandler = brushG.on('mousedown.brush');
+          if (!brushHandler) return; // touch events in use
+          brushG.on('mousedown.brush', function () {
+            if (validBrushClick(d3.event)) brushHandler.apply(this, arguments);
+          });
+        })
+        .selectAll('rect')
+        .attr('height', height - margin.top - margin.bottom);
+
+        return brush;
+      }
+    };
+
+    function validBrushClick(event) {
+      return event.button === 0;
+    }
+
+
+    return Dispatch;
+  };
+});
diff --git a/src/ui/public/vislib/lib/handler/handler.js b/src/ui/public/vislib/lib/handler/handler.js
new file mode 100644
index 0000000000000..937a1162fb20b
--- /dev/null
+++ b/src/ui/public/vislib/lib/handler/handler.js
@@ -0,0 +1,217 @@
+define(function (require) {
+  return function HandlerBaseClass(Private) {
+    var d3 = require('d3');
+    var _ = require('lodash');
+    var errors = require('ui/errors');
+
+    var Data = Private(require('ui/vislib/lib/data'));
+    var Layout = Private(require('ui/vislib/lib/layout/layout'));
+    var Legend = Private(require('ui/vislib/lib/legend'));
+
+    /**
+     * Handles building all the components of the visualization
+     *
+     * @class Handler
+     * @constructor
+     * @param vis {Object} Reference to the Vis Class Constructor
+     * @param opts {Object} Reference to Visualization constructors needed to
+     * create the visualization
+     */
+    function Handler(vis, opts) {
+      if (!(this instanceof Handler)) {
+        return new Handler(vis, opts);
+      }
+
+      this.data = opts.data || new Data(vis.data, vis._attr);
+      this.vis = vis;
+      this.el = vis.el;
+      this.ChartClass = vis.ChartClass;
+      this.charts = [];
+
+      this._attr = _.defaults(vis._attr || {}, {
+        'margin' : { top: 10, right: 3, bottom: 5, left: 3 }
+      });
+
+      this.xAxis = opts.xAxis;
+      this.yAxis = opts.yAxis;
+      this.chartTitle = opts.chartTitle;
+      this.axisTitle = opts.axisTitle;
+      this.alerts = opts.alerts;
+
+      if (this._attr.addLegend) {
+        this.legend = opts.legend;
+      }
+
+      this.layout = new Layout(vis.el, vis.data, vis._attr.type, opts);
+
+      this.renderArray = _.filter([
+        this.layout,
+        this.legend,
+        this.axisTitle,
+        this.chartTitle,
+        this.alerts,
+        this.xAxis,
+        this.yAxis,
+      ], Boolean);
+
+      // memoize so that the same function is returned every time,
+      // allowing us to remove/re-add the same function
+      this.getProxyHandler = _.memoize(function (event) {
+        var self = this;
+        return function (e) {
+          self.vis.emit(event, e);
+        };
+      });
+    }
+
+    /**
+     * Validates whether data is actually present in the data object
+     * used to render the Vis. Throws a no results error if data is not
+     * present.
+     *
+     * @private
+     */
+    Handler.prototype._validateData = function () {
+      var dataType = this.data.type;
+
+      if (!dataType) {
+        throw new errors.NoResults();
+      }
+    };
+
+    /**
+     * Renders the constructors that create the visualization,
+     * including the chart constructor
+     *
+     * @method render
+     * @returns {HTMLElement} With the visualization child element
+     */
+    Handler.prototype.render = function () {
+      var self = this;
+      var charts = this.charts = [];
+      var selection = d3.select(this.el);
+
+      selection.selectAll('*').remove();
+
+      this._validateData();
+      this.renderArray.forEach(function (property) {
+        if (property instanceof Legend) {
+          self.vis.activeEvents().forEach(function (event) {
+            self.enable(event, property);
+          });
+        }
+
+        if (typeof property.render === 'function') {
+          property.render();
+        }
+      });
+
+      // render the chart(s)
+      selection.selectAll('.chart')
+      .each(function (chartData) {
+        var chart = new self.ChartClass(self, this, chartData);
+
+        self.vis.activeEvents().forEach(function (event) {
+          self.enable(event, chart);
+        });
+
+        charts.push(chart);
+        chart.render();
+      });
+    };
+
+
+    /**
+     * Enables events, i.e. binds specific events to the chart
+     * object(s) `on` method. For example, `click` or `mousedown` events.
+     *
+     * @method enable
+     * @param event {String} Event type
+     * @param chart {Object} Chart
+     * @returns {*}
+     */
+    Handler.prototype.enable = chartEventProxyToggle('on');
+
+    /**
+     * Disables events for all charts
+     *
+     * @method disable
+     * @param event {String} Event type
+     * @param chart {Object} Chart
+     * @returns {*}
+     */
+    Handler.prototype.disable = chartEventProxyToggle('off');
+
+
+    function chartEventProxyToggle(method) {
+      return function (event, chart) {
+        var proxyHandler = this.getProxyHandler(event);
+
+        _.each(chart ? [chart] : this.charts, function (chart) {
+          chart.events[method](event, proxyHandler);
+        });
+      };
+    }
+
+    /**
+     * Removes all DOM elements from the HTML element provided
+     *
+     * @method removeAll
+     * @param el {HTMLElement} Reference to the HTML Element that
+     * contains the chart
+     * @returns {D3.Selection|D3.Transition.Transition} With the chart
+     * child element removed
+     */
+    Handler.prototype.removeAll = function (el) {
+      return d3.select(el).selectAll('*').remove();
+    };
+
+    /**
+     * Displays an error message in the DOM
+     *
+     * @method error
+     * @param message {String} Error message to display
+     * @returns {HTMLElement} Displays the input message
+     */
+    Handler.prototype.error = function (message) {
+      this.removeAll(this.el);
+
+      var div = d3.select(this.el)
+      .append('div')
+      // class name needs `chart` in it for the polling checkSize function
+      // to continuously call render on resize
+      .attr('class', 'visualize-error chart error');
+
+      if (message === 'No results found') {
+        div.append('div')
+        .attr('class', 'text-center visualize-error visualize-chart ng-scope')
+        .append('div').attr('class', 'item top')
+        .append('div').attr('class', 'item')
+        .append('h2').html('<i class="fa fa-meh-o"></i>')
+        .append('h4').text(message);
+
+        div.append('div').attr('class', 'item bottom');
+        return div;
+      }
+
+      return div.append('h4').text(message);
+    };
+
+    /**
+     * Destroys all the charts in the visualization
+     *
+     * @method destroy
+     */
+    Handler.prototype.destroy = function () {
+      this.charts.forEach(function (chart) {
+        if (_.isFunction(chart.destroy)) {
+          chart.destroy();
+        }
+      });
+
+      this.charts.length = 0;
+    };
+
+    return Handler;
+  };
+});
diff --git a/src/ui/public/vislib/lib/handler/handler_types.js b/src/ui/public/vislib/lib/handler/handler_types.js
new file mode 100644
index 0000000000000..9d9c160285865
--- /dev/null
+++ b/src/ui/public/vislib/lib/handler/handler_types.js
@@ -0,0 +1,18 @@
+define(function (require) {
+  return function HandlerTypeFactory(Private) {
+    var pointSeries = Private(require('ui/vislib/lib/handler/types/point_series'));
+
+    /**
+     * Handles the building of each visualization
+     *
+     * @return {Function} Returns an Object of Handler types
+     */
+    return {
+      histogram: pointSeries.column,
+      line: pointSeries.line,
+      pie: Private(require('ui/vislib/lib/handler/types/pie')),
+      area: pointSeries.area,
+      tile_map: Private(require('ui/vislib/lib/handler/types/tile_map'))
+    };
+  };
+});
diff --git a/src/ui/public/vislib/lib/handler/types/pie.js b/src/ui/public/vislib/lib/handler/types/pie.js
new file mode 100644
index 0000000000000..33a29c81257c4
--- /dev/null
+++ b/src/ui/public/vislib/lib/handler/types/pie.js
@@ -0,0 +1,19 @@
+define(function (require) {
+  return function PieHandler(Private) {
+    var Handler = Private(require('ui/vislib/lib/handler/handler'));
+    var Data = Private(require('ui/vislib/lib/data'));
+    var Legend = Private(require('ui/vislib/lib/legend'));
+    var ChartTitle = Private(require('ui/vislib/lib/chart_title'));
+
+    /*
+     * Handler for Pie visualizations.
+     */
+
+    return function (vis) {
+      return new Handler(vis, {
+        legend: new Legend(vis),
+        chartTitle: new ChartTitle(vis.el)
+      });
+    };
+  };
+});
diff --git a/src/ui/public/vislib/lib/handler/types/point_series.js b/src/ui/public/vislib/lib/handler/types/point_series.js
new file mode 100644
index 0000000000000..8a46c37ca9730
--- /dev/null
+++ b/src/ui/public/vislib/lib/handler/types/point_series.js
@@ -0,0 +1,93 @@
+define(function (require) {
+  return function ColumnHandler(Private) {
+    var injectZeros = Private(require('ui/vislib/components/zero_injection/inject_zeros'));
+    var Handler = Private(require('ui/vislib/lib/handler/handler'));
+    var Data = Private(require('ui/vislib/lib/data'));
+    var Legend = Private(require('ui/vislib/lib/legend'));
+    var XAxis = Private(require('ui/vislib/lib/x_axis'));
+    var YAxis = Private(require('ui/vislib/lib/y_axis'));
+    var AxisTitle = Private(require('ui/vislib/lib/axis_title'));
+    var ChartTitle = Private(require('ui/vislib/lib/chart_title'));
+    var Alerts = Private(require('ui/vislib/lib/alerts'));
+
+    /*
+     * Create handlers for Area, Column, and Line charts which
+     * are all nearly the same minus a few details
+     */
+    function create(opts) {
+      opts = opts || {};
+
+      return function (vis) {
+        var isUserDefinedYAxis = vis._attr.setYExtents;
+        var data;
+
+        if (opts.zeroFill) {
+          data = new Data(injectZeros(vis.data), vis._attr);
+        } else {
+          data = new Data(vis.data, vis._attr);
+        }
+
+        return new Handler(vis, {
+          data: data,
+          legend: new Legend(vis, vis.data),
+          axisTitle: new AxisTitle(vis.el, data.get('xAxisLabel'), data.get('yAxisLabel')),
+          chartTitle: new ChartTitle(vis.el),
+          xAxis: new XAxis({
+            el                : vis.el,
+            xValues           : data.xValues(),
+            ordered           : data.get('ordered'),
+            xAxisFormatter    : data.get('xAxisFormatter'),
+            expandLastBucket  : opts.expandLastBucket,
+            _attr             : vis._attr
+          }),
+          alerts: new Alerts(vis, data, opts.alerts),
+          yAxis: new YAxis({
+            el   : vis.el,
+            yMin : isUserDefinedYAxis ? vis._attr.yAxis.min : data.getYMin(),
+            yMax : isUserDefinedYAxis ? vis._attr.yAxis.max : data.getYMax(),
+            yAxisFormatter: data.get('yAxisFormatter'),
+            _attr: vis._attr
+          })
+        });
+
+      };
+    }
+
+    return {
+      line: create(),
+
+      column: create({
+        zeroFill: true,
+        expandLastBucket: true
+      }),
+
+      area: create({
+        zeroFill: true,
+        alerts: [
+          {
+            type: 'warning',
+            msg: 'Positive and negative values are not accurately represented by stacked ' +
+                 'area charts. Either changing the chart mode to "overlay" or using a ' +
+                 'bar chart is recommended.',
+            test: function (vis, data) {
+              if (!data.shouldBeStacked() || data.maxNumberOfSeries() < 2) return;
+
+              var hasPos = data.getYMax(data._getY) > 0;
+              var hasNeg = data.getYMin(data._getY) < 0;
+              return (hasPos && hasNeg);
+            }
+          },
+          {
+            type: 'warning',
+            msg: 'Parts of or the entire area chart might not be displayed due to null ' +
+            'values in the data. A line chart is recommended when displaying data ' +
+            'with null values.',
+            test: function (vis, data) {
+              return data.hasNullValues();
+            }
+          }
+        ]
+      })
+    };
+  };
+});
diff --git a/src/ui/public/vislib/lib/handler/types/tile_map.js b/src/ui/public/vislib/lib/handler/types/tile_map.js
new file mode 100644
index 0000000000000..871c0974c3a7c
--- /dev/null
+++ b/src/ui/public/vislib/lib/handler/types/tile_map.js
@@ -0,0 +1,25 @@
+define(function (require) {
+  return function MapHandler(Private) {
+    var _ = require('lodash');
+
+    var Handler = Private(require('ui/vislib/lib/handler/handler'));
+    var Data = Private(require('ui/vislib/lib/data'));
+
+    return function (vis) {
+      var data = new Data(vis.data, vis._attr);
+
+      var MapHandler = new Handler(vis, {
+        data: data
+      });
+
+      MapHandler.resize = function () {
+        this.charts.forEach(function (chart) {
+          chart.resizeArea();
+        });
+      };
+
+      return MapHandler;
+    };
+  };
+});
+
diff --git a/src/ui/public/vislib/lib/layout/layout.js b/src/ui/public/vislib/lib/layout/layout.js
new file mode 100644
index 0000000000000..e6de6681e1ed3
--- /dev/null
+++ b/src/ui/public/vislib/lib/layout/layout.js
@@ -0,0 +1,154 @@
+define(function (require) {
+  return function LayoutFactory(Private) {
+    var d3 = require('d3');
+    var _ = require('lodash');
+
+    var layoutType = Private(require('ui/vislib/lib/layout/layout_types'));
+
+    /**
+     * Builds the visualization DOM layout
+     *
+     * The Layout Constructor is responsible for rendering the visualization
+     * layout, which includes all the DOM div elements.
+     * Input:
+     *   1. DOM div - parent element for which the layout is attached
+     *   2. data - data is bound to the div element
+     *   3. chartType (e.g. 'histogram') - specifies the layout type to grab
+     *
+     * @class Layout
+     * @constructor
+     * @param el {HTMLElement} HTML element to which the chart will be appended
+     * @param data {Object} Elasticsearch query results for this specific chart
+     * @param chartType {Object} Reference to chart functions, i.e. Pie
+     */
+    function Layout(el, data, chartType, opts) {
+      if (!(this instanceof Layout)) {
+        return new Layout(el, data, chartType, opts);
+      }
+
+      this.el = el;
+      this.data = data;
+      this.opts = opts;
+      this.layoutType = layoutType[chartType](this.el, this.data);
+    }
+
+    // Render the layout
+    /**
+     * Renders visualization HTML layout
+     * Remove all elements from the current visualization and creates the layout
+     *
+     * @method render
+     */
+    Layout.prototype.render = function () {
+      this.removeAll(this.el);
+      this.createLayout(this.layoutType);
+    };
+
+    /**
+     * Create the layout based on the json array provided
+     * for each object in the layout array, call the layout function
+     *
+     * @method createLayout
+     * @param arr {Array} Json array
+     * @returns {*} Creates the visualization layout
+     */
+    Layout.prototype.createLayout = function (arr) {
+      var self = this;
+
+      return _.each(arr, function (obj) {
+        self.layout(obj);
+      });
+    };
+
+    /**
+     * Appends a DOM element based on the object keys
+     * check to see if reference to DOM element is string but not class selector
+     * Create a class selector
+     *
+     * @method layout
+     * @param obj {Object} Instructions for creating the layout of a DOM Element
+     * @returns {*} DOM Element
+     */
+    Layout.prototype.layout = function (obj) {
+      if (!obj.parent) {
+        throw new Error('No parent element provided');
+      }
+
+      if (!obj.type) {
+        throw new Error('No element type provided');
+      }
+
+      if (typeof obj.type !== 'string') {
+        throw new Error(obj.type + ' must be a string');
+      }
+
+      if (typeof obj.parent === 'string' && obj.parent.charAt(0) !== '.') {
+        obj.parent = '.' + obj.parent;
+      }
+
+      var childEl = this.appendElem(obj.parent, obj.type, obj.class);
+
+      if (obj.datum) {
+        childEl.datum(obj.datum);
+      }
+
+      if (obj.splits) {
+        childEl.call(obj.splits, obj.parent, this.opts);
+      }
+
+      if (obj.children) {
+        var newParent = childEl[0][0];
+
+        _.forEach(obj.children, function (obj) {
+          if (!obj.parent) {
+            obj.parent = newParent;
+          }
+        });
+
+        this.createLayout(obj.children);
+      }
+
+      return childEl;
+    };
+
+    /**
+     * Appends a `type` of DOM element to `el` and gives it a class name attribute `className`
+     *
+     * @method appendElem
+     * @param el {HTMLElement} Reference to a DOM Element
+     * @param type {String} DOM element type
+     * @param className {String} CSS class name
+     * @returns {*} Reference to D3 Selection
+     */
+    Layout.prototype.appendElem = function (el, type, className) {
+      if (!el || !type || !className) {
+        throw new Error('Function requires that an el, type, and class be provided');
+      }
+
+      if (typeof el === 'string') {
+        // Create a DOM reference with a d3 selection
+        // Need to make sure that the `el` is bound to this object
+        // to prevent it from being appended to another Layout
+        el = d3.select(this.el)
+          .select(el)[0][0];
+      }
+
+      return d3.select(el)
+        .append(type)
+        .attr('class', className);
+    };
+
+    /**
+     * Removes all DOM elements from DOM element
+     *
+     * @method removeAll
+     * @param el {HTMLElement} Reference to DOM element
+     * @returns {D3.Selection|D3.Transition.Transition} Reference to an empty DOM element
+     */
+    Layout.prototype.removeAll = function (el) {
+      return d3.select(el).selectAll('*').remove();
+    };
+
+    return Layout;
+  };
+});
diff --git a/src/ui/public/vislib/lib/layout/layout_types.js b/src/ui/public/vislib/lib/layout/layout_types.js
new file mode 100644
index 0000000000000..a4d1f6efcab9f
--- /dev/null
+++ b/src/ui/public/vislib/lib/layout/layout_types.js
@@ -0,0 +1,20 @@
+define(function (require) {
+  return function LayoutTypeFactory(Private) {
+
+    /**
+     * Provides the HTML layouts for each visualization class
+     *
+     * @module vislib
+     * @submodule LayoutTypeFactory
+     * @param Private {Service} Loads any function as an angular module
+     * @return {Function} Returns an Object of HTML layouts for each visualization class
+     */
+    return {
+      histogram: Private(require('ui/vislib/lib/layout/types/column_layout')),
+      line: Private(require('ui/vislib/lib/layout/types/column_layout')),
+      area: Private(require('ui/vislib/lib/layout/types/column_layout')),
+      pie: Private(require('ui/vislib/lib/layout/types/pie_layout')),
+      tile_map: Private(require('ui/vislib/lib/layout/types/map_layout'))
+    };
+  };
+});
\ No newline at end of file
diff --git a/src/ui/public/vislib/lib/layout/splits/column_chart/chart_split.js b/src/ui/public/vislib/lib/layout/splits/column_chart/chart_split.js
new file mode 100644
index 0000000000000..e9f00a8d642f1
--- /dev/null
+++ b/src/ui/public/vislib/lib/layout/splits/column_chart/chart_split.js
@@ -0,0 +1,50 @@
+define(function () {
+  return function ChartSplitFactory() {
+    var d3 = require('d3');
+
+    /*
+     * Adds div DOM elements to the `.chart-wrapper` element based on the data layout.
+     * For example, if the data has rows, it returns the same number of
+     * `.chart` elements as row objects.
+     */
+    return function split(selection) {
+      selection.each(function (data) {
+        var div = d3.select(this)
+        .attr('class', function () {
+          if (data.rows) {
+            return 'chart-wrapper-row';
+          } else if (data.columns) {
+            return 'chart-wrapper-column';
+          } else {
+            return 'chart-wrapper';
+          }
+        });
+        var divClass;
+
+        var charts = div.selectAll('charts')
+        .append('div')
+        .data(function (d) {
+          if (d.rows) {
+            divClass = 'chart-row';
+            return d.rows;
+          } else if (d.columns) {
+            divClass = 'chart-column';
+            return d.columns;
+          } else {
+            divClass = 'chart';
+            return [d];
+          }
+        })
+        .enter()
+          .append('div')
+          .attr('class', function () {
+            return divClass;
+          });
+
+        if (!data.series) {
+          charts.call(split);
+        }
+      });
+    };
+  };
+});
diff --git a/src/ui/public/vislib/lib/layout/splits/column_chart/chart_title_split.js b/src/ui/public/vislib/lib/layout/splits/column_chart/chart_title_split.js
new file mode 100644
index 0000000000000..03c80a66b1148
--- /dev/null
+++ b/src/ui/public/vislib/lib/layout/splits/column_chart/chart_title_split.js
@@ -0,0 +1,39 @@
+define(function () {
+  return function ChartTitleSplitFactory() {
+    var d3 = require('d3');
+
+    /*
+     * Adds div DOM elements to either the `.y-axis-chart-title` element or the
+     * `.x-axis-chart-title` element based on the data layout.
+     * For example, if the data has rows, it returns the same number of
+     * `.chart-title` elements as row objects.
+     * if not data.rows or data.columns, return no chart titles
+     */
+    return function (selection) {
+      selection.each(function (data) {
+        var div = d3.select(this);
+
+        if (!data.series) {
+          div.selectAll('.chart-title')
+          .append('div')
+          .data(function (d) {
+            return d.rows ? d.rows : d.columns;
+          })
+          .enter()
+            .append('div')
+            .attr('class', 'chart-title');
+
+          if (data.rows) {
+            d3.select('.x-axis-chart-title').remove();
+          } else {
+            d3.select('.y-axis-chart-title').remove();
+          }
+
+          return div;
+        }
+
+        return d3.select(this).remove();
+      });
+    };
+  };
+});
diff --git a/src/kibana/components/vislib/lib/layout/splits/column_chart/x_axis_split.js b/src/ui/public/vislib/lib/layout/splits/column_chart/x_axis_split.js
similarity index 89%
rename from src/kibana/components/vislib/lib/layout/splits/column_chart/x_axis_split.js
rename to src/ui/public/vislib/lib/layout/splits/column_chart/x_axis_split.js
index ceffc68808eac..16839fdcc05f9 100644
--- a/src/kibana/components/vislib/lib/layout/splits/column_chart/x_axis_split.js
+++ b/src/ui/public/vislib/lib/layout/splits/column_chart/x_axis_split.js
@@ -1,5 +1,6 @@
 define(function () {
-  return function XAxisSplitFactory(d3) {
+  return function XAxisSplitFactory() {
+    var d3 = require('d3');
 
     /*
      * Adds div DOM elements to the `.x-axis-div-wrapper` element based on the data layout.
@@ -22,4 +23,4 @@ define(function () {
       });
     };
   };
-});
\ No newline at end of file
+});
diff --git a/src/kibana/components/vislib/lib/layout/splits/column_chart/y_axis_split.js b/src/ui/public/vislib/lib/layout/splits/column_chart/y_axis_split.js
similarity index 94%
rename from src/kibana/components/vislib/lib/layout/splits/column_chart/y_axis_split.js
rename to src/ui/public/vislib/lib/layout/splits/column_chart/y_axis_split.js
index bbcfd30eea490..d694452fbb802 100644
--- a/src/kibana/components/vislib/lib/layout/splits/column_chart/y_axis_split.js
+++ b/src/ui/public/vislib/lib/layout/splits/column_chart/y_axis_split.js
@@ -1,5 +1,7 @@
 define(function () {
-  return function YAxisSplitFactory(d3) {
+  return function YAxisSplitFactory() {
+    var d3 = require('d3');
+
     /*
      * Adds div DOM elements to the `.y-axis-div-wrapper` element based on the data layout.
      * For example, if the data has rows, it returns the same number of
@@ -43,4 +45,4 @@ define(function () {
       el.style('width', (width + padding) + 'px');
     }
   };
-});
\ No newline at end of file
+});
diff --git a/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_split.js b/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_split.js
new file mode 100644
index 0000000000000..e1299da592f8a
--- /dev/null
+++ b/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_split.js
@@ -0,0 +1,51 @@
+define(function () {
+  return function ChartSplitFactory() {
+    var d3 = require('d3');
+
+    /*
+     * Adds div DOM elements to the `.chart-wrapper` element based on the data layout.
+     * For example, if the data has rows, it returns the same number of
+     * `.chart` elements as row objects.
+     */
+
+    return function split(selection) {
+      selection.each(function (data) {
+        var div = d3.select(this)
+        .attr('class', function () {
+          if (data.rows) {
+            return 'chart-wrapper-row';
+          } else if (data.columns) {
+            return 'chart-wrapper-column';
+          } else {
+            return 'chart-wrapper';
+          }
+        });
+        var divClass;
+
+        var charts = div.selectAll('charts')
+        .append('div')
+        .data(function (d) {
+          if (d.rows) {
+            divClass = 'chart-row';
+            return d.rows;
+          } else if (d.columns) {
+            divClass = 'chart-column';
+            return d.columns;
+          } else {
+            divClass = 'chart';
+            return [d];
+          }
+        })
+        .enter()
+          .append('div')
+          .attr('class', function () {
+            return divClass;
+          });
+
+        if (!data.slices) {
+          charts.call(split);
+        }
+      });
+    };
+  };
+});
diff --git a/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_title_split.js b/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_title_split.js
new file mode 100644
index 0000000000000..9841bcfe3d294
--- /dev/null
+++ b/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_title_split.js
@@ -0,0 +1,40 @@
+define(function () {
+  return function ChartTitleSplitFactory() {
+    var d3 = require('d3');
+
+    /*
+     * Adds div DOM elements to either the `.y-axis-chart-title` element or the
+     * `.x-axis-chart-title` element based on the data layout.
+     * For example, if the data has rows, it returns the same number of
+     * `.chart-title` elements as row objects.
+     * if not data.rows or data.columns, return no chart titles
+     */
+
+    return function (selection, parent) {
+      selection.each(function (data) {
+        var div = d3.select(this);
+
+        if (!data.slices) {
+          div.selectAll('.chart-title')
+          .append('div')
+          .data(function (d) {
+            return d.rows ? d.rows : d.columns;
+          })
+          .enter()
+            .append('div')
+            .attr('class', 'chart-title');
+
+          if (data.rows) {
+            d3.select(parent).select('.x-axis-chart-title').remove();
+          } else {
+            d3.select(parent).select('.y-axis-chart-title').remove();
+          }
+
+          return div;
+        }
+
+        return d3.select(this).remove();
+      });
+    };
+  };
+});
diff --git a/src/kibana/components/vislib/lib/layout/splits/tile_map/map_split.js b/src/ui/public/vislib/lib/layout/splits/tile_map/map_split.js
similarity index 95%
rename from src/kibana/components/vislib/lib/layout/splits/tile_map/map_split.js
rename to src/ui/public/vislib/lib/layout/splits/tile_map/map_split.js
index f53a7e2bf9056..f1af47399684a 100644
--- a/src/kibana/components/vislib/lib/layout/splits/tile_map/map_split.js
+++ b/src/ui/public/vislib/lib/layout/splits/tile_map/map_split.js
@@ -1,5 +1,7 @@
 define(function () {
-  return function ChartSplitFactory(d3) {
+  return function ChartSplitFactory() {
+    var d3 = require('d3');
+
     /*
      * Adds div DOM elements to the `.chart-wrapper` element based on the data layout.
      * For example, if the data has rows, it returns the same number of
diff --git a/src/ui/public/vislib/lib/layout/types/column_layout.js b/src/ui/public/vislib/lib/layout/types/column_layout.js
new file mode 100644
index 0000000000000..0dfea45abfc28
--- /dev/null
+++ b/src/ui/public/vislib/lib/layout/types/column_layout.js
@@ -0,0 +1,113 @@
+define(function (require) {
+  return function ColumnLayoutFactory(Private) {
+    var d3 = require('d3');
+
+    var chartSplit = Private(require('ui/vislib/lib/layout/splits/column_chart/chart_split'));
+    var yAxisSplit = Private(require('ui/vislib/lib/layout/splits/column_chart/y_axis_split'));
+    var xAxisSplit = Private(require('ui/vislib/lib/layout/splits/column_chart/x_axis_split'));
+    var chartTitleSplit = Private(require('ui/vislib/lib/layout/splits/column_chart/chart_title_split'));
+
+    /**
+     * Specifies the visualization layout for column charts.
+     *
+     * This is done using an array of objects. The first object has
+     * a `parent` DOM element,  a DOM `type` (e.g. div, svg, etc),
+     * and a `class` (required). Each child can omit the parent object,
+     * but must include a type and class.
+     *
+     * Optionally, you can specify `datum` to be bound to the DOM
+     * element, a `splits` function that divides the selected element
+     * into more DOM elements based on a callback function provided, or
+     * a children array which nests other layout objects.
+     *
+     * Objects in children arrays are children of the current object and return
+     * DOM elements which are children of their respective parent element.
+     */
+
+    return function (el, data) {
+      if (!el || !data) {
+        throw new Error('Both an el and data need to be specified');
+      }
+
+      return [
+        {
+          parent: el,
+          type: 'div',
+          class: 'vis-wrapper',
+          datum: data,
+          children: [
+            {
+              type: 'div',
+              class: 'y-axis-col-wrapper',
+              children: [
+                {
+                  type: 'div',
+                  class: 'y-axis-col',
+                  children: [
+                    {
+                      type: 'div',
+                      class: 'y-axis-title'
+                    },
+                    {
+                      type: 'div',
+                      class: 'y-axis-chart-title',
+                      splits: chartTitleSplit
+                    },
+                    {
+                      type: 'div',
+                      class: 'y-axis-div-wrapper',
+                      splits: yAxisSplit
+                    }
+                  ]
+                },
+                {
+                  type: 'div',
+                  class: 'y-axis-spacer-block'
+                }
+              ]
+            },
+            {
+              type: 'div',
+              class: 'vis-col-wrapper',
+              children: [
+                {
+                  type: 'div',
+                  class: 'chart-wrapper',
+                  splits: chartSplit
+                },
+                {
+                  type: 'div',
+                  class: 'vis-alerts'
+                },
+                {
+                  type: 'div',
+                  class: 'x-axis-wrapper',
+                  children: [
+                    {
+                      type: 'div',
+                      class: 'x-axis-div-wrapper',
+                      splits: xAxisSplit
+                    },
+                    {
+                      type: 'div',
+                      class: 'x-axis-chart-title',
+                      splits: chartTitleSplit
+                    },
+                    {
+                      type: 'div',
+                      class: 'x-axis-title'
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              type: 'div',
+              class: 'legend-col-wrapper'
+            }
+          ]
+        }
+      ];
+    };
+  };
+});
diff --git a/src/kibana/components/vislib/lib/layout/types/map_layout.js b/src/ui/public/vislib/lib/layout/types/map_layout.js
similarity index 89%
rename from src/kibana/components/vislib/lib/layout/types/map_layout.js
rename to src/ui/public/vislib/lib/layout/types/map_layout.js
index a75ba9f8bf08a..cb4db6f2aede9 100644
--- a/src/kibana/components/vislib/lib/layout/types/map_layout.js
+++ b/src/ui/public/vislib/lib/layout/types/map_layout.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  return function ColumnLayoutFactory(d3, Private) {
-
-    var mapSplit = Private(require('components/vislib/lib/layout/splits/tile_map/map_split'));
+  return function ColumnLayoutFactory(Private) {
+    var d3 = require('d3');
+    var mapSplit = Private(require('ui/vislib/lib/layout/splits/tile_map/map_split'));
 
     /*
      * Specifies the visualization layout for tile maps.
diff --git a/src/kibana/components/vislib/lib/layout/types/pie_layout.js b/src/ui/public/vislib/lib/layout/types/pie_layout.js
similarity index 86%
rename from src/kibana/components/vislib/lib/layout/types/pie_layout.js
rename to src/ui/public/vislib/lib/layout/types/pie_layout.js
index 1f89be16e2deb..1753bc0f01c0b 100644
--- a/src/kibana/components/vislib/lib/layout/types/pie_layout.js
+++ b/src/ui/public/vislib/lib/layout/types/pie_layout.js
@@ -1,7 +1,8 @@
 define(function (require) {
-  return function ColumnLayoutFactory(d3, Private) {
-    var chartSplit = Private(require('components/vislib/lib/layout/splits/pie_chart/chart_split'));
-    var chartTitleSplit = Private(require('components/vislib/lib/layout/splits/pie_chart/chart_title_split'));
+  return function ColumnLayoutFactory(Private) {
+    var d3 = require('d3');
+    var chartSplit = Private(require('ui/vislib/lib/layout/splits/pie_chart/chart_split'));
+    var chartTitleSplit = Private(require('ui/vislib/lib/layout/splits/pie_chart/chart_title_split'));
 
     /**
      * Specifies the visualization layout for column charts.
diff --git a/src/ui/public/vislib/lib/legend.js b/src/ui/public/vislib/lib/legend.js
new file mode 100644
index 0000000000000..ea759f646826e
--- /dev/null
+++ b/src/ui/public/vislib/lib/legend.js
@@ -0,0 +1,228 @@
+define(function (require) {
+  return function LegendFactory(Private) {
+    var d3 = require('d3');
+    var _ = require('lodash');
+    var Dispatch = Private(require('ui/vislib/lib/dispatch'));
+    var Data = Private(require('ui/vislib/lib/data'));
+    var legendHeaderTemplate = _.template(require('ui/vislib/partials/legend_header.html'));
+    var dataLabel = require('ui/vislib/lib/_data_label');
+    var color = Private(require('ui/vislib/components/color/color'));
+
+    /**
+     * Appends legend to the visualization
+     *
+     * @class Legend
+     * @constructor
+     * @param vis {Object} Reference to Vis Constructor
+     */
+    function Legend(vis) {
+      if (!(this instanceof Legend)) {
+        return new Legend(vis);
+      }
+
+      var data = vis.data.columns || vis.data.rows || [vis.data];
+      var type = vis._attr.type;
+      var labels = this.labels = this._getLabels(data, type);
+      var labelsArray = labels.map(function (obj) { return obj.label; });
+
+      this.events = new Dispatch();
+      this.vis = vis;
+      this.el = vis.el;
+      this.color = color(labelsArray);
+      this._attr = _.defaults({}, vis._attr || {}, {
+        'legendClass' : 'legend-col-wrapper',
+        'blurredOpacity' : 0.3,
+        'focusOpacity' : 1,
+        'defaultOpacity' : 1,
+        'legendDefaultOpacity': 1,
+        'isOpen' : true
+      });
+    }
+
+    Legend.prototype._getPieLabels = function (data) {
+      return Data.prototype.pieNames(data);
+    };
+
+    Legend.prototype._getSeriesLabels = function (data) {
+      var isOneSeries = data.every(function (chart) {
+        return chart.series.length === 1;
+      });
+
+      var values = data.map(function (chart) {
+        var yLabel = isOneSeries ? chart.yAxisLabel : undefined;
+
+        return chart.series.map(function (series) {
+          if (yLabel) series.label = yLabel;
+          return series;
+        });
+      })
+      .reduce(function (a, b) {
+        return a.concat(b);
+      }, []);
+
+      return _.uniq(values, 'label');
+    };
+
+    Legend.prototype._getLabels = function (data, type) {
+      if (type === 'pie') return this._getPieLabels(data);
+      return this._getSeriesLabels(data);
+    };
+
+    /**
+     * Adds legend header
+     *
+     * @method header
+     * @param el {HTMLElement} Reference to DOM element
+     * @param args {Object|*} Legend options
+     * @returns {*} HTML element
+     */
+    Legend.prototype._header = function (el, args) {
+      return el.append('div')
+      .attr('class', 'header')
+      .append('div')
+      .attr('class', 'column-labels')
+      .html(function () {
+        return legendHeaderTemplate(args._attr);
+      });
+    };
+
+    /**
+     * Adds list to legend
+     *
+     * @method list
+     * @param el {HTMLElement} Reference to DOM element
+     * @param arrOfLabels {Array} Array of labels
+     * @param args {Object|*} Legend options
+     * @returns {D3.Selection} HTML element with list of labels attached
+     */
+    Legend.prototype._list = function (el, data, args) {
+      var self = this;
+
+      return el.append('ul')
+      .attr('class', function () {
+        if (args._attr.isOpen) { return 'legend-ul'; }
+        return 'legend-ul hidden';
+      })
+      .selectAll('li')
+      .data(data)
+      .enter()
+        .append('li')
+        .attr('class', 'color')
+        .each(function (d) {
+          var li = d3.select(this);
+          self._addIdentifier.call(this, d);
+
+          li.append('i')
+          .attr('class', 'fa fa-circle dots')
+          .attr('style', 'color:' + args.color(d.label));
+
+          li.append('span').text(d.label);
+        });
+    };
+
+    /**
+     * Append the data label to the element
+     *
+     * @method _addIdentifier
+     * @param label {string} label to use
+     */
+    Legend.prototype._addIdentifier = function (d) {
+      dataLabel(this, d.label);
+    };
+
+    /**
+     * Renders legend
+     *
+     * @method render
+     * @return {HTMLElement} Legend
+     */
+    Legend.prototype.render = function () {
+      var self = this;
+      var visEl = d3.select(this.el);
+      var legendDiv = visEl.select('.' + this._attr.legendClass);
+      var items = this.labels;
+      this._header(legendDiv, this);
+      this._list(legendDiv, items, this);
+
+      var headerIcon = visEl.select('.legend-toggle');
+
+      // toggle
+      headerIcon
+      .on('click', function legendClick() {
+        if (self._attr.isOpen) {
+          // close legend
+          visEl.select('ul.legend-ul').classed('hidden', true);
+          self._attr.isOpen = false;
+
+          // need to add reference to resize function on toggle
+          self.vis.resize();
+        } else {
+          // open legend
+          visEl.select('ul.legend-ul').classed('hidden', false);
+          self._attr.isOpen = true;
+
+          // need to add reference to resize function on toggle
+          self.vis.resize();
+        }
+      });
+
+      legendDiv.select('.legend-ul').selectAll('li')
+      .on('mouseover', function (d) {
+        var label = d.label;
+        var charts = visEl.selectAll('.chart');
+
+        function filterLabel() {
+          var pointLabel = this.getAttribute('data-label');
+          return pointLabel !== label.toString();
+        }
+
+        if (label && label !== '_all') {
+          d3.select(this).style('cursor', 'pointer');
+        }
+
+        // legend
+        legendDiv.selectAll('li')
+        .filter(filterLabel)
+        .classed('blur_shape', true);
+
+        // all data-label attribute
+        charts.selectAll('[data-label]')
+        .filter(filterLabel)
+        .classed('blur_shape', true);
+
+        var eventEl =  d3.select(this);
+        eventEl.style('white-space', 'inherit');
+        eventEl.style('word-break', 'break-all');
+      })
+      .on('mouseout', function () {
+        /*
+         * The default opacity of elements in charts may be modified by the
+         * chart constructor, and so may differ from that of the legend
+         */
+
+        var charts = visEl.selectAll('.chart');
+
+        // legend
+        legendDiv.selectAll('li')
+        .classed('blur_shape', false);
+
+        // all data-label attribute
+        charts.selectAll('[data-label]')
+        .classed('blur_shape', false);
+
+        var eventEl =  d3.select(this);
+        eventEl.style('white-space', 'nowrap');
+        eventEl.style('word-break', 'inherit');
+      });
+
+      legendDiv.selectAll('li.color').each(function (d) {
+        var label = d.label;
+        if (label !== undefined && label !== '_all') {
+          d3.select(this).call(self.events.addClickEvent());
+        }
+      });
+    };
+
+    return Legend;
+  };
+});
diff --git a/src/ui/public/vislib/lib/resize_checker.js b/src/ui/public/vislib/lib/resize_checker.js
new file mode 100644
index 0000000000000..447e9556155e4
--- /dev/null
+++ b/src/ui/public/vislib/lib/resize_checker.js
@@ -0,0 +1,201 @@
+define(function (require) {
+  return function ResizeCheckerFactory(Private, Notifier, $rootScope) {
+    var $ = require('jquery');
+    var _ = require('lodash');
+
+    var EventEmitter = Private(require('ui/events'));
+    var reflowWatcher = Private(require('ui/reflow_watcher'));
+    var sequencer = require('ui/utils/sequencer');
+
+    var SCHEDULE = ResizeChecker.SCHEDULE = sequencer.createEaseIn(
+      100,      // shortest delay
+      10000,  // longest delay
+      50     // tick count
+    );
+
+    // maximum ms that we can delay emitting 'resize'. This is only used
+    // to debounce resizes when the size of the element is constantly changing
+    var MS_MAX_RESIZE_DELAY = ResizeChecker.MS_MAX_RESIZE_DELAY = 500;
+
+    /**
+     * Checks the size of an element on a regular basis. Provides
+     * an event that is emited when the element has changed size.
+     *
+     * @class ResizeChecker
+     * @param {HtmlElement} el - the element to track the size of
+     */
+    _.class(ResizeChecker).inherits(EventEmitter);
+    function ResizeChecker(el) {
+      ResizeChecker.Super.call(this);
+
+      this.$el = $(el);
+      this.notify = new Notifier({ location: 'Vislib ResizeChecker ' + _.uniqueId() });
+
+      this.saveSize();
+
+      this.check = _.bind(this.check, this);
+      this.check();
+
+      this.onReflow = _.bind(this.onReflow, this);
+      reflowWatcher.on('reflow', this.onReflow);
+    }
+
+    ResizeChecker.prototype.onReflow = function () {
+      this.startSchedule(SCHEDULE);
+    };
+
+    /**
+     * Read the size of the element
+     *
+     * @method read
+     * @return {object} - an object with keys `w` (width) and `h` (height)
+     */
+    ResizeChecker.prototype.read = function () {
+      return {
+        w: this.$el[0].clientWidth,
+        h: this.$el[0].clientHeight
+      };
+    };
+
+
+    /**
+     * Save the element size, preventing it from being considered as an
+     * update.
+     *
+     * @method save
+     * @param  {object} [size] - optional size to save, otherwise #read() is called
+     * @return {boolean} - true if their was a change in the new
+     */
+    ResizeChecker.prototype.saveSize = function (size) {
+      if (!size) size = this.read();
+
+      if (this._equalsSavedSize(size)) {
+        return false;
+      }
+
+      this._savedSize = size;
+      return true;
+    };
+
+
+    /**
+     * Determine if a given size matches the currently saved size.
+     *
+     * @private
+     * @method _equalsSavedSize
+     * @param  {object} a - an object that matches the return value of #read()
+     * @return {boolean} - true if the passed in value matches the saved size
+     */
+    ResizeChecker.prototype._equalsSavedSize = function (a) {
+      var b = this._savedSize || {};
+      return a.w === b.w && a.h === b.h;
+    };
+
+    /**
+     * Read the time that the dirty state last changed.
+     *
+     * @method lastDirtyChange
+     * @return {timestamp} - the unix timestamp (in ms) of the last update
+     *                       to the dirty state
+     */
+    ResizeChecker.prototype.lastDirtyChange = function () {
+      return this._dirtyChangeStamp;
+    };
+
+    /**
+     * Record the dirty state
+     *
+     * @method saveDirty
+     * @param  {boolean} val
+     * @return {boolean} - true if the dirty state changed by this save
+     */
+    ResizeChecker.prototype.saveDirty = function (val) {
+      val = !!val;
+
+      if (val === this._isDirty) return false;
+
+      this._isDirty = val;
+      this._dirtyChangeStamp = Date.now();
+      return true;
+    };
+
+    /**
+     * The check routine that executes regularly and will reschedule itself
+     * to run again in the future. It determines the state of the elements
+     * size and decides when to emit the "update" event.
+     *
+     * @method check
+     * @return {void}
+     */
+    ResizeChecker.prototype.check = function () {
+      var newSize = this.read();
+      var dirty = this.saveSize(newSize);
+      var dirtyChanged = this.saveDirty(dirty);
+
+      var doneDirty = !dirty && dirtyChanged;
+      var muchDirty = dirty && (this.lastDirtyChange() - Date.now() > MS_MAX_RESIZE_DELAY);
+      if (doneDirty || muchDirty) {
+        this.emit('resize', newSize);
+      }
+
+      // if the dirty state is unchanged, continue using the previous schedule
+      if (!dirtyChanged) {
+        return this.continueSchedule();
+      }
+
+      return this.startSchedule(SCHEDULE);
+    };
+
+    /**
+     * Start running a new schedule, using one of the SCHEDULE_* constants.
+     *
+     * @method startSchedule
+     * @param  {integer[]} schedule - an array of millisecond times that should
+     *                              be used to schedule calls to #check();
+     * @return {integer} - the id of the next timer
+     */
+    ResizeChecker.prototype.startSchedule = function (schedule) {
+      this._tick = -1;
+      this._currentSchedule = schedule;
+      return this.continueSchedule();
+    };
+
+    /**
+     * Continue running the current schedule. MUST BE CALLED AFTER #startSchedule()
+     *
+     * @method continueSchedule
+     * @return {integer} - the id of the next timer
+     */
+    ResizeChecker.prototype.continueSchedule = function () {
+      clearTimeout(this._timerId);
+
+      if (this._tick < this._currentSchedule.length - 1) {
+        // at the end of the schedule, don't progress any further but repeat the last value
+        this._tick += 1;
+      }
+
+      var check = this.check; // already bound
+      var tick = this._tick;
+      var notify = this.notify;
+      var ms = this._currentSchedule[this._tick];
+      return (this._timerId = setTimeout(function () {
+        check();
+      }, ms));
+    };
+
+    /**
+     * Signal that the ResizeChecker should shutdown.
+     *
+     * Cleans up it's listeners and timers.
+     *
+     * @method destroy
+     * @return {void}
+     */
+    ResizeChecker.prototype.destroy = function () {
+      reflowWatcher.off('reflow', this.onReflow);
+      clearTimeout(this._timerId);
+    };
+
+    return ResizeChecker;
+  };
+});
diff --git a/src/ui/public/vislib/lib/x_axis.js b/src/ui/public/vislib/lib/x_axis.js
new file mode 100644
index 0000000000000..2c12b0e6f2f12
--- /dev/null
+++ b/src/ui/public/vislib/lib/x_axis.js
@@ -0,0 +1,525 @@
+define(function (require) {
+  return function XAxisFactory(Private) {
+    var d3 = require('d3');
+    var $ = require('jquery');
+    var _ = require('lodash');
+    var moment = require('moment');
+
+    var ErrorHandler = Private(require('ui/vislib/lib/_error_handler'));
+
+    /**
+     * Adds an x axis to the visualization
+     *
+     * @class XAxis
+     * @constructor
+     * @param args {{el: (HTMLElement), xValues: (Array), ordered: (Object|*),
+     * xAxisFormatter: (Function), _attr: (Object|*)}}
+     */
+    _.class(XAxis).inherits(ErrorHandler);
+    function XAxis(args) {
+      if (!(this instanceof XAxis)) {
+        return new XAxis(args);
+      }
+
+      this.el = args.el;
+      this.xValues = args.xValues;
+      this.ordered = args.ordered;
+      this.xAxisFormatter = args.xAxisFormatter;
+      this.expandLastBucket = args.expandLastBucket == null ? true : args.expandLastBucket;
+      this._attr = _.defaults(args._attr || {});
+    }
+
+    /**
+     * Renders the x axis
+     *
+     * @method render
+     * @returns {D3.UpdateSelection} Appends x axis to visualization
+     */
+    XAxis.prototype.render = function () {
+      d3.select(this.el).selectAll('.x-axis-div').call(this.draw());
+    };
+
+    /**
+     * Returns d3 x axis scale function.
+     * If time, return time scale, else return d3 ordinal scale for nominal data
+     *
+     * @method getScale
+     * @returns {*} D3 scale function
+     */
+    XAxis.prototype.getScale = function () {
+      var ordered = this.ordered;
+
+      if (ordered && ordered.date) {
+        return d3.time.scale.utc();
+      }
+      return d3.scale.ordinal();
+    };
+
+    /**
+     * Add domain to the x axis scale.
+     * if time, return a time domain, and calculate the min date, max date, and time interval
+     * else, return a nominal (d3.scale.ordinal) domain, i.e. array of x axis values
+     *
+     * @method getDomain
+     * @param scale {Function} D3 scale
+     * @returns {*} D3 scale function
+     */
+    XAxis.prototype.getDomain = function (scale) {
+      var ordered = this.ordered;
+
+      if (ordered && ordered.date) {
+        return this.getTimeDomain(scale, this.xValues);
+      }
+      return this.getOrdinalDomain(scale, this.xValues);
+    };
+
+    /**
+     * Returns D3 time domain
+     *
+     * @method getTimeDomain
+     * @param scale {Function} D3 scale function
+     * @param data {Array}
+     * @returns {*} D3 scale function
+     */
+    XAxis.prototype.getTimeDomain = function (scale, data) {
+      return scale.domain([this.minExtent(data), this.maxExtent(data)]);
+    };
+
+    XAxis.prototype.minExtent = function (data) {
+      return this._calculateExtent(data || this.xValues, 'min');
+    };
+
+    XAxis.prototype.maxExtent = function (data) {
+      return this._calculateExtent(data || this.xValues, 'max');
+    };
+
+    /**
+     *
+     * @param data
+     * @param extent
+     */
+    XAxis.prototype._calculateExtent = function (data, extent) {
+      var ordered = this.ordered;
+      var opts = [ordered[extent]];
+
+      var point = d3[extent](data);
+      if (this.expandLastBucket && extent === 'max') {
+        point = this.addInterval(point);
+      }
+      opts.push(point);
+
+      return d3[extent](opts.reduce(function (opts, v) {
+        if (!_.isNumber(v)) v = +v;
+        if (!isNaN(v)) opts.push(v);
+        return opts;
+      }, []));
+    };
+
+    /**
+     * Add the interval to a point on the x axis,
+     * this properly adds dates if needed.
+     *
+     * @param {number} x - a value on the x-axis
+     * @returns {number} - x + the ordered interval
+     */
+    XAxis.prototype.addInterval = function (x) {
+      return this.modByInterval(x, +1);
+    };
+
+    /**
+     * Subtract the interval to a point on the x axis,
+     * this properly subtracts dates if needed.
+     *
+     * @param {number} x - a value on the x-axis
+     * @returns {number} - x - the ordered interval
+     */
+    XAxis.prototype.subtractInterval = function (x) {
+      return this.modByInterval(x, -1);
+    };
+
+    /**
+     * Modify the x value by n intervals, properly
+     * handling dates if needed.
+     *
+     * @param {number} x - a value on the x-axis
+     * @param {number} n - the number of intervals
+     * @returns {number} - x + n intervals
+     */
+    XAxis.prototype.modByInterval = function (x, n) {
+      var ordered = this.ordered;
+      if (!ordered) return x;
+      var interval = ordered.interval;
+      if (!interval) return x;
+
+      if (!ordered.date) {
+        return x += (ordered.interval * n);
+      }
+
+      var y = moment(x);
+      var method = n > 0 ? 'add' : 'subtract';
+
+      _.times(Math.abs(n), function () {
+        y[method](interval);
+      });
+
+      return y.valueOf();
+    };
+
+    /**
+     * Return a nominal(d3 ordinal) domain
+     *
+     * @method getOrdinalDomain
+     * @param scale {Function} D3 scale function
+     * @param xValues {Array} Array of x axis values
+     * @returns {*} D3 scale function
+     */
+    XAxis.prototype.getOrdinalDomain = function (scale, xValues) {
+      return scale.domain(xValues);
+    };
+
+    /**
+     * Return the range for the x axis scale
+     * if time, return a normal range, else if nominal, return rangeBands with a default (0.1) spacer specified
+     *
+     * @method getRange
+     * @param scale {Function} D3 scale function
+     * @param width {Number} HTML Element width
+     * @returns {*} D3 scale function
+     */
+    XAxis.prototype.getRange = function (domain, width) {
+      var ordered = this.ordered;
+
+      if (ordered && ordered.date) {
+        return domain.range([0, width]);
+      }
+      return domain.rangeBands([0, width], 0.1);
+    };
+
+    /**
+     * Return the x axis scale
+     *
+     * @method getXScale
+     * @param width {Number} HTML Element width
+     * @returns {*} D3 x scale function
+     */
+    XAxis.prototype.getXScale = function (width) {
+      var domain = this.getDomain(this.getScale());
+
+      return this.getRange(domain, width);
+    };
+
+    /**
+     * Creates d3 xAxis function
+     *
+     * @method getXAxis
+     * @param width {Number} HTML Element width
+     */
+    XAxis.prototype.getXAxis = function (width) {
+      this.xScale = this.getXScale(width);
+
+      if (!this.xScale || _.isNaN(this.xScale)) {
+        throw new Error('xScale is ' + this.xScale);
+      }
+
+      this.xAxis = d3.svg.axis()
+      .scale(this.xScale)
+      .ticks(10)
+      .tickFormat(this.xAxisFormatter)
+      .orient('bottom');
+    };
+
+    /**
+     * Renders the x axis
+     *
+     * @method draw
+     * @returns {Function} Renders the x axis to a D3 selection
+     */
+    XAxis.prototype.draw = function () {
+      var self = this;
+      var div;
+      var width;
+      var height;
+      var svg;
+      var parentWidth;
+      var n;
+      this._attr.isRotated = false;
+
+      return function (selection) {
+        n = selection[0].length;
+        parentWidth = $(self.el)
+        .find('.x-axis-div-wrapper')
+        .width();
+
+        selection.each(function () {
+
+          div = d3.select(this);
+          width = parentWidth / n;
+          height = $(this.parentElement).height();
+
+          self.validateWidthandHeight(width, height);
+
+          self.getXAxis(width);
+
+          svg = div.append('svg')
+          .attr('width', width)
+          .attr('height', height);
+
+          svg.append('g')
+          .attr('class', 'x axis')
+          .attr('transform', 'translate(0,0)')
+          .call(self.xAxis);
+        });
+
+        selection.call(self.filterOrRotate());
+      };
+    };
+
+    /**
+     * Returns a function that evaluates scale type and
+     * applies filter to tick labels on time scales
+     * rotates and truncates tick labels on nominal/ordinal scales
+     *
+     * @method filterOrRotate
+     * @returns {Function} Filters or rotates x axis tick labels
+     */
+    XAxis.prototype.filterOrRotate = function () {
+      var self = this;
+      var ordered = self.ordered;
+      var axis;
+      var labels;
+
+      return function (selection) {
+        selection.each(function () {
+          axis = d3.select(this);
+          labels = axis.selectAll('.tick text');
+          if (ordered && ordered.date) {
+            axis.call(self.filterAxisLabels());
+          } else {
+            axis.call(self.rotateAxisLabels());
+          }
+        });
+
+        self.updateXaxisHeight();
+
+        selection.call(self.fitTitles());
+
+      };
+    };
+
+    /**
+     * Rotate the axis tick labels within selection
+     *
+     * @returns {Function} Rotates x axis tick labels of a D3 selection
+     */
+    XAxis.prototype.rotateAxisLabels = function () {
+      var self = this;
+      var text;
+      var barWidth = self.xScale.rangeBand();
+      var maxRotatedLength = 180;
+      var xAxisPadding = 15;
+      var svg;
+      var lengths = [];
+      var length;
+      self._attr.isRotated = false;
+
+      return function (selection) {
+        text = selection.selectAll('.tick text');
+
+        text.each(function textWidths() {
+          lengths.push(d3.select(this).node().getBBox().width);
+        });
+        length = _.max(lengths);
+        self._attr.xAxisLabelHt = length + xAxisPadding;
+
+        // if longer than bar width, rotate
+        if (length > barWidth) {
+          self._attr.isRotated = true;
+        }
+
+        // if longer than maxRotatedLength, truncate
+        if (length > maxRotatedLength) {
+          self._attr.xAxisLabelHt = maxRotatedLength;
+        }
+
+        if (self._attr.isRotated) {
+          text
+          .text(function truncate() {
+            return self.truncateLabel(this, self._attr.xAxisLabelHt);
+          })
+          .style('text-anchor', 'end')
+          .attr('dx', '-.8em')
+          .attr('dy', '-.60em')
+          .attr('transform', function rotate() {
+            return 'rotate(-90)';
+          });
+          selection.select('svg')
+          .attr('height', self._attr.xAxisLabelHt);
+        }
+      };
+    };
+
+    /**
+     * Returns a string that is truncated to fit size
+     *
+     * @method truncateLabel
+     * @param text {HTMLElement}
+     * @param size {Number}
+     * @returns {*|jQuery}
+     */
+    XAxis.prototype.truncateLabel = function (text, size) {
+      var node = d3.select(text).node();
+      var str = $(node).text();
+      var width = node.getBBox().width;
+      var chars = str.length;
+      var pxPerChar = width / chars;
+      var endChar = 0;
+      var ellipsesPad = 4;
+
+      if (width > size) {
+        endChar = Math.floor((size / pxPerChar) - ellipsesPad);
+        while (str[endChar - 1] === ' ' || str[endChar - 1] === '-' || str[endChar - 1] === ',') {
+          endChar = endChar - 1;
+        }
+        str = str.substr(0, endChar) + '...';
+      }
+      return str;
+    };
+
+    /**
+     * Filter out text labels by width and position on axis
+     * trims labels that would overlap each other
+     * or extend past left or right edges
+     * if prev label pos (or 0) + half of label width is < label pos
+     * and label pos + half width  is not > width of axis
+     *
+     * @method filterAxisLabels
+     * @returns {Function}
+     */
+    XAxis.prototype.filterAxisLabels = function () {
+      var self = this;
+      var startX = 0;
+      var maxW;
+      var par;
+      var myX;
+      var myWidth;
+      var halfWidth;
+      var padding = 1.1;
+
+      return function (selection) {
+        selection.selectAll('.tick text')
+        .text(function (d) {
+          par = d3.select(this.parentNode).node();
+          myX = self.xScale(d);
+          myWidth = par.getBBox().width * padding;
+          halfWidth = myWidth / 2;
+          maxW = $(self.el).find('.x-axis-div').width();
+
+          if ((startX + halfWidth) < myX && maxW > (myX + halfWidth)) {
+            startX = myX + halfWidth;
+            return self.xAxisFormatter(d);
+          } else {
+            d3.select(this.parentNode).remove();
+          }
+        });
+      };
+    };
+
+    /**
+     * Returns a function that adjusts axis titles and
+     * chart title transforms to fit axis label divs.
+     * Sets transform of x-axis-title to fit .x-axis-title div width
+     * if x-axis-chart-titles, set transform of x-axis-chart-titles
+     * to fit .chart-title div width
+     *
+     * @method fitTitles
+     * @returns {Function}
+     */
+    XAxis.prototype.fitTitles = function () {
+      var visEls = $('.vis-wrapper');
+      var xAxisChartTitle;
+      var yAxisChartTitle;
+      var text;
+      var titles;
+
+      return function () {
+
+        visEls.each(function () {
+          var visEl = d3.select(this);
+          var $visEl = $(this);
+          var xAxisTitle = $visEl.find('.x-axis-title');
+          var yAxisTitle = $visEl.find('.y-axis-title');
+          var titleWidth = xAxisTitle.width();
+          var titleHeight = yAxisTitle.height();
+
+          text = visEl.select('.x-axis-title')
+          .select('svg')
+          .attr('width', titleWidth)
+          .select('text')
+          .attr('transform', 'translate(' + (titleWidth / 2) + ',11)');
+
+          text = visEl.select('.y-axis-title')
+          .select('svg')
+          .attr('height', titleHeight)
+          .select('text')
+          .attr('transform', 'translate(11,' + (titleHeight / 2) + ')rotate(-90)');
+
+          if ($visEl.find('.x-axis-chart-title').length) {
+            xAxisChartTitle = $visEl.find('.x-axis-chart-title');
+            titleWidth = xAxisChartTitle.find('.chart-title').width();
+
+            titles = visEl.select('.x-axis-chart-title').selectAll('.chart-title');
+            titles.each(function () {
+              text = d3.select(this)
+              .select('svg')
+              .attr('width', titleWidth)
+              .select('text')
+              .attr('transform', 'translate(' + (titleWidth / 2) + ',11)');
+            });
+          }
+
+          if ($visEl.find('.y-axis-chart-title').length) {
+            yAxisChartTitle = $visEl.find('.y-axis-chart-title');
+            titleHeight = yAxisChartTitle.find('.chart-title').height();
+
+            titles = visEl.select('.y-axis-chart-title').selectAll('.chart-title');
+            titles.each(function () {
+              text = d3.select(this)
+              .select('svg')
+              .attr('height', titleHeight)
+              .select('text')
+              .attr('transform', 'translate(11,' + (titleHeight / 2) + ')rotate(-90)');
+            });
+          }
+
+        });
+
+      };
+    };
+
+    /**
+     * Appends div to make .y-axis-spacer-block
+     * match height of .x-axis-wrapper
+     *
+     * @method updateXaxisHeight
+     */
+    XAxis.prototype.updateXaxisHeight = function () {
+      var selection = d3.select(this.el).selectAll('.vis-wrapper');
+
+      selection.each(function () {
+        var visEl = d3.select(this);
+
+        if (visEl.select('.inner-spacer-block').node() === null) {
+          visEl.select('.y-axis-spacer-block')
+          .append('div')
+          .attr('class', 'inner-spacer-block');
+        }
+        var xAxisHt = visEl.select('.x-axis-wrapper').style('height');
+
+        visEl.select('.inner-spacer-block').style('height', xAxisHt);
+      });
+
+    };
+
+    return XAxis;
+  };
+});
diff --git a/src/ui/public/vislib/lib/y_axis.js b/src/ui/public/vislib/lib/y_axis.js
new file mode 100644
index 0000000000000..ecbcc90fc6685
--- /dev/null
+++ b/src/ui/public/vislib/lib/y_axis.js
@@ -0,0 +1,236 @@
+define(function (require) {
+  return function YAxisFactory(Private) {
+    var d3 = require('d3');
+    var _ = require('lodash');
+    var $ = require('jquery');
+    var errors = require('ui/errors');
+
+    var ErrorHandler = Private(require('ui/vislib/lib/_error_handler'));
+
+    /**
+     * Appends y axis to the visualization
+     *
+     * @class YAxis
+     * @constructor
+     * @param args {{el: (HTMLElement), yMax: (Number), _attr: (Object|*)}}
+     */
+    _.class(YAxis).inherits(ErrorHandler);
+    function YAxis(args) {
+      this.el = args.el;
+      this.scale = null;
+      this.domain = [args.yMin, args.yMax];
+      this.yAxisFormatter = args.yAxisFormatter;
+      this._attr = args._attr || {};
+    }
+
+    /**
+     * Renders the y axis
+     *
+     * @method render
+     * @return {D3.UpdateSelection} Renders y axis to visualization
+     */
+    YAxis.prototype.render = function () {
+      d3.select(this.el).selectAll('.y-axis-div').call(this.draw());
+    };
+
+    YAxis.prototype._isPercentage = function () {
+      return (this._attr.mode === 'percentage');
+    };
+
+    YAxis.prototype._isUserDefined = function () {
+      return (this._attr.setYExtents);
+    };
+
+    YAxis.prototype._isYExtents = function () {
+      return (this._attr.defaultYExtents);
+    };
+
+    YAxis.prototype._validateUserExtents = function (domain) {
+      var self = this;
+
+      return domain.map(function (val) {
+        val = parseInt(val, 10);
+
+        if (isNaN(val)) throw new Error(val + ' is not a valid number');
+        if (self._isPercentage() && self._attr.setYExtents) return val / 100;
+        return val;
+      });
+    };
+
+    YAxis.prototype._getExtents = function (domain) {
+      var min = domain[0];
+      var max = domain[1];
+
+      if (this._isUserDefined()) return this._validateUserExtents(domain);
+      if (this._isYExtents()) return domain;
+      if (this._attr.scale === 'log') return this._logDomain(min, max); // Negative values cannot be displayed with a log scale.
+      if (!this._isYExtents() && !this._isUserDefined()) return [Math.min(0, min), Math.max(0, max)];
+      return domain;
+    };
+
+    YAxis.prototype._throwCustomError = function (message) {
+      throw new Error(message);
+    };
+
+    YAxis.prototype._throwLogScaleValuesError = function () {
+      throw new errors.InvalidLogScaleValues();
+    };
+
+    /**
+     * Returns the appropriate D3 scale
+     *
+     * @param fnName {String} D3 scale
+     * @returns {*}
+     */
+    YAxis.prototype._getScaleType = function (fnName) {
+      if (fnName === 'square root') fnName = 'sqrt'; // Rename 'square root' to 'sqrt'
+      fnName = fnName || 'linear';
+
+      if (typeof d3.scale[fnName] !== 'function') return this._throwCustomError('YAxis.getScaleType: ' + fnName + ' is not a function');
+
+      return d3.scale[fnName]();
+    };
+
+    /**
+     * Return the domain for log scale, i.e. the extent of the log scale.
+     * Log scales must begin at 1 since the log(0) = -Infinity
+     *
+     * @param scale
+     * @param yMin
+     * @param yMax
+     * @returns {*[]}
+     */
+    YAxis.prototype._logDomain = function (min, max) {
+      if (min < 0 || max < 0) return this._throwLogScaleValuesError();
+      return [1, max];
+    };
+
+    /**
+     * Creates the d3 y scale function
+     *
+     * @method getYScale
+     * @param height {Number} DOM Element height
+     * @returns {D3.Scale.QuantitiveScale|*} D3 yScale function
+     */
+    YAxis.prototype.getYScale = function (height) {
+      var scale = this._getScaleType(this._attr.scale);
+      var domain = this._getExtents(this.domain);
+
+      this.yScale = scale
+      .domain(domain)
+      .range([height, 0]);
+
+      if (!this._isUserDefined()) this.yScale.nice(); // round extents when not user defined
+      // Prevents bars from going off the chart when the y extents are within the domain range
+      if (this._attr.type === 'histogram') this.yScale.clamp(true);
+      return this.yScale;
+    };
+
+    YAxis.prototype.getScaleType = function () {
+      return this._attr.scale;
+    };
+
+    YAxis.prototype.tickFormat = function () {
+      var isPercentage = this._attr.mode === 'percentage';
+      if (isPercentage) return d3.format('%');
+      if (this.yAxisFormatter) return this.yAxisFormatter;
+      return d3.format('n');
+    };
+
+    YAxis.prototype._validateYScale = function (yScale) {
+      if (!yScale || _.isNaN(yScale)) throw new Error('yScale is ' + yScale);
+    };
+
+    /**
+     * Creates the d3 y axis function
+     *
+     * @method getYAxis
+     * @param height {Number} DOM Element height
+     * @returns {D3.Svg.Axis|*} D3 yAxis function
+     */
+    YAxis.prototype.getYAxis = function (height) {
+      var yScale = this.getYScale(height);
+      this._validateYScale(yScale);
+
+      // Create the d3 yAxis function
+      this.yAxis = d3.svg.axis()
+        .scale(yScale)
+        .tickFormat(this.tickFormat(this.domain))
+        .ticks(this.tickScale(height))
+        .orient('left');
+
+      return this.yAxis;
+    };
+
+    /**
+     * Create a tick scale for the y axis that modifies the number of ticks
+     * based on the height of the wrapping DOM element
+     * Avoid using even numbers in the yTickScale.range
+     * Causes the top most tickValue in the chart to be missing
+     *
+     * @method tickScale
+     * @param height {Number} DOM element height
+     * @returns {number} Number of y axis ticks
+     */
+    YAxis.prototype.tickScale = function (height) {
+      var yTickScale = d3.scale.linear()
+      .clamp(true)
+      .domain([20, 40, 1000])
+      .range([0, 3, 11]);
+
+      return Math.ceil(yTickScale(height));
+    };
+
+    /**
+     * Renders the y axis to the visualization
+     *
+     * @method draw
+     * @returns {Function} Renders y axis to visualization
+     */
+    YAxis.prototype.draw = function () {
+      var self = this;
+      var margin = this._attr.margin;
+      var mode = this._attr.mode;
+      var isWiggleOrSilhouette = (mode === 'wiggle' || mode === 'silhouette');
+
+      return function (selection) {
+        selection.each(function () {
+          var el = this;
+
+          var div = d3.select(el);
+          var width = $(el).parent().width();
+          var height = $(el).height();
+          var adjustedHeight = height - margin.top - margin.bottom;
+
+          // Validate whether width and height are not 0 or `NaN`
+          self.validateWidthandHeight(width, adjustedHeight);
+
+          var yAxis = self.getYAxis(adjustedHeight);
+
+          // The yAxis should not appear if mode is set to 'wiggle' or 'silhouette'
+          if (!isWiggleOrSilhouette) {
+            // Append svg and y axis
+            var svg = div.append('svg')
+            .attr('width', width)
+            .attr('height', height);
+
+            svg.append('g')
+            .attr('class', 'y axis')
+            .attr('transform', 'translate(' + (width - 2) + ',' + margin.top + ')')
+            .call(yAxis);
+
+            var container = svg.select('g.y.axis').node();
+            if (container) {
+              var cWidth = Math.max(width, container.getBBox().width);
+              svg.attr('width', cWidth);
+              svg.select('g')
+              .attr('transform', 'translate(' + (cWidth - 2) + ',' + margin.top + ')');
+            }
+          }
+        });
+      };
+    };
+
+    return YAxis;
+  };
+});
diff --git a/src/kibana/components/vislib/partials/legend_header.html b/src/ui/public/vislib/partials/legend_header.html
similarity index 100%
rename from src/kibana/components/vislib/partials/legend_header.html
rename to src/ui/public/vislib/partials/legend_header.html
diff --git a/src/kibana/components/vislib/partials/touchdown.tmpl.html b/src/ui/public/vislib/partials/touchdown.tmpl.html
similarity index 100%
rename from src/kibana/components/vislib/partials/touchdown.tmpl.html
rename to src/ui/public/vislib/partials/touchdown.tmpl.html
diff --git a/src/kibana/components/vislib/styles/_alerts.less b/src/ui/public/vislib/styles/_alerts.less
similarity index 91%
rename from src/kibana/components/vislib/styles/_alerts.less
rename to src/ui/public/vislib/styles/_alerts.less
index be177499b406e..c11a263cc9f12 100644
--- a/src/kibana/components/vislib/styles/_alerts.less
+++ b/src/ui/public/vislib/styles/_alerts.less
@@ -21,7 +21,7 @@
     color: white;
     border-radius: @alert-border-radius;
     border: 1px solid white;
-    .display(flex);
+    display: flex;
 
     &-success {
       .alert-variant(fade(@alert-success-bg, 75%); @alert-success-border; @alert-success-text);
@@ -40,13 +40,13 @@
   &-icon {
     margin: 0;
     padding: 0 10px;
-    .flex(0, 0, auto);
-    .align-self(center);
+    flex: 0 0 auto;
+    align-self: center;
   }
 
   &-text {
-    .flex(1, 1, auto);
+    flex: 1 1 auto;
     margin: 0;
     padding: 0;
   }
-}
\ No newline at end of file
+}
diff --git a/src/kibana/components/vislib/styles/_error.less b/src/ui/public/vislib/styles/_error.less
similarity index 84%
rename from src/kibana/components/vislib/styles/_error.less
rename to src/ui/public/vislib/styles/_error.less
index abc7227d1acd0..cac25a20142eb 100644
--- a/src/kibana/components/vislib/styles/_error.less
+++ b/src/ui/public/vislib/styles/_error.less
@@ -1,5 +1,5 @@
 .error {
-  .flex(1 1 100%);
+  flex: 1 1 100%;
   text-align: center;
 
   p {
diff --git a/src/ui/public/vislib/styles/_layout.less b/src/ui/public/vislib/styles/_layout.less
new file mode 100644
index 0000000000000..383f7d4705ea8
--- /dev/null
+++ b/src/ui/public/vislib/styles/_layout.less
@@ -0,0 +1,173 @@
+.visualize-chart {
+  display: flex;
+  flex: 1 1 100%;
+  min-height: 0;
+  min-width: 0;
+}
+
+.vis-wrapper {
+  display: flex;
+  flex: 1 1 100%;
+  flex-direction: row;
+  // margin: 10px 0 0 6px;
+  min-height: 0;
+  min-width: 0;
+  overflow: hidden;
+}
+
+/* YAxis logic */
+.y-axis-col-wrapper {
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+  min-width: 0;
+}
+
+.y-axis-col {
+  display: flex;
+  flex-direction: row;
+  flex: 1 0 36px;
+  min-height: 0;
+  min-width: 0;
+}
+
+.y-axis-spacer-block {
+  min-height: 45px;
+}
+
+.y-axis-div-wrapper {
+  display: flex;
+  flex-direction: column;
+  min-height: 20px;
+  min-width: 0;
+}
+
+.y-axis-div {
+  flex: 1 1 25px;
+  min-width: 14px;
+  min-height: 14px;
+}
+
+.y-axis-title {
+  min-height: 14px;
+  min-width: 14px;
+}
+
+.y-axis-chart-title {
+  display: flex;
+  flex-direction: column;
+  min-height: 14px;
+  min-width: 0;
+  width: 14px;
+}
+
+.y-axis-title text, .x-axis-title text {
+  font-size: 9pt;
+  fill: #848e96;
+  font-weight: bold;
+}
+
+.chart-title {
+  flex: 1 1 100%;
+  min-height: 14px;
+  min-width: 14px;
+}
+
+.chart-title text {
+  font-size: 11px;
+  fill: #848e96;
+}
+
+.vis-col-wrapper {
+  display: flex;
+  flex: 1 0 20px;
+  flex-direction: column;
+  min-height: 0;
+  min-width: 0;
+  margin-right: 8px;
+}
+
+.chart-wrapper {
+  display: flex;
+  flex: 1 0 20px;
+  overflow: visible;
+  margin: 0;
+  min-height: 0;
+  min-width: 0;
+}
+
+.chart-wrapper-column {
+  display: flex;
+  flex: 1 0 20px;
+  flex-direction: row;
+  min-height: 0;
+  min-width: 0;
+}
+
+.chart-wrapper-row {
+  display: flex;
+  flex-direction: column;
+  flex: 1 1 100%;
+  min-height: 0;
+  min-width: 0;
+}
+
+.chart {
+  flex: 1 1 100%;
+  min-height: 0;
+  min-width: 0;
+
+  > svg {
+    display: block;
+  }
+
+  overflow: visible;
+}
+
+.chart-row {
+  flex: 1 1 auto;
+  min-height: 0;
+  min-width: 0;
+}
+
+.chart-column {
+  flex: 1 1 auto;
+  min-height: 0;
+  min-width: 0;
+}
+
+.x-axis-wrapper {
+  display: flex;
+  flex-direction: column;
+  min-height: 45px;
+  min-width: 0;
+  overflow: visible;
+}
+
+.x-axis-div-wrapper {
+  display: flex;
+  flex-direction: row;
+  min-height: 20px;
+  min-width: 0;
+}
+
+.x-axis-chart-title {
+  display: flex;
+  flex-direction: row;
+  min-height: 15px;
+  max-height: 15px;
+  min-width: 20px;
+}
+
+.x-axis-title {
+  min-height: 15px;
+  max-height: 15px;
+  min-width: 20px;
+  overflow: hidden;
+}
+
+.x-axis-div {
+  margin-top: -5px;
+  min-height: 20px;
+  min-width: 20px;
+}
diff --git a/src/kibana/components/vislib/styles/_legend.less b/src/ui/public/vislib/styles/_legend.less
similarity index 95%
rename from src/kibana/components/vislib/styles/_legend.less
rename to src/ui/public/vislib/styles/_legend.less
index 686472270215e..0b65cbf4a5dd6 100644
--- a/src/kibana/components/vislib/styles/_legend.less
+++ b/src/ui/public/vislib/styles/_legend.less
@@ -1,3 +1,5 @@
+@import "~ui/styles/mixins";
+
 .legend-col-wrapper {
   .flex-parent(0, 0, auto);
   z-index: 10;
@@ -24,7 +26,7 @@
   }
 
   .legend-ul {
-    .flex(1, 1, 1px);
+    flex: 1 1 1px;
     overflow-x: hidden;
     overflow-y: auto;
 
diff --git a/src/kibana/components/vislib/styles/_svg.less b/src/ui/public/vislib/styles/_svg.less
similarity index 100%
rename from src/kibana/components/vislib/styles/_svg.less
rename to src/ui/public/vislib/styles/_svg.less
diff --git a/src/kibana/components/vislib/styles/_tilemap.less b/src/ui/public/vislib/styles/_tilemap.less
similarity index 97%
rename from src/kibana/components/vislib/styles/_tilemap.less
rename to src/ui/public/vislib/styles/_tilemap.less
index 9b9424aa8f540..dc3b6c79095dc 100644
--- a/src/kibana/components/vislib/styles/_tilemap.less
+++ b/src/ui/public/vislib/styles/_tilemap.less
@@ -152,9 +152,9 @@
 /* filter to desaturate mapquest tiles */
 
 img.leaflet-tile {
-  .filter(brightness(1.03) grayscale(0.83) contrast(1.07));
+  filter: brightness(1.03) grayscale(0.83) contrast(1.07);
 }
 
 img.leaflet-tile.filters-off {
-  .filter(none);
+  filter: none;
 }
diff --git a/src/kibana/components/vislib/styles/_tooltip.less b/src/ui/public/vislib/styles/_tooltip.less
similarity index 93%
rename from src/kibana/components/vislib/styles/_tooltip.less
rename to src/ui/public/vislib/styles/_tooltip.less
index 9050a66a8073e..8afe372b0bb19 100644
--- a/src/kibana/components/vislib/styles/_tooltip.less
+++ b/src/ui/public/vislib/styles/_tooltip.less
@@ -53,20 +53,20 @@
 .vis-tooltip-header {
   margin: 0 0 @tooltip-space 0;
   padding: @tooltip-space-tight @tooltip-space;
-  .display(flex);
-  .align-items(center);
+  display: flex;
+  align-items: center;
 
   &:last-child {
     margin-bottom: 0;
   }
 
   &-icon {
-    .flex(0, 0, auto);
+    flex: 0 0 auto;
     padding-right: @tooltip-space;
   }
 
   &-text {
-    .flex(1, 1, 200px);
+    flex: 1 1 200px;
   }
 
   + * {
@@ -79,4 +79,4 @@
   position: fixed;
   top: -500px;
   left: -500px;
-}
\ No newline at end of file
+}
diff --git a/src/ui/public/vislib/styles/main.less b/src/ui/public/vislib/styles/main.less
new file mode 100644
index 0000000000000..f44fe6823d33c
--- /dev/null
+++ b/src/ui/public/vislib/styles/main.less
@@ -0,0 +1,9 @@
+@import (reference) "~ui/styles/variables";
+
+@import "./_error";
+@import "./_layout";
+@import "./_legend";
+@import "./_svg";
+@import "./_tooltip";
+@import "./_tilemap";
+@import "./_alerts";
diff --git a/src/ui/public/vislib/vis.js b/src/ui/public/vislib/vis.js
new file mode 100644
index 0000000000000..25fe3ee9af9f9
--- /dev/null
+++ b/src/ui/public/vislib/vis.js
@@ -0,0 +1,178 @@
+define(function (require) {
+  return function VisFactory(Private) {
+    var _ = require('lodash');
+    var d3 = require('d3');
+
+    var ResizeChecker = Private(require('ui/vislib/lib/resize_checker'));
+    var Events = Private(require('ui/events'));
+    var handlerTypes = Private(require('ui/vislib/lib/handler/handler_types'));
+    var chartTypes = Private(require('ui/vislib/visualizations/vis_types'));
+    var errors = require('ui/errors');
+    require('ui/vislib/styles/main.less');
+
+    /**
+     * Creates the visualizations.
+     *
+     * @class Vis
+     * @constructor
+     * @param $el {HTMLElement} jQuery selected HTML element
+     * @param config {Object} Parameters that define the chart type and chart options
+     */
+    _.class(Vis).inherits(Events);
+    function Vis($el, config) {
+      if (!(this instanceof Vis)) {
+        return new Vis($el, config);
+      }
+      Vis.Super.apply(this, arguments);
+      this.el = $el.get ? $el.get(0) : $el;
+      this.ChartClass = chartTypes[config.type];
+      this._attr = _.defaults({}, config || {}, {});
+
+      // bind the resize function so it can be used as an event handler
+      this.resize = _.bind(this.resize, this);
+      this.resizeChecker = new ResizeChecker(this.el);
+      this.resizeChecker.on('resize', this.resize);
+    }
+
+    /**
+     * Renders the visualization
+     *
+     * @method render
+     * @param data {Object} Elasticsearch query results
+     */
+    Vis.prototype.render = function (data) {
+      var chartType = this._attr.type;
+
+      if (!data) {
+        throw new Error('No valid data!');
+      }
+
+      if (this.handler) {
+        this.data = null;
+        this._runOnHandler('destroy');
+      }
+
+      this.data = data;
+      this.handler = handlerTypes[chartType](this) || handlerTypes.column(this);
+      this._runOnHandler('render');
+    };
+
+    /**
+     * Resizes the visualization
+     *
+     * @method resize
+     */
+    Vis.prototype.resize = function () {
+      if (!this.data) {
+        // TODO: need to come up with a solution for resizing when no data is available
+        return;
+      }
+
+      if (this.handler && _.isFunction(this.handler.resize)) {
+        this._runOnHandler('resize');
+      } else {
+        this.render(this.data);
+      }
+    };
+
+    Vis.prototype._runOnHandler = function (method) {
+      try {
+        this.handler[method]();
+      } catch (error) {
+        // If involving height and width of the container, log error to screen.
+        // Because we have to wait for the DOM element to initialize, we do not
+        // want to throw an error when the DOM `el` is zero
+        if (error instanceof errors.ContainerTooSmall ||
+          error instanceof errors.InvalidWiggleSelection ||
+          error instanceof errors.InvalidLogScaleValues ||
+          error instanceof errors.PieContainsAllZeros ||
+          error instanceof errors.NotEnoughData ||
+          error instanceof errors.NoResults) {
+          this.handler.error(error.message);
+        } else {
+          throw error;
+        }
+      }
+    };
+
+    /**
+     * Destroys the visualization
+     * Removes chart and all elements associated with it.
+     * Removes chart and all elements associated with it.
+     * Remove event listeners and pass destroy call down to owned objects.
+     *
+     * @method destroy
+     */
+    Vis.prototype.destroy = function () {
+      var selection = d3.select(this.el).select('.vis-wrapper');
+
+      this.resizeChecker.off('resize', this.resize);
+      this.resizeChecker.destroy();
+      if (this.handler) this._runOnHandler('destroy');
+
+      selection.remove();
+      selection = null;
+    };
+
+    /**
+     * Sets attributes on the visualization
+     *
+     * @method set
+     * @param name {String} An attribute name
+     * @param val {*} Value to which the attribute name is set
+     */
+    Vis.prototype.set = function (name, val) {
+      this._attr[name] = val;
+      this.render(this.data);
+    };
+
+    /**
+     * Gets attributes from the visualization
+     *
+     * @method get
+     * @param name {String} An attribute name
+     * @returns {*} The value of the attribute name
+     */
+    Vis.prototype.get = function (name) {
+      return this._attr[name];
+    };
+
+    /**
+     * Turns on event listeners.
+     *
+     * @param event {String}
+     * @param listener{Function}
+     * @returns {*}
+     */
+    Vis.prototype.on = function (event, listener) {
+      var first = this.listenerCount(event) === 0;
+      var ret = Events.prototype.on.call(this, event, listener);
+      var added = this.listenerCount(event) > 0;
+
+      // if this is the first listener added for the event
+      // enable the event in the handler
+      if (first && added && this.handler) this.handler.enable(event);
+
+      return ret;
+    };
+
+    /**
+     * Turns off event listeners.
+     *
+     * @param event {String}
+     * @param listener{Function}
+     * @returns {*}
+     */
+    Vis.prototype.off = function (event, listener) {
+      var last = this.listenerCount(event) === 1;
+      var ret = Events.prototype.off.call(this, event, listener);
+      var removed = this.listenerCount(event) === 0;
+
+      // Once all listeners are removed, disable the events in the handler
+      if (last && removed && this.handler) this.handler.disable(event);
+      return ret;
+    };
+
+    return Vis;
+  };
+});
diff --git a/src/ui/public/vislib/vislib.js b/src/ui/public/vislib/vislib.js
new file mode 100644
index 0000000000000..7a8871defd7a1
--- /dev/null
+++ b/src/ui/public/vislib/vislib.js
@@ -0,0 +1,26 @@
+// prefetched for faster optimization runs
+require('ui/vislib/lib/handler/types/pie');
+require('ui/vislib/lib/handler/types/point_series');
+require('ui/vislib/lib/handler/types/tile_map');
+require('ui/vislib/lib/handler/handler_types');
+require('ui/vislib/lib/layout/layout_types');
+require('ui/vislib/lib/data');
+require('ui/vislib/visualizations/_map.js');
+require('ui/vislib/visualizations/vis_types');
+// end prefetching
+
+/**
+ * Provides the Kibana4 Visualization Library
+ *
+ * @module vislib
+ * @main vislib
+ * @return {Object} Contains the version number and the Vis Class for creating visualizations
+ */
+module.exports = function VislibProvider(Private) {
+  require('ui/vislib/styles/main.less');
+
+  return {
+    version: '0.0.0',
+    Vis: Private(require('ui/vislib/vis'))
+  };
+};
diff --git a/src/kibana/components/vislib/visualizations/_chart.js b/src/ui/public/vislib/visualizations/_chart.js
similarity index 88%
rename from src/kibana/components/vislib/visualizations/_chart.js
rename to src/ui/public/vislib/visualizations/_chart.js
index 0ba422d0d9c8d..7d573de56d026 100644
--- a/src/kibana/components/vislib/visualizations/_chart.js
+++ b/src/ui/public/vislib/visualizations/_chart.js
@@ -1,11 +1,12 @@
 define(function (require) {
-  return function ChartBaseClass(d3, Private) {
+  return function ChartBaseClass(Private) {
+    var d3 = require('d3');
     var _ = require('lodash');
-    var errors = require('errors');
+    var errors = require('ui/errors');
 
-    var Dispatch = Private(require('components/vislib/lib/dispatch'));
-    var Tooltip = Private(require('components/vislib/components/tooltip/tooltip'));
-    var dataLabel = require('components/vislib/lib/_data_label');
+    var Dispatch = Private(require('ui/vislib/lib/dispatch'));
+    var Tooltip = Private(require('ui/vislib/components/Tooltip'));
+    var dataLabel = require('ui/vislib/lib/_data_label');
 
     /**
      * The Base Class for all visualizations.
diff --git a/src/kibana/components/vislib/visualizations/_map.js b/src/ui/public/vislib/visualizations/_map.js
similarity index 95%
rename from src/kibana/components/vislib/visualizations/_map.js
rename to src/ui/public/vislib/visualizations/_map.js
index 35365b47891b7..2b8b1f6f22b17 100644
--- a/src/kibana/components/vislib/visualizations/_map.js
+++ b/src/ui/public/vislib/visualizations/_map.js
@@ -3,7 +3,6 @@ define(function (require) {
     var _ = require('lodash');
     var $ = require('jquery');
     var L = require('leaflet');
-    require('leaflet-draw');
 
     var defaultMapZoom = 2;
     var defaultMapCenter = [15, 5];
@@ -20,10 +19,10 @@ define(function (require) {
     };
 
     var markerTypes = {
-      'Scaled Circle Markers': Private(require('components/vislib/visualizations/marker_types/scaled_circles')),
-      'Shaded Circle Markers': Private(require('components/vislib/visualizations/marker_types/shaded_circles')),
-      'Shaded Geohash Grid': Private(require('components/vislib/visualizations/marker_types/geohash_grid')),
-      'Heatmap': Private(require('components/vislib/visualizations/marker_types/heatmap')),
+      'Scaled Circle Markers': Private(require('ui/vislib/visualizations/marker_types/scaled_circles')),
+      'Shaded Circle Markers': Private(require('ui/vislib/visualizations/marker_types/shaded_circles')),
+      'Shaded Geohash Grid': Private(require('ui/vislib/visualizations/marker_types/geohash_grid')),
+      'Heatmap': Private(require('ui/vislib/visualizations/marker_types/heatmap')),
     };
 
     /**
diff --git a/src/kibana/components/vislib/visualizations/_point_series_chart.js b/src/ui/public/vislib/visualizations/_point_series_chart.js
similarity index 94%
rename from src/kibana/components/vislib/visualizations/_point_series_chart.js
rename to src/ui/public/vislib/visualizations/_point_series_chart.js
index b5e8f8474697b..e6cd51b97dfc9 100644
--- a/src/kibana/components/vislib/visualizations/_point_series_chart.js
+++ b/src/ui/public/vislib/visualizations/_point_series_chart.js
@@ -1,10 +1,11 @@
 define(function (require) {
-  return function PointSeriesChartProvider(d3, Private) {
+  return function PointSeriesChartProvider(Private) {
+    var d3 = require('d3');
     var _ = require('lodash');
 
-    var Chart = Private(require('components/vislib/visualizations/_chart'));
-    var Tooltip = Private(require('components/vislib/components/tooltip/tooltip'));
-    var touchdownTmpl = _.template(require('text!components/vislib/partials/touchdown.tmpl.html'));
+    var Chart = Private(require('ui/vislib/visualizations/_chart'));
+    var Tooltip = Private(require('ui/vislib/components/Tooltip'));
+    var touchdownTmpl = _.template(require('ui/vislib/partials/touchdown.tmpl.html'));
 
     _.class(PointSeriesChart).inherits(Chart);
     function PointSeriesChart(handler, chartEl, chartData) {
diff --git a/src/ui/public/vislib/visualizations/area_chart.js b/src/ui/public/vislib/visualizations/area_chart.js
new file mode 100644
index 0000000000000..447d24a6885d4
--- /dev/null
+++ b/src/ui/public/vislib/visualizations/area_chart.js
@@ -0,0 +1,364 @@
+define(function (require) {
+  return function AreaChartFactory(Private) {
+    var d3 = require('d3');
+    var _ = require('lodash');
+    var $ = require('jquery');
+
+    var PointSeriesChart = Private(require('ui/vislib/visualizations/_point_series_chart'));
+    var TimeMarker = Private(require('ui/vislib/visualizations/time_marker'));
+    var errors = require('ui/errors');
+
+    /**
+     * Area chart visualization
+     *
+     * @class AreaChart
+     * @constructor
+     * @extends Chart
+     * @param handler {Object} Reference to the Handler Class Constructor
+     * @param el {HTMLElement} HTML element to which the chart will be appended
+     * @param chartData {Object} Elasticsearch query results for this specific
+     * chart
+     */
+    _.class(AreaChart).inherits(PointSeriesChart);
+    function AreaChart(handler, chartEl, chartData) {
+      if (!(this instanceof AreaChart)) {
+        return new AreaChart(handler, chartEl, chartData);
+      }
+
+      AreaChart.Super.apply(this, arguments);
+
+      this.isOverlapping = (handler._attr.mode === 'overlap');
+
+      if (this.isOverlapping) {
+
+        // Default opacity should return to 0.6 on mouseout
+        handler._attr.defaultOpacity = 0.6;
+      }
+
+      this.checkIfEnoughData();
+
+      this._attr = _.defaults(handler._attr || {}, {
+        xValue: function (d) { return d.x; },
+        yValue: function (d) { return d.y; }
+      });
+    }
+
+    /**
+     * Adds SVG path to area chart
+     *
+     * @method addPath
+     * @param svg {HTMLElement} SVG to which rect are appended
+     * @param layers {Array} Chart data array
+     * @returns {D3.UpdateSelection} SVG with path added
+     */
+    AreaChart.prototype.addPath = function (svg, layers) {
+      var self = this;
+      var ordered = this.handler.data.get('ordered');
+      var isTimeSeries = (ordered && ordered.date);
+      var isOverlapping = this.isOverlapping;
+      var color = this.handler.data.getColorFunc();
+      var xScale = this.handler.xAxis.xScale;
+      var yScale = this.handler.yAxis.yScale;
+      var interpolate = (this._attr.smoothLines) ? 'cardinal' : this._attr.interpolate;
+      var area = d3.svg.area()
+      .x(function (d) {
+        if (isTimeSeries) {
+          return xScale(d.x);
+        }
+        return xScale(d.x) + xScale.rangeBand() / 2;
+      })
+      .y0(function (d) {
+        if (isOverlapping) {
+          return yScale(0);
+        }
+
+        return yScale(d.y0);
+      })
+      .y1(function (d) {
+        if (isOverlapping) {
+          return yScale(d.y);
+        }
+
+        return yScale(d.y0 + d.y);
+      })
+      .defined(function (d) { return !_.isNull(d.y); })
+      .interpolate(interpolate);
+
+      // Data layers
+      var layer = svg.selectAll('.layer')
+      .data(layers)
+      .enter()
+      .append('g')
+      .attr('class', function (d, i) {
+        return 'pathgroup ' + i;
+      });
+
+      // Append path
+      var path = layer.append('path')
+      .call(this._addIdentifier)
+      .style('fill', function (d) {
+        return color(d[0].label);
+      })
+      .classed('overlap_area', function () {
+        return isOverlapping;
+      });
+
+      // update
+      path.attr('d', function (d) {
+        return area(d);
+      });
+
+      return path;
+    };
+
+    /**
+     * Adds Events to SVG circles
+     *
+     * @method addCircleEvents
+     * @param element {D3.UpdateSelection} SVG circles
+     * @returns {D3.Selection} circles with event listeners attached
+     */
+    AreaChart.prototype.addCircleEvents = function (element, svg) {
+      var events = this.events;
+      var isBrushable = events.isBrushable();
+      var brush = isBrushable ? events.addBrushEvent(svg) : undefined;
+      var hover = events.addHoverEvent();
+      var mouseout = events.addMouseoutEvent();
+      var click = events.addClickEvent();
+      var attachedEvents = element.call(hover).call(mouseout).call(click);
+
+      if (isBrushable) {
+        attachedEvents.call(brush);
+      }
+
+      return attachedEvents;
+    };
+
+    /**
+     * Adds SVG circles to area chart
+     *
+     * @method addCircles
+     * @param svg {HTMLElement} SVG to which circles are appended
+     * @param data {Array} Chart data array
+     * @returns {D3.UpdateSelection} SVG with circles added
+     */
+    AreaChart.prototype.addCircles = function (svg, data) {
+      var self = this;
+      var color = this.handler.data.getColorFunc();
+      var xScale = this.handler.xAxis.xScale;
+      var yScale = this.handler.yAxis.yScale;
+      var ordered = this.handler.data.get('ordered');
+      var circleRadius = 12;
+      var circleStrokeWidth = 0;
+      var tooltip = this.tooltip;
+      var isTooltip = this._attr.addTooltip;
+      var isOverlapping = this.isOverlapping;
+      var layer;
+      var circles;
+
+      layer = svg.selectAll('.points')
+      .data(data)
+      .enter()
+        .append('g')
+        .attr('class', 'points area');
+
+      // append the circles
+      circles = layer
+      .selectAll('circles')
+      .data(function appendData(data) {
+        return data.filter(function isZeroOrNull(d) {
+          return d.y !== 0 && !_.isNull(d.y);
+        });
+      });
+
+      // exit
+      circles.exit().remove();
+
+      // enter
+      circles
+      .enter()
+      .append('circle')
+      .call(this._addIdentifier)
+      .attr('stroke', function strokeColor(d) {
+        return color(d.label);
+      })
+      .attr('fill', 'transparent')
+      .attr('stroke-width', circleStrokeWidth);
+
+      // update
+      circles
+      .attr('cx', function cx(d) {
+        if (ordered && ordered.date) {
+          return xScale(d.x);
+        }
+        return xScale(d.x) + xScale.rangeBand() / 2;
+      })
+      .attr('cy', function cy(d) {
+        if (isOverlapping) {
+          return yScale(d.y);
+        }
+        return yScale(d.y0 + d.y);
+      })
+      .attr('r', circleRadius);
+
+      // Add tooltip
+      if (isTooltip) {
+        circles.call(tooltip.render());
+      }
+
+      return circles;
+    };
+
+    /**
+     * Adds SVG clipPath
+     *
+     * @method addClipPath
+     * @param svg {HTMLElement} SVG to which clipPath is appended
+     * @param width {Number} SVG width
+     * @param height {Number} SVG height
+     * @returns {D3.UpdateSelection} SVG with clipPath added
+     */
+    AreaChart.prototype.addClipPath = function (svg, width, height) {
+      // Prevents circles from being clipped at the top of the chart
+      var startX = 0;
+      var startY = 0;
+      var id = 'chart-area' + _.uniqueId();
+
+      // Creating clipPath
+      return svg
+      .attr('clip-path', 'url(#' + id + ')')
+      .append('clipPath')
+      .attr('id', id)
+      .append('rect')
+      .attr('x', startX)
+      .attr('y', startY)
+      .attr('width', width)
+      .attr('height', height);
+    };
+
+    AreaChart.prototype.checkIfEnoughData = function () {
+      var series = this.chartData.series;
+      var message = 'Area charts require more than one data point. Try adding ' +
+        'an X-Axis Aggregation';
+
+      var notEnoughData = series.some(function (obj) {
+        return obj.values.length < 2;
+      });
+
+      if (notEnoughData) {
+        throw new errors.NotEnoughData(message);
+      }
+    };
+
+    AreaChart.prototype.validateWiggleSelection = function () {
+      var isWiggle = this._attr.mode === 'wiggle';
+      var ordered = this.handler.data.get('ordered');
+
+      if (isWiggle && !ordered) throw new errors.InvalidWiggleSelection();
+    };
+
+    /**
+     * Renders d3 visualization
+     *
+     * @method draw
+     * @returns {Function} Creates the area chart
+     */
+    AreaChart.prototype.draw = function () {
+      // Attributes
+      var self = this;
+      var xScale = this.handler.xAxis.xScale;
+      var $elem = $(this.chartEl);
+      var margin = this._attr.margin;
+      var elWidth = this._attr.width = $elem.width();
+      var elHeight = this._attr.height = $elem.height();
+      var yMin = this.handler.yAxis.yMin;
+      var yScale = this.handler.yAxis.yScale;
+      var minWidth = 20;
+      var minHeight = 20;
+      var addTimeMarker = this._attr.addTimeMarker;
+      var times = this._attr.times || [];
+      var timeMarker;
+      var div;
+      var svg;
+      var width;
+      var height;
+      var layers;
+      var circles;
+      var path;
+
+      return function (selection) {
+        selection.each(function (data) {
+          // Stack data
+          layers = self.stackData(data);
+
+          // Get the width and height
+          width = elWidth;
+          height = elHeight - margin.top - margin.bottom;
+
+          if (addTimeMarker) {
+            timeMarker = new TimeMarker(times, xScale, height);
+          }
+
+          if (width < minWidth || height < minHeight) {
+            throw new errors.ContainerTooSmall();
+          }
+          self.validateWiggleSelection();
+
+          // Select the current DOM element
+          div = d3.select(this);
+
+          // Create the canvas for the visualization
+          svg = div.append('svg')
+          .attr('width', width)
+          .attr('height', height + margin.top + margin.bottom)
+          .append('g')
+          .attr('transform', 'translate(0,' + margin.top + ')');
+
+          // add clipPath to hide circles when they go out of bounds
+          self.addClipPath(svg, width, height);
+          self.createEndZones(svg);
+
+          // add path
+          path = self.addPath(svg, layers);
+
+          if (yMin < 0 && self._attr.mode !== 'wiggle' && self._attr.mode !== 'silhouette') {
+
+            // Draw line at yScale 0 value
+            svg.append('line')
+              .attr('class', 'zero-line')
+              .attr('x1', 0)
+              .attr('y1', yScale(0))
+              .attr('x2', width)
+              .attr('y2', yScale(0))
+              .style('stroke', '#ddd')
+              .style('stroke-width', 1);
+          }
+
+          // add circles
+          circles = self.addCircles(svg, layers);
+
+          // add click and hover events to circles
+          self.addCircleEvents(circles, svg);
+
+          // chart base line
+          var line = svg.append('line')
+          .attr('class', 'base-line')
+          .attr('x1', 0)
+          .attr('y1', yScale(0))
+          .attr('x2', width)
+          .attr('y2', yScale(0))
+          .style('stroke', '#ddd')
+          .style('stroke-width', 1);
+
+          if (addTimeMarker) {
+            timeMarker.render(svg);
+          }
+
+          return svg;
+        });
+      };
+    };
+
+    return AreaChart;
+  };
+});
diff --git a/src/ui/public/vislib/visualizations/column_chart.js b/src/ui/public/vislib/visualizations/column_chart.js
new file mode 100644
index 0000000000000..b981a4dc86eac
--- /dev/null
+++ b/src/ui/public/vislib/visualizations/column_chart.js
@@ -0,0 +1,328 @@
+define(function (require) {
+  return function ColumnChartFactory(Private) {
+    var d3 = require('d3');
+    var _ = require('lodash');
+    var $ = require('jquery');
+    var moment = require('moment');
+
+    var DataClass = Private(require('ui/vislib/lib/data'));
+
+    var PointSeriesChart = Private(require('ui/vislib/visualizations/_point_series_chart'));
+    var TimeMarker = Private(require('ui/vislib/visualizations/time_marker'));
+    var errors = require('ui/errors');
+
+    /**
+     * Vertical Bar Chart Visualization: renders vertical and/or stacked bars
+     *
+     * @class ColumnChart
+     * @constructor
+     * @extends Chart
+     * @param handler {Object} Reference to the Handler Class Constructor
+     * @param el {HTMLElement} HTML element to which the chart will be appended
+     * @param chartData {Object} Elasticsearch query results for this specific chart
+     */
+    _.class(ColumnChart).inherits(PointSeriesChart);
+    function ColumnChart(handler, chartEl, chartData) {
+      if (!(this instanceof ColumnChart)) {
+        return new ColumnChart(handler, chartEl, chartData);
+      }
+
+      ColumnChart.Super.apply(this, arguments);
+
+      // Column chart specific attributes
+      this._attr = _.defaults(handler._attr || {}, {
+        xValue: function (d) { return d.x; },
+        yValue: function (d) { return d.y; }
+      });
+    }
+
+    /**
+     * Adds SVG rect to Vertical Bar Chart
+     *
+     * @method addBars
+     * @param svg {HTMLElement} SVG to which rect are appended
+     * @param layers {Array} Chart data array
+     * @returns {D3.UpdateSelection} SVG with rect added
+     */
+    ColumnChart.prototype.addBars = function (svg, layers) {
+      var self = this;
+      var color = this.handler.data.getColorFunc();
+      var tooltip = this.tooltip;
+      var isTooltip = this._attr.addTooltip;
+      var layer;
+      var bars;
+
+      layer = svg.selectAll('.layer')
+      .data(layers)
+      .enter().append('g')
+      .attr('class', function (d, i) {
+        return 'series ' + i;
+      });
+
+      bars = layer.selectAll('rect')
+      .data(function (d) {
+        return d;
+      });
+
+      bars
+      .exit()
+      .remove();
+
+      bars
+      .enter()
+      .append('rect')
+      .call(this._addIdentifier)
+      .attr('fill', function (d) {
+        return color(d.label);
+      });
+
+      self.updateBars(bars);
+
+      // Add tooltip
+      if (isTooltip) {
+        bars.call(tooltip.render());
+      }
+
+      return bars;
+    };
+
+    /**
+     * Determines whether bars are grouped or stacked and updates the D3
+     * selection
+     *
+     * @method updateBars
+     * @param bars {D3.UpdateSelection} SVG with rect added
+     * @returns {D3.UpdateSelection}
+     */
+    ColumnChart.prototype.updateBars = function (bars) {
+      var offset = this._attr.mode;
+
+      if (offset === 'grouped') {
+        return this.addGroupedBars(bars);
+      }
+      return this.addStackedBars(bars);
+    };
+
+    /**
+     * Adds stacked bars to column chart visualization
+     *
+     * @method addStackedBars
+     * @param bars {D3.UpdateSelection} SVG with rect added
+     * @returns {D3.UpdateSelection}
+     */
+    ColumnChart.prototype.addStackedBars = function (bars) {
+      var data = this.chartData;
+      var xScale = this.handler.xAxis.xScale;
+      var yScale = this.handler.yAxis.yScale;
+      var height = yScale.range()[0];
+      var yMin = this.handler.yAxis.yScale.domain()[0];
+      var self = this;
+
+      var barWidth;
+      if (data.ordered && data.ordered.date) {
+        var start = data.ordered.min;
+        var end = moment(data.ordered.min).add(data.ordered.interval).valueOf();
+
+        barWidth = xScale(end) - xScale(start);
+        barWidth = barWidth - Math.min(barWidth * 0.25, 15);
+      }
+
+      // update
+      bars
+      .attr('x', function (d) {
+        return xScale(d.x);
+      })
+      .attr('width', function () {
+        return barWidth || xScale.rangeBand();
+      })
+      .attr('y', function (d) {
+        if (d.y < 0) {
+          return yScale(d.y0);
+        }
+
+        return yScale(d.y0 + d.y);
+      })
+      .attr('height', function (d) {
+        if (d.y < 0) {
+          return Math.abs(yScale(d.y0 + d.y) - yScale(d.y0));
+        }
+
+        // Due to an issue with D3 not returning zeros correctly when using
+        // an offset='expand', need to add conditional statement to handle zeros
+        // appropriately
+        if (d._input.y === 0) {
+          return 0;
+        }
+
+        // for split bars or for one series,
+        // last series will have d.y0 = 0
+        if (d.y0 === 0 && yMin > 0) {
+          return yScale(yMin) - yScale(d.y);
+        }
+
+        return yScale(d.y0) - yScale(d.y0 + d.y);
+      });
+
+      return bars;
+    };
+
+    /**
+     * Adds grouped bars to column chart visualization
+     *
+     * @method addGroupedBars
+     * @param bars {D3.UpdateSelection} SVG with rect added
+     * @returns {D3.UpdateSelection}
+     */
+    ColumnChart.prototype.addGroupedBars = function (bars) {
+      var xScale = this.handler.xAxis.xScale;
+      var yScale = this.handler.yAxis.yScale;
+      var yMin = this.handler.yAxis.yMin;
+      var data = this.chartData;
+      var n = data.series.length;
+      var height = yScale.range()[0];
+      var groupSpacingPercentage = 0.15;
+      var isTimeScale = (data.ordered && data.ordered.date);
+      var minWidth = 1;
+      var barWidth;
+
+      // update
+      bars
+      .attr('x', function (d, i, j) {
+        if (isTimeScale) {
+          var groupWidth = xScale(data.ordered.min + data.ordered.interval) -
+            xScale(data.ordered.min);
+          var groupSpacing = groupWidth * groupSpacingPercentage;
+
+          barWidth = (groupWidth - groupSpacing) / n;
+
+          return xScale(d.x) + barWidth * j;
+        }
+        return xScale(d.x) + xScale.rangeBand() / n * j;
+      })
+      .attr('width', function () {
+        if (barWidth < minWidth) {
+          throw new errors.ContainerTooSmall();
+        }
+
+        if (isTimeScale) {
+          return barWidth;
+        }
+        return xScale.rangeBand() / n;
+      })
+      .attr('y', function (d) {
+        if (d.y < 0) {
+          return yScale(0);
+        }
+
+        return yScale(d.y);
+      })
+      .attr('height', function (d) {
+        return Math.abs(yScale(0) - yScale(d.y));
+      });
+
+      return bars;
+    };
+
+    /**
+     * Adds Events to SVG rect
+     * Visualization is only brushable when a brush event is added
+     * If a brush event is added, then a function should be returned.
+     *
+     * @method addBarEvents
+     * @param element {D3.UpdateSelection} target
+     * @param svg {D3.UpdateSelection} chart SVG
+     * @returns {D3.Selection} rect with event listeners attached
+     */
+    ColumnChart.prototype.addBarEvents = function (element, svg) {
+      var events = this.events;
+      var isBrushable = events.isBrushable();
+      var brush = isBrushable ? events.addBrushEvent(svg) : undefined;
+      var hover = events.addHoverEvent();
+      var mouseout = events.addMouseoutEvent();
+      var click = events.addClickEvent();
+      var attachedEvents = element.call(hover).call(mouseout).call(click);
+
+      if (isBrushable) {
+        attachedEvents.call(brush);
+      }
+
+      return attachedEvents;
+    };
+
+    /**
+     * Renders d3 visualization
+     *
+     * @method draw
+     * @returns {Function} Creates the vertical bar chart
+     */
+    ColumnChart.prototype.draw = function () {
+      var self = this;
+      var $elem = $(this.chartEl);
+      var margin = this._attr.margin;
+      var elWidth = this._attr.width = $elem.width();
+      var elHeight = this._attr.height = $elem.height();
+      var yMin = this.handler.yAxis.yMin;
+      var yScale = this.handler.yAxis.yScale;
+      var xScale = this.handler.xAxis.xScale;
+      var minWidth = 20;
+      var minHeight = 20;
+      var addTimeMarker = this._attr.addTimeMarker;
+      var times = this._attr.times || [];
+      var timeMarker;
+      var div;
+      var svg;
+      var width;
+      var height;
+      var layers;
+      var bars;
+
+      return function (selection) {
+        selection.each(function (data) {
+          layers = self.stackData(data);
+
+          width = elWidth;
+          height = elHeight - margin.top - margin.bottom;
+
+          if (addTimeMarker) {
+            timeMarker = new TimeMarker(times, xScale, height);
+          }
+
+          if (width < minWidth || height < minHeight) {
+            throw new errors.ContainerTooSmall();
+          }
+
+          div = d3.select(this);
+
+          svg = div.append('svg')
+          .attr('width', width)
+          .attr('height', height + margin.top + margin.bottom)
+          .append('g')
+          .attr('transform', 'translate(0,' + margin.top + ')');
+
+          bars = self.addBars(svg, layers);
+          self.createEndZones(svg);
+
+          // Adds event listeners
+          self.addBarEvents(bars, svg);
+
+          var line = svg.append('line')
+          .attr('class', 'base-line')
+          .attr('x1', 0)
+          .attr('y1', yScale(0))
+          .attr('x2', width)
+          .attr('y2', yScale(0))
+          .style('stroke', '#ddd')
+          .style('stroke-width', 1);
+
+          if (addTimeMarker) {
+            timeMarker.render(svg);
+          }
+
+          return svg;
+        });
+      };
+    };
+
+    return ColumnChart;
+  };
+});
diff --git a/src/ui/public/vislib/visualizations/line_chart.js b/src/ui/public/vislib/visualizations/line_chart.js
new file mode 100644
index 0000000000000..067fb049b924f
--- /dev/null
+++ b/src/ui/public/vislib/visualizations/line_chart.js
@@ -0,0 +1,357 @@
+define(function (require) {
+  return function LineChartFactory(Private) {
+    var d3 = require('d3');
+    var _ = require('lodash');
+    var $ = require('jquery');
+    var errors = require('ui/errors');
+
+    var PointSeriesChart = Private(require('ui/vislib/visualizations/_point_series_chart'));
+    var TimeMarker = Private(require('ui/vislib/visualizations/time_marker'));
+
+    /**
+     * Line Chart Visualization
+     *
+     * @class LineChart
+     * @constructor
+     * @extends Chart
+     * @param handler {Object} Reference to the Handler Class Constructor
+     * @param el {HTMLElement} HTML element to which the chart will be appended
+     * @param chartData {Object} Elasticsearch query results for this specific chart
+     */
+    _.class(LineChart).inherits(PointSeriesChart);
+    function LineChart(handler, chartEl, chartData) {
+      if (!(this instanceof LineChart)) {
+        return new LineChart(handler, chartEl, chartData);
+      }
+
+      LineChart.Super.apply(this, arguments);
+
+      // Line chart specific attributes
+      this._attr = _.defaults(handler._attr || {}, {
+        interpolate: 'linear',
+        xValue: function (d) { return d.x; },
+        yValue: function (d) { return d.y; }
+      });
+    }
+
+    /**
+     * Adds Events to SVG circle
+     *
+     * @method addCircleEvents
+     * @param element{D3.UpdateSelection} Reference to SVG circle
+     * @returns {D3.Selection} SVG circles with event listeners attached
+     */
+    LineChart.prototype.addCircleEvents = function (element, svg) {
+      var events = this.events;
+      var isBrushable = events.isBrushable();
+      var brush = isBrushable ? events.addBrushEvent(svg) : undefined;
+      var hover = events.addHoverEvent();
+      var mouseout = events.addMouseoutEvent();
+      var click = events.addClickEvent();
+      var attachedEvents = element.call(hover).call(mouseout).call(click);
+
+      if (isBrushable) {
+        attachedEvents.call(brush);
+      }
+
+      return attachedEvents;
+    };
+
+    /**
+     * Adds circles to SVG
+     *
+     * @method addCircles
+     * @param svg {HTMLElement} SVG to which rect are appended
+     * @param data {Array} Array of object data points
+     * @returns {D3.UpdateSelection} SVG with circles added
+     */
+    LineChart.prototype.addCircles = function (svg, data) {
+      var self = this;
+      var showCircles = this._attr.showCircles;
+      var color = this.handler.data.getColorFunc();
+      var xScale = this.handler.xAxis.xScale;
+      var yScale = this.handler.yAxis.yScale;
+      var ordered = this.handler.data.get('ordered');
+      var tooltip = this.tooltip;
+      var isTooltip = this._attr.addTooltip;
+
+      var radii = _(data)
+      .map(function (series) {
+        return _.pluck(series, '_input.z');
+      })
+      .flattenDeep()
+      .reduce(function (result, val) {
+        if (result.min > val) result.min = val;
+        if (result.max < val) result.max = val;
+        return result;
+      }, {
+        min: Infinity,
+        max: -Infinity
+      });
+
+      var radiusStep = ((radii.max - radii.min) || (radii.max * 100)) / Math.pow(this._attr.radiusRatio, 2);
+
+      var layer = svg.selectAll('.points')
+      .data(data)
+      .enter()
+        .append('g')
+        .attr('class', 'points line');
+
+      var circles = layer
+      .selectAll('circle')
+      .data(function appendData(data) {
+        return data.filter(function (d) {
+          return !_.isNull(d.y);
+        });
+      });
+
+      circles
+      .exit()
+      .remove();
+
+      function cx(d) {
+        if (ordered && ordered.date) {
+          return xScale(d.x);
+        }
+        return xScale(d.x) + xScale.rangeBand() / 2;
+      }
+
+      function cy(d) {
+        return yScale(d.y);
+      }
+
+      function cColor(d) {
+        return color(d.label);
+      }
+
+      function colorCircle(d) {
+        var parent = d3.select(this).node().parentNode;
+        var lengthOfParent = d3.select(parent).data()[0].length;
+        var isVisible = (lengthOfParent === 1);
+
+        // If only 1 point exists, show circle
+        if (!showCircles && !isVisible) return 'none';
+        return cColor(d);
+      }
+      function getCircleRadiusFn(modifier) {
+        return function getCircleRadius(d) {
+          var margin = self._attr.margin;
+          var width = self._attr.width - margin.left - margin.right;
+          var height = self._attr.height - margin.top - margin.bottom;
+          var circleRadius = (d._input.z - radii.min) / radiusStep;
+
+          return _.min([Math.sqrt((circleRadius || 2) + 2), width, height]) + (modifier || 0);
+        };
+      }
+
+
+      circles
+      .enter()
+        .append('circle')
+        .attr('r', getCircleRadiusFn())
+        .attr('fill-opacity', (this._attr.drawLinesBetweenPoints ? 1 : 0.7))
+        .attr('cx', cx)
+        .attr('cy', cy)
+        .attr('class', 'circle-decoration')
+        .call(this._addIdentifier)
+        .attr('fill', colorCircle);
+
+      circles
+      .enter()
+        .append('circle')
+        .attr('r', getCircleRadiusFn(10))
+        .attr('cx', cx)
+        .attr('cy', cy)
+        .attr('fill', 'transparent')
+        .attr('class', 'circle')
+        .call(this._addIdentifier)
+        .attr('stroke', cColor)
+        .attr('stroke-width', 0);
+
+      if (isTooltip) {
+        circles.call(tooltip.render());
+      }
+
+      return circles;
+    };
+
+    /**
+     * Adds path to SVG
+     *
+     * @method addLines
+     * @param svg {HTMLElement} SVG to which path are appended
+     * @param data {Array} Array of object data points
+     * @returns {D3.UpdateSelection} SVG with paths added
+     */
+    LineChart.prototype.addLines = function (svg, data) {
+      var self = this;
+      var xScale = this.handler.xAxis.xScale;
+      var yScale = this.handler.yAxis.yScale;
+      var xAxisFormatter = this.handler.data.get('xAxisFormatter');
+      var color = this.handler.data.getColorFunc();
+      var ordered = this.handler.data.get('ordered');
+      var interpolate = (this._attr.smoothLines) ? 'cardinal' : this._attr.interpolate;
+      var line = d3.svg.line()
+      .defined(function (d) { return !_.isNull(d.y); })
+      .interpolate(interpolate)
+      .x(function x(d) {
+        if (ordered && ordered.date) {
+          return xScale(d.x);
+        }
+        return xScale(d.x) + xScale.rangeBand() / 2;
+      })
+      .y(function y(d) {
+        return yScale(d.y);
+      });
+      var lines;
+
+      lines = svg
+      .selectAll('.lines')
+      .data(data)
+      .enter()
+        .append('g')
+        .attr('class', 'pathgroup lines');
+
+      lines.append('path')
+      .call(this._addIdentifier)
+      .attr('d', function lineD(d) {
+        return line(d.values);
+      })
+      .attr('fill', 'none')
+      .attr('stroke', function lineStroke(d) {
+        return color(d.label);
+      })
+      .attr('stroke-width', 2);
+
+      return lines;
+    };
+
+    /**
+     * Adds SVG clipPath
+     *
+     * @method addClipPath
+     * @param svg {HTMLElement} SVG to which clipPath is appended
+     * @param width {Number} SVG width
+     * @param height {Number} SVG height
+     * @returns {D3.UpdateSelection} SVG with clipPath added
+     */
+    LineChart.prototype.addClipPath = function (svg, width, height) {
+      var clipPathBuffer = 5;
+      var startX = 0;
+      var startY = 0 - clipPathBuffer;
+      var id = 'chart-area' + _.uniqueId();
+
+      return svg
+      .attr('clip-path', 'url(#' + id + ')')
+      .append('clipPath')
+      .attr('id', id)
+      .append('rect')
+      .attr('x', startX)
+      .attr('y', startY)
+      .attr('width', width)
+      // Adding clipPathBuffer to height so it doesn't
+      // cutoff the lower part of the chart
+      .attr('height', height + clipPathBuffer);
+    };
+
+    /**
+     * Renders d3 visualization
+     *
+     * @method draw
+     * @returns {Function} Creates the line chart
+     */
+    LineChart.prototype.draw = function () {
+      var self = this;
+      var $elem = $(this.chartEl);
+      var margin = this._attr.margin;
+      var elWidth = this._attr.width = $elem.width();
+      var elHeight = this._attr.height = $elem.height();
+      var scaleType = this.handler.yAxis.getScaleType();
+      var yMin = this.handler.yAxis.yMin;
+      var yScale = this.handler.yAxis.yScale;
+      var xScale = this.handler.xAxis.xScale;
+      var minWidth = 20;
+      var minHeight = 20;
+      var startLineX = 0;
+      var lineStrokeWidth = 1;
+      var addTimeMarker = this._attr.addTimeMarker;
+      var times = this._attr.times || [];
+      var timeMarker;
+      var div;
+      var svg;
+      var width;
+      var height;
+      var lines;
+      var circles;
+
+      return function (selection) {
+        selection.each(function (data) {
+          var el = this;
+
+          var layers = data.series.map(function mapSeries(d) {
+            var label = d.label;
+            return d.values.map(function mapValues(e, i) {
+              return {
+                _input: e,
+                label: label,
+                x: self._attr.xValue.call(d.values, e, i),
+                y: self._attr.yValue.call(d.values, e, i)
+              };
+            });
+          });
+
+          width = elWidth - margin.left - margin.right;
+          height = elHeight - margin.top - margin.bottom;
+
+          if (addTimeMarker) {
+            timeMarker = new TimeMarker(times, xScale, height);
+          }
+
+          if (self._attr.scale === 'log' && self._invalidLogScaleValues(data)) {
+            throw new errors.InvalidLogScaleValues();
+          }
+
+          if (width < minWidth || height < minHeight) {
+            throw new errors.ContainerTooSmall();
+          }
+
+          div = d3.select(el);
+
+          svg = div.append('svg')
+          .attr('width', width + margin.left + margin.right)
+          .attr('height', height + margin.top + margin.bottom)
+          .append('g')
+          .attr('transform', 'translate(' + margin.left + ',' + margin.top + ')');
+
+          self.addClipPath(svg, width, height);
+          if (self._attr.drawLinesBetweenPoints) {
+            lines = self.addLines(svg, data.series);
+          }
+          circles = self.addCircles(svg, layers);
+          self.addCircleEvents(circles, svg);
+          self.createEndZones(svg);
+
+          var scale = (scaleType === 'log') ? yScale(1) : yScale(0);
+          if (scale) {
+            svg.append('line')
+            .attr('class', 'base-line')
+            .attr('x1', startLineX)
+            .attr('y1', scale)
+            .attr('x2', width)
+            .attr('y2', scale)
+            .style('stroke', '#ddd')
+            .style('stroke-width', lineStrokeWidth);
+          }
+
+          if (addTimeMarker) {
+            timeMarker.render(svg);
+          }
+
+          return svg;
+        });
+      };
+    };
+
+    return LineChart;
+  };
+});
diff --git a/src/kibana/components/vislib/visualizations/marker_types/base_marker.js b/src/ui/public/vislib/visualizations/marker_types/base_marker.js
similarity index 99%
rename from src/kibana/components/vislib/visualizations/marker_types/base_marker.js
rename to src/ui/public/vislib/visualizations/marker_types/base_marker.js
index 7235bc368489c..1e5cba5c7c5fc 100644
--- a/src/kibana/components/vislib/visualizations/marker_types/base_marker.js
+++ b/src/ui/public/vislib/visualizations/marker_types/base_marker.js
@@ -1,5 +1,6 @@
 define(function (require) {
-  return function MarkerFactory(d3) {
+  return function MarkerFactory() {
+    var d3 = require('d3');
     var _ = require('lodash');
     var $ = require('jquery');
     var L = require('leaflet');
diff --git a/src/kibana/components/vislib/visualizations/marker_types/geohash_grid.js b/src/ui/public/vislib/visualizations/marker_types/geohash_grid.js
similarity index 92%
rename from src/kibana/components/vislib/visualizations/marker_types/geohash_grid.js
rename to src/ui/public/vislib/visualizations/marker_types/geohash_grid.js
index 0880bd44f253e..f93b4573af53c 100644
--- a/src/kibana/components/vislib/visualizations/marker_types/geohash_grid.js
+++ b/src/ui/public/vislib/visualizations/marker_types/geohash_grid.js
@@ -3,7 +3,7 @@ define(function (require) {
     var _ = require('lodash');
     var L = require('leaflet');
 
-    var BaseMarker = Private(require('components/vislib/visualizations/marker_types/base_marker'));
+    var BaseMarker = Private(require('ui/vislib/visualizations/marker_types/base_marker'));
 
     /**
      * Map overlay: rectangles that show the geohash grid bounds
diff --git a/src/kibana/components/vislib/visualizations/marker_types/heatmap.js b/src/ui/public/vislib/visualizations/marker_types/heatmap.js
similarity index 97%
rename from src/kibana/components/vislib/visualizations/marker_types/heatmap.js
rename to src/ui/public/vislib/visualizations/marker_types/heatmap.js
index adc5f9ae5c0e8..2ce548f57c6cb 100644
--- a/src/kibana/components/vislib/visualizations/marker_types/heatmap.js
+++ b/src/ui/public/vislib/visualizations/marker_types/heatmap.js
@@ -1,10 +1,10 @@
 define(function (require) {
-  return function HeatmapMarkerFactory(Private, d3) {
+  return function HeatmapMarkerFactory(Private) {
+    var d3 = require('d3');
     var _ = require('lodash');
     var L = require('leaflet');
-    require('leaflet-heat');
 
-    var BaseMarker = Private(require('components/vislib/visualizations/marker_types/base_marker'));
+    var BaseMarker = Private(require('ui/vislib/visualizations/marker_types/base_marker'));
 
     /**
      * Map overlay: canvas layer with leaflet.heat plugin
diff --git a/src/kibana/components/vislib/visualizations/marker_types/scaled_circles.js b/src/ui/public/vislib/visualizations/marker_types/scaled_circles.js
similarity index 94%
rename from src/kibana/components/vislib/visualizations/marker_types/scaled_circles.js
rename to src/ui/public/vislib/visualizations/marker_types/scaled_circles.js
index 1766dbd7e17cd..6de9e3804f5d4 100644
--- a/src/kibana/components/vislib/visualizations/marker_types/scaled_circles.js
+++ b/src/ui/public/vislib/visualizations/marker_types/scaled_circles.js
@@ -3,7 +3,7 @@ define(function (require) {
     var _ = require('lodash');
     var L = require('leaflet');
 
-    var BaseMarker = Private(require('components/vislib/visualizations/marker_types/base_marker'));
+    var BaseMarker = Private(require('ui/vislib/visualizations/marker_types/base_marker'));
 
     /**
      * Map overlay: circle markers that are scaled to illustrate values
diff --git a/src/kibana/components/vislib/visualizations/marker_types/shaded_circles.js b/src/ui/public/vislib/visualizations/marker_types/shaded_circles.js
similarity index 95%
rename from src/kibana/components/vislib/visualizations/marker_types/shaded_circles.js
rename to src/ui/public/vislib/visualizations/marker_types/shaded_circles.js
index c56277ab7a615..eea55803ed702 100644
--- a/src/kibana/components/vislib/visualizations/marker_types/shaded_circles.js
+++ b/src/ui/public/vislib/visualizations/marker_types/shaded_circles.js
@@ -3,7 +3,7 @@ define(function (require) {
     var _ = require('lodash');
     var L = require('leaflet');
 
-    var BaseMarker = Private(require('components/vislib/visualizations/marker_types/base_marker'));
+    var BaseMarker = Private(require('ui/vislib/visualizations/marker_types/base_marker'));
 
     /**
      * Map overlay: circle markers that are shaded to illustrate values
diff --git a/src/ui/public/vislib/visualizations/pie_chart.js b/src/ui/public/vislib/visualizations/pie_chart.js
new file mode 100644
index 0000000000000..baad87fa733e0
--- /dev/null
+++ b/src/ui/public/vislib/visualizations/pie_chart.js
@@ -0,0 +1,210 @@
+define(function (require) {
+  return function PieChartFactory(Private) {
+    var d3 = require('d3');
+    var _ = require('lodash');
+    var $ = require('jquery');
+
+    var Chart = Private(require('ui/vislib/visualizations/_chart'));
+    var errors = require('ui/errors');
+
+    /**
+     * Pie Chart Visualization
+     *
+     * @class PieChart
+     * @constructor
+     * @extends Chart
+     * @param handler {Object} Reference to the Handler Class Constructor
+     * @param el {HTMLElement} HTML element to which the chart will be appended
+     * @param chartData {Object} Elasticsearch query results for this specific chart
+     */
+    _.class(PieChart).inherits(Chart);
+    function PieChart(handler, chartEl, chartData) {
+      if (!(this instanceof PieChart)) {
+        return new PieChart(handler, chartEl, chartData);
+      }
+      PieChart.Super.apply(this, arguments);
+
+      var charts = this.handler.data.getVisData();
+      this._validatePieData(charts);
+
+      this._attr = _.defaults(handler._attr || {}, {
+        isDonut: handler._attr.isDonut || false
+      });
+    }
+
+    /**
+     * Checks whether pie slices have all zero values.
+     * If so, an error is thrown.
+     */
+    PieChart.prototype._validatePieData = function (charts) {
+      var isAllZeros = charts.every(function (chart) {
+        return chart.slices.children.length === 0;
+      });
+
+      if (isAllZeros) { throw new errors.PieContainsAllZeros(); }
+    };
+
+    /**
+     * Adds Events to SVG paths
+     *
+     * @method addPathEvents
+     * @param element {D3.Selection} Reference to SVG path
+     * @returns {D3.Selection} SVG path with event listeners attached
+     */
+    PieChart.prototype.addPathEvents = function (element) {
+      var events = this.events;
+
+      return element
+        .call(events.addHoverEvent())
+        .call(events.addMouseoutEvent())
+        .call(events.addClickEvent());
+    };
+
+    PieChart.prototype.convertToPercentage = function (slices) {
+      (function assignPercentages(slices) {
+        if (slices.sumOfChildren != null) return;
+
+        var parent = slices;
+        var children = parent.children;
+        var parentPercent = parent.percentOfParent;
+
+        var sum = parent.sumOfChildren = Math.abs(children.reduce(function (sum, child) {
+          return sum + Math.abs(child.size);
+        }, 0));
+
+        children.forEach(function (child) {
+          child.percentOfGroup = Math.abs(child.size) / sum;
+          child.percentOfParent = child.percentOfGroup;
+
+          if (parentPercent != null) {
+            child.percentOfParent *= parentPercent;
+          }
+
+          if (child.children) {
+            assignPercentages(child);
+          }
+        });
+      }(slices));
+    };
+
+    /**
+     * Adds pie paths to SVG
+     *
+     * @method addPath
+     * @param width {Number} Width of SVG
+     * @param height {Number} Height of SVG
+     * @param svg {HTMLElement} Chart SVG
+     * @param slices {Object} Chart data
+     * @returns {D3.Selection} SVG with paths attached
+     */
+    PieChart.prototype.addPath = function (width, height, svg, slices) {
+      var self = this;
+      var marginFactor = 0.95;
+      var isDonut = self._attr.isDonut;
+      var radius = (Math.min(width, height) / 2) * marginFactor;
+      var color = self.handler.data.getPieColorFunc();
+      var tooltip = self.tooltip;
+      var isTooltip = self._attr.addTooltip;
+
+      var partition = d3.layout.partition()
+      .sort(null)
+      .value(function (d) {
+        return d.percentOfParent * 100;
+      });
+      var x = d3.scale.linear()
+      .range([0, 2 * Math.PI]);
+      var y = d3.scale.sqrt()
+      .range([0, radius]);
+      var arc = d3.svg.arc()
+      .startAngle(function (d) {
+        return Math.max(0, Math.min(2 * Math.PI, x(d.x)));
+      })
+      .endAngle(function (d) {
+        return Math.max(0, Math.min(2 * Math.PI, x(d.x + d.dx)));
+      })
+      .innerRadius(function (d) {
+        // option for a single layer, i.e pie chart
+        if (d.depth === 1 && !isDonut) {
+          // return no inner radius
+          return 0;
+        }
+
+        return Math.max(0, y(d.y));
+      })
+      .outerRadius(function (d) {
+        return Math.max(0, y(d.y + d.dy));
+      });
+
+      var path = svg
+      .datum(slices)
+      .selectAll('path')
+      .data(partition.nodes)
+      .enter()
+        .append('path')
+        .attr('d', arc)
+        .attr('class', function (d) {
+          if (d.depth === 0) { return; }
+          return 'slice';
+        })
+        .call(self._addIdentifier, 'name')
+        .style('stroke', '#fff')
+        .style('fill', function (d) {
+          if (d.depth === 0) { return 'none'; }
+          return color(d.name);
+        });
+
+      if (isTooltip) {
+        path.call(tooltip.render());
+      }
+
+      return path;
+    };
+
+    PieChart.prototype._validateContainerSize = function (width, height) {
+      var minWidth = 20;
+      var minHeight = 20;
+
+      if (width <= minWidth || height <= minHeight) {
+        throw new errors.ContainerTooSmall();
+      }
+    };
+
+    /**
+     * Renders d3 visualization
+     *
+     * @method draw
+     * @returns {Function} Creates the pie chart
+     */
+    PieChart.prototype.draw = function () {
+      var self = this;
+
+      return function (selection) {
+        selection.each(function (data) {
+          var slices = data.slices;
+          var div = d3.select(this);
+          var width = $(this).width();
+          var height = $(this).height();
+          var path;
+
+          if (!slices.children.length) return;
+
+          self.convertToPercentage(slices);
+          self._validateContainerSize(width, height);
+
+          var svg = div.append('svg')
+          .attr('width', width)
+          .attr('height', height)
+          .append('g')
+          .attr('transform', 'translate(' + width / 2 + ',' + height / 2 + ')');
+
+          path = self.addPath(width, height, svg, slices);
+          self.addPathEvents(path);
+
+          return svg;
+        });
+      };
+    };
+
+    return PieChart;
+  };
+});
diff --git a/src/ui/public/vislib/visualizations/tile_map.js b/src/ui/public/vislib/visualizations/tile_map.js
new file mode 100644
index 0000000000000..c8928ade857c5
--- /dev/null
+++ b/src/ui/public/vislib/visualizations/tile_map.js
@@ -0,0 +1,128 @@
+define(function (require) {
+  return function TileMapFactory(Private) {
+    var d3 = require('d3');
+    var _ = require('lodash');
+    var $ = require('jquery');
+
+    var Chart = Private(require('ui/vislib/visualizations/_chart'));
+    var Map = Private(require('ui/vislib/visualizations/_map'));
+
+    /**
+     * Tile Map Visualization: renders maps
+     *
+     * @class TileMap
+     * @constructor
+     * @extends Chart
+     * @param handler {Object} Reference to the Handler Class Constructor
+     * @param chartEl {HTMLElement} HTML element to which the map will be appended
+     * @param chartData {Object} Elasticsearch query results for this map
+     */
+    _.class(TileMap).inherits(Chart);
+    function TileMap(handler, chartEl, chartData) {
+      if (!(this instanceof TileMap)) {
+        return new TileMap(handler, chartEl, chartData);
+      }
+
+      TileMap.Super.apply(this, arguments);
+
+      // track the map objects
+      this.maps = [];
+      this._chartData = chartData || {};
+      _.assign(this, this._chartData);
+
+      this._appendGeoExtents();
+    }
+
+    /**
+     * Draws tile map, called on chart render
+     *
+     * @method draw
+     * @return {Function} - function to add a map to a selection
+     */
+    TileMap.prototype.draw = function () {
+      var self = this;
+
+      // clean up old maps
+      self.destroy();
+
+      return function (selection) {
+        selection.each(function () {
+          self._appendMap(this);
+        });
+      };
+    };
+
+    /**
+     * Invalidate the size of the map, so that leaflet will resize to fit.
+     * then moves to center
+     *
+     * @method resizeArea
+     * @return {undefined}
+     */
+    TileMap.prototype.resizeArea = function () {
+      this.maps.forEach(function (map) {
+        map.updateSize();
+      });
+    };
+
+    /**
+     * clean up the maps
+     *
+     * @method destroy
+     * @return {undefined}
+     */
+    TileMap.prototype.destroy = function () {
+      this.maps = this.maps.filter(function (map) {
+        map.destroy();
+      });
+    };
+
+    /**
+     * Adds allmin and allmax properties to geoJson data
+     *
+     * @method _appendMap
+     * @param selection {Object} d3 selection
+     */
+    TileMap.prototype._appendGeoExtents = function () {
+      // add allmin and allmax to geoJson
+      var geoMinMax = this.handler.data.getGeoExtents();
+      this.geoJson.properties.allmin = geoMinMax.min;
+      this.geoJson.properties.allmax = geoMinMax.max;
+    };
+
+    /**
+     * Renders map
+     *
+     * @method _appendMap
+     * @param selection {Object} d3 selection
+     */
+    TileMap.prototype._appendMap = function (selection) {
+      var container = $(selection).addClass('tilemap');
+
+      var map = new Map(container, this._chartData, {
+        // center: this._attr.mapCenter,
+        // zoom: this._attr.mapZoom,
+        events: this.events,
+        markerType: this._attr.mapType,
+        tooltipFormatter: this.tooltipFormatter,
+        valueFormatter: this.valueFormatter,
+        attr: this._attr
+      });
+
+      // add title for splits
+      if (this.title) {
+        map.addTitle(this.title);
+      }
+
+      // add fit to bounds control
+      if (_.get(this.geoJson, 'features.length') > 0) {
+        map.addFitControl();
+        map.addBoundingControl();
+      }
+
+      this.maps.push(map);
+    };
+
+    return TileMap;
+  };
+});
diff --git a/src/ui/public/vislib/visualizations/time_marker.js b/src/ui/public/vislib/visualizations/time_marker.js
new file mode 100644
index 0000000000000..840f09ee93d6c
--- /dev/null
+++ b/src/ui/public/vislib/visualizations/time_marker.js
@@ -0,0 +1,75 @@
+define(function (require) {
+  return function TimeMarkerFactory() {
+    var d3 = require('d3');
+    var dateMath = require('ui/utils/dateMath');
+
+    function TimeMarker(times, xScale, height) {
+      if (!(this instanceof TimeMarker)) {
+        return new TimeMarker(times, xScale, height);
+      }
+
+      var currentTimeArr = [{
+        'time': new Date().getTime(),
+        'class': 'time-marker',
+        'color': '#c80000',
+        'opacity': 0.3,
+        'width': 2
+      }];
+
+      this.xScale = xScale;
+      this.height = height;
+      this.times = (times.length) ? times.map(function (d) {
+        return {
+          'time': dateMath.parse(d.time),
+          'class': d.class || 'time-marker',
+          'color': d.color || '#c80000',
+          'opacity': d.opacity || 0.3,
+          'width': d.width || 2
+        };
+      }) : currentTimeArr;
+    }
+
+    TimeMarker.prototype._isTimeBasedChart = function (selection) {
+      var data = selection.data();
+      return data.every(function (datum) {
+        return (datum.ordered && datum.ordered.date);
+      });
+    };
+
+    TimeMarker.prototype.render = function (selection) {
+      var self = this;
+
+      // return if not time based chart
+      if (!self._isTimeBasedChart(selection)) return;
+
+      selection.each(function () {
+        d3.select(this).selectAll('time-marker')
+          .data(self.times)
+          .enter().append('line')
+          .attr('class', function (d) {
+            return d.class;
+          })
+          .attr('pointer-events', 'none')
+          .attr('stroke', function (d) {
+            return d.color;
+          })
+          .attr('stroke-width', function (d) {
+            return d.width;
+          })
+          .attr('stroke-opacity', function (d) {
+            return d.opacity;
+          })
+          .attr('x1', function (d) {
+            return self.xScale(d.time);
+          })
+          .attr('x2', function (d) {
+            return self.xScale(d.time);
+          })
+          .attr('y1', self.height)
+          .attr('y2', self.xScale.range()[0]);
+      });
+    };
+
+    return TimeMarker;
+  };
+});
diff --git a/src/ui/public/vislib/visualizations/vis_types.js b/src/ui/public/vislib/visualizations/vis_types.js
new file mode 100644
index 0000000000000..3660a7b0d484b
--- /dev/null
+++ b/src/ui/public/vislib/visualizations/vis_types.js
@@ -0,0 +1,21 @@
+define(function (require) {
+  return function VisTypeFactory(Private) {
+
+    /**
+     * Provides the visualizations for the vislib
+     *
+     * @module vislib
+     * @submodule VisTypeFactory
+     * @param Private {Object} Loads any function as an angular module
+     * @return {Function} Returns an Object of Visualization classes
+     */
+    return {
+      histogram: Private(require('ui/vislib/visualizations/column_chart')),
+      pie: Private(require('ui/vislib/visualizations/pie_chart')),
+      line: Private(require('ui/vislib/visualizations/line_chart')),
+      area: Private(require('ui/vislib/visualizations/area_chart')),
+      tile_map: Private(require('ui/vislib/visualizations/tile_map'))
+    };
+  };
+
+});
\ No newline at end of file
diff --git a/src/ui/public/vislib_vis_type/VislibRenderbot.js b/src/ui/public/vislib_vis_type/VislibRenderbot.js
new file mode 100644
index 0000000000000..b20a688cae726
--- /dev/null
+++ b/src/ui/public/vislib_vis_type/VislibRenderbot.js
@@ -0,0 +1,68 @@
+module.exports = function VislibRenderbotFactory(Private) {
+  var _ = require('lodash');
+  var vislib = Private(require('ui/vislib'));
+  var Renderbot = Private(require('ui/Vis/Renderbot'));
+  var buildChartData = Private(require('ui/vislib_vis_type/buildChartData'));
+
+  _.class(VislibRenderbot).inherits(Renderbot);
+  function VislibRenderbot(vis, $el) {
+    VislibRenderbot.Super.call(this, vis, $el);
+    this._createVis();
+  }
+
+  VislibRenderbot.prototype._createVis = function () {
+    var self = this;
+
+    if (self.vislibVis) self.destroy();
+
+    self.vislibParams = self._getVislibParams();
+    self.vislibVis = new vislib.Vis(self.$el[0], self.vislibParams);
+
+    _.each(self.vis.listeners, function (listener, event) {
+      self.vislibVis.on(event, listener);
+    });
+
+    if (this.chartData) self.vislibVis.render(this.chartData);
+  };
+
+  VislibRenderbot.prototype._getVislibParams = function () {
+    var self = this;
+
+    return _.assign(
+      {},
+      self.vis.type.params.defaults,
+      { type: self.vis.type.name },
+      self.vis.params
+    );
+  };
+
+  VislibRenderbot.prototype.buildChartData = buildChartData;
+  VislibRenderbot.prototype.render = function (esResponse) {
+    this.chartData = this.buildChartData(esResponse);
+    this.vislibVis.render(this.chartData);
+  };
+
+  VislibRenderbot.prototype.destroy = function () {
+    var self = this;
+
+    var vislibVis = self.vislibVis;
+
+    _.forOwn(self.vis.listeners, function (listener, event) {
+      vislibVis.off(event, listener);
+    });
+
+    vislibVis.destroy();
+  };
+
+  VislibRenderbot.prototype.updateParams = function () {
+    var self = this;
+
+    // get full vislib params object
+    var newParams = self._getVislibParams();
+
+    // if there's been a change, replace the vis
+    if (!_.isEqual(newParams, self.vislibParams)) self._createVis();
+  };
+
+  return VislibRenderbot;
+};
diff --git a/src/ui/public/vislib_vis_type/VislibVisType.js b/src/ui/public/vislib_vis_type/VislibVisType.js
new file mode 100644
index 0000000000000..32dbb8503d99d
--- /dev/null
+++ b/src/ui/public/vislib_vis_type/VislibVisType.js
@@ -0,0 +1,34 @@
+define(function (require) {
+  return function VislibVisTypeFactory(Private) {
+    var _ = require('lodash');
+
+    require('ui/vislib');
+    var VisTypeSchemas = Private(require('ui/Vis/Schemas'));
+    var VisType = Private(require('ui/Vis/VisType'));
+    var pointSeries = Private(require('ui/agg_response/point_series/point_series'));
+    var VislibRenderbot = Private(require('ui/vislib_vis_type/VislibRenderbot'));
+
+    require('plugins/kbn_vislib_vis_types/controls/vislib_basic_options');
+    require('plugins/kbn_vislib_vis_types/controls/point_series_options');
+    require('plugins/kbn_vislib_vis_types/controls/line_interpolation_option');
+
+    _.class(VislibVisType).inherits(VisType);
+    function VislibVisType(opts) {
+      opts = opts || {};
+
+      VislibVisType.Super.call(this, opts);
+
+      if (this.responseConverter == null) {
+        this.responseConverter = pointSeries;
+      }
+
+      this.listeners = opts.listeners || {};
+    }
+
+    VislibVisType.prototype.createRenderbot = function (vis, $el) {
+      return new VislibRenderbot(vis, $el);
+    };
+
+    return VislibVisType;
+  };
+});
diff --git a/src/ui/public/vislib_vis_type/__tests__/_VislibRenderbot.js b/src/ui/public/vislib_vis_type/__tests__/_VislibRenderbot.js
new file mode 100644
index 0000000000000..3467ef7e5a487
--- /dev/null
+++ b/src/ui/public/vislib_vis_type/__tests__/_VislibRenderbot.js
@@ -0,0 +1,168 @@
+describe('renderbot', function exportWrapper() {
+  var _ = require('lodash');
+  var $ = require('jquery');
+  var ngMock = require('ngMock');
+  var expect = require('expect.js');
+  var sinon = require('auto-release-sinon');
+  var vislib;
+  var Vis;
+  var Renderbot;
+  var VislibRenderbot;
+  var normalizeChartData;
+  var mockVisType = {
+    name: 'test'
+  };
+
+  function init() {
+    ngMock.module('kibana');
+
+    ngMock.inject(function ($injector, Private) {
+      vislib = Private(require('ui/vislib'));
+      Vis = Private(require('ui/vislib/vis'));
+      Renderbot = Private(require('ui/Vis/Renderbot'));
+      VislibRenderbot = Private(require('ui/vislib_vis_type/VislibRenderbot'));
+      normalizeChartData = Private(require('ui/agg_response/index'));
+    });
+  }
+
+  beforeEach(init);
+
+  describe('creation', function () {
+    var vis = { type: mockVisType };
+    var $el = 'element';
+    var createVisStub;
+    var renderbot;
+
+    beforeEach(function () {
+      createVisStub = sinon.stub(VislibRenderbot.prototype, '_createVis', _.noop);
+      renderbot = new VislibRenderbot(vis, $el);
+    });
+
+    it('should be a Renderbot', function () {
+      expect(renderbot).to.be.a(Renderbot);
+    });
+
+    it('should create a new Vis object', function () {
+      expect(createVisStub.callCount).to.be(1);
+    });
+  });
+
+  describe('_createVis', function () {
+    var vis = {
+      type: mockVisType,
+      listeners: {
+        'test': _.noop,
+        'test2': _.noop,
+        'test3': _.noop
+      }
+    };
+    var $el = $('<div>testing</div>');
+    var listenerSpy;
+    var renderbot;
+
+    beforeEach(function () {
+      sinon.stub(VislibRenderbot.prototype, '_getVislibParams', _.constant({}));
+      listenerSpy = sinon.spy(vislib.Vis.prototype, 'on');
+      renderbot = new VislibRenderbot(vis, $el);
+    });
+
+    it('should attach listeners and set vislibVis', function () {
+      expect(listenerSpy.callCount).to.be(3);
+      expect(listenerSpy.calledWith('test', _.noop)).to.be(true);
+      expect(renderbot.vislibVis).to.be.a(Vis);
+    });
+  });
+
+  describe('param update', function () {
+    var params = { one: 'fish', two: 'fish' };
+    var vis = {
+      type: _.defaults({
+        params: {
+          defaults: params
+        }
+      }, mockVisType)
+    };
+    var $el = $('<div>testing</div>');
+    var createVisSpy;
+    var getParamsStub;
+    var renderbot;
+
+    beforeEach(function () {
+      createVisSpy = sinon.spy(VislibRenderbot.prototype, '_createVis');
+      // getParamsStub = sinon.stub(VislibRenderbot.prototype, '_getVislibParams', _identity);
+      // getParamsStub.returns(params);
+      renderbot = new VislibRenderbot(vis, $el);
+    });
+
+    it('should create a new Vis object when params change', function () {
+      // called on init
+      expect(createVisSpy.callCount).to.be(1);
+      renderbot.updateParams(_.clone(params));
+      // not called again, same params
+      expect(createVisSpy.callCount).to.be(1);
+      renderbot.vis.params = { one: 'fishy', two: 'fishy' };
+      renderbot.updateParams();
+      // called again, new params
+      expect(createVisSpy.callCount).to.be(2);
+      renderbot.updateParams();
+      // same params again, no new call
+      expect(createVisSpy.callCount).to.be(2);
+    });
+  });
+
+  describe('render', function () {
+    var vis = { type: mockVisType, isHierarchical: _.constant(false) };
+    var $el = $('<div>testing</div>');
+    var renderbot;
+    var stubs = {};
+
+    beforeEach(function () {
+      sinon.stub(VislibRenderbot.prototype, '_getVislibParams', _.constant({}));
+    });
+
+    it('should use #buildChartData', function () {
+      var renderbot = new VislibRenderbot(vis, $el);
+
+      var football = {};
+      var buildStub = sinon.stub(renderbot, 'buildChartData', _.constant(football));
+      var renderStub = sinon.stub(renderbot.vislibVis, 'render');
+
+      renderbot.render('flat data');
+      expect(renderStub.callCount).to.be(1);
+      expect(buildStub.callCount).to.be(1);
+      expect(renderStub.firstCall.args[0]).to.be(football);
+    });
+  });
+
+  describe('destroy', function () {
+    var vis = {
+      type: mockVisType,
+      listeners: {
+        'test': _.noop,
+        'test2': _.noop,
+        'test3': _.noop
+      }
+    };
+    var $el = $('<div>testing</div>');
+    var listenerSpy;
+    var renderbot;
+
+    beforeEach(function () {
+      sinon.stub(VislibRenderbot.prototype, '_getVislibParams', _.constant({}));
+      listenerSpy = sinon.spy(vislib.Vis.prototype, 'off');
+      renderbot = new VislibRenderbot(vis, $el);
+    });
+
+    it('should detatch listeners', function () {
+      renderbot.destroy();
+      expect(listenerSpy.callCount).to.be(3);
+      expect(listenerSpy.calledWith('test', _.noop)).to.be(true);
+    });
+
+    it('should destroy the vis', function () {
+      var spy = sinon.spy(renderbot.vislibVis, 'destroy');
+      renderbot.destroy();
+      expect(spy.callCount).to.be(1);
+    });
+  });
+});
diff --git a/src/ui/public/vislib_vis_type/__tests__/_buildChartData.js b/src/ui/public/vislib_vis_type/__tests__/_buildChartData.js
new file mode 100644
index 0000000000000..a623a83d08e9a
--- /dev/null
+++ b/src/ui/public/vislib_vis_type/__tests__/_buildChartData.js
@@ -0,0 +1,135 @@
+describe('renderbot#buildChartData', function () {
+  var _ = require('lodash');
+  var ngMock = require('ngMock');
+  var expect = require('expect.js');
+  var sinon = require('auto-release-sinon');
+
+  var VislibRenderbot;
+  var buildChartData;
+  var aggResponse;
+  var TableGroup;
+  var Table;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    Table = Private(require('ui/agg_response/tabify/_table'));
+    TableGroup = Private(require('ui/agg_response/tabify/_table_group'));
+    aggResponse = Private(require('ui/agg_response/index'));
+    VislibRenderbot = Private(require('ui/vislib_vis_type/VislibRenderbot'));
+    buildChartData = Private(require('ui/vislib_vis_type/buildChartData'));
+  }));
+
+  describe('for hierarchical vis', function () {
+    it('defers to hierarchical aggResponse converter', function () {
+      var football = {};
+      var renderbot = {
+        vis: {
+          isHierarchical: _.constant(true)
+        }
+      };
+
+      var stub = sinon.stub(aggResponse, 'hierarchical').returns(football);
+      expect(buildChartData.call(renderbot, football)).to.be(football);
+      expect(stub).to.have.property('callCount', 1);
+      expect(stub.firstCall.args[0]).to.be(renderbot.vis);
+      expect(stub.firstCall.args[1]).to.be(football);
+    });
+  });
+
+  describe('for point plot', function () {
+    it('calls tabify to simplify the data into a table', function () {
+      var renderbot = {
+        vis: {
+          isHierarchical: _.constant(false)
+        }
+      };
+      var football = { tables: [], hits: { total: 1 } };
+
+      var stub = sinon.stub(aggResponse, 'tabify').returns(football);
+      expect(buildChartData.call(renderbot, football)).to.eql({ rows: [], hits: 1 });
+      expect(stub).to.have.property('callCount', 1);
+      expect(stub.firstCall.args[0]).to.be(renderbot.vis);
+      expect(stub.firstCall.args[1]).to.be(football);
+    });
+
+    it('returns a single chart if the tabify response contains only a single table', function () {
+      var chart = { hits: 1, rows: [], columns: [] };
+      var renderbot = {
+        vis: {
+          isHierarchical: _.constant(false),
+          type: {
+            responseConverter: _.constant(chart)
+          }
+        }
+      };
+      var esResp = { hits: { total: 1 } };
+      var tabbed = { tables: [ new Table() ] };
+
+      sinon.stub(aggResponse, 'tabify').returns(tabbed);
+      expect(buildChartData.call(renderbot, esResp)).to.eql(chart);
+    });
+
+    it('converts table groups into rows/columns wrappers for charts', function () {
+      var chart = { hits: 1, rows: [], columns: [] };
+      var converter = sinon.stub().returns('chart');
+      var esResp = { hits: { total: 1 } };
+      var tables = [new Table(), new Table(), new Table(), new Table()];
+
+      var renderbot = {
+        vis: {
+          isHierarchical: _.constant(false),
+          type: {
+            responseConverter: converter
+          }
+        }
+      };
+
+      var tabify = sinon.stub(aggResponse, 'tabify').returns({
+        tables: [
+          {
+            aggConfig: { params: { row: true } },
+            tables: [
+              {
+                aggConfig: { params: { row: false } },
+                tables: [ tables[0] ]
+              },
+              {
+                aggConfig: { params: { row: false } },
+                tables: [ tables[1] ]
+              }
+            ]
+          },
+          {
+            aggConfig: { params: { row: true } },
+            tables: [
+              {
+                aggConfig: { params: { row: false } },
+                tables: [ tables[2] ]
+              },
+              {
+                aggConfig: { params: { row: false } },
+                tables: [ tables[3] ]
+              }
+            ]
+          }
+        ]
+      });
+
+      var chartData = buildChartData.call(renderbot, esResp);
+
+      // verify tables were converted
+      expect(converter).to.have.property('callCount', 4);
+      expect(converter.args[0][1]).to.be(tables[0]);
+      expect(converter.args[1][1]).to.be(tables[1]);
+      expect(converter.args[2][1]).to.be(tables[2]);
+      expect(converter.args[3][1]).to.be(tables[3]);
+
+      expect(chartData).to.have.property('rows');
+      expect(chartData.rows).to.have.length(2);
+      chartData.rows.forEach(function (row) {
+        expect(row).to.have.property('columns');
+        expect(row.columns).to.eql([ 'chart', 'chart' ]);
+      });
+    });
+  });
+});
diff --git a/src/ui/public/vislib_vis_type/__tests__/index.js b/src/ui/public/vislib_vis_type/__tests__/index.js
new file mode 100644
index 0000000000000..6a77a93854879
--- /dev/null
+++ b/src/ui/public/vislib_vis_type/__tests__/index.js
@@ -0,0 +1,4 @@
+describe('Vis Type', function () {
+  require('./_VislibRenderbot');
+  require('./_buildChartData');
+});
diff --git a/src/kibana/components/vislib_vis_type/buildChartData.js b/src/ui/public/vislib_vis_type/buildChartData.js
similarity index 92%
rename from src/kibana/components/vislib_vis_type/buildChartData.js
rename to src/ui/public/vislib_vis_type/buildChartData.js
index 024335b9f0419..29f956f9e9693 100644
--- a/src/kibana/components/vislib_vis_type/buildChartData.js
+++ b/src/ui/public/vislib_vis_type/buildChartData.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function VislibVisBuildChartData(Private) {
-    var aggResponse = Private(require('components/agg_response/index'));
-    var Table = Private(require('components/agg_response/tabify/_table'));
+    var aggResponse = Private(require('ui/agg_response/index'));
+    var Table = Private(require('ui/agg_response/tabify/_table'));
 
     return function (esResponse) {
       var vis = this.vis;
diff --git a/src/kibana/components/visualize/spy/_spy.html b/src/ui/public/visualize/spy.html
similarity index 100%
rename from src/kibana/components/visualize/spy/_spy.html
rename to src/ui/public/visualize/spy.html
diff --git a/src/kibana/components/visualize/spy/spy.js b/src/ui/public/visualize/spy.js
similarity index 87%
rename from src/kibana/components/visualize/spy/spy.js
rename to src/ui/public/visualize/spy.js
index f8f9375b507f8..c192bbb2a0601 100644
--- a/src/kibana/components/visualize/spy/spy.js
+++ b/src/ui/public/visualize/spy.js
@@ -1,19 +1,16 @@
 define(function (require) {
-  require('modules')
+  require('ui/modules')
     .get('app/visualize')
     .directive('visualizeSpy', function (Private, $compile) {
       var $ = require('jquery');
       var _ = require('lodash');
 
-      require('components/visualize/spy/_table');
-      require('components/visualize/spy/_req_resp_stats');
-
-      var modes = Private(require('registry/spy_modes'));
+      var modes = Private(require('ui/registry/spy_modes'));
       var defaultMode = modes.inOrder[0];
 
       return {
         restrict: 'E',
-        template: require('text!components/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/kibana/components/visualize/visualize.html b/src/ui/public/visualize/visualize.html
similarity index 100%
rename from src/kibana/components/visualize/visualize.html
rename to src/ui/public/visualize/visualize.html
diff --git a/src/kibana/components/visualize/visualize.js b/src/ui/public/visualize/visualize.js
similarity index 94%
rename from src/kibana/components/visualize/visualize.js
rename to src/ui/public/visualize/visualize.js
index 187d017879da2..af36b581a8918 100644
--- a/src/kibana/components/visualize/visualize.js
+++ b/src/ui/public/visualize/visualize.js
@@ -1,13 +1,13 @@
 define(function (require) {
-  require('modules')
+  require('ui/modules')
   .get('kibana/directive')
   .directive('visualize', function (Notifier, SavedVis, indexPatterns, Private) {
 
-    require('components/visualize/spy/spy');
-    require('css!components/visualize/visualize.css');
+    require('ui/visualize/spy');
+    require('ui/visualize/visualize.less');
     var $ = require('jquery');
     var _ = require('lodash');
-    var visTypes = Private(require('registry/vis_types'));
+    var visTypes = Private(require('ui/registry/vis_types'));
 
     var notify = new Notifier({
       location: 'Visualize'
@@ -21,7 +21,7 @@ define(function (require) {
         esResp: '=?',
         searchSource: '=?'
       },
-      template: require('text!components/visualize/visualize.html'),
+      template: require('ui/visualize/visualize.html'),
       link: function ($scope, $el, attr) {
         var chart; // set in "vis" watcher
         var minVisChartHeight = 180;
diff --git a/src/kibana/components/visualize/visualize.less b/src/ui/public/visualize/visualize.less
similarity index 77%
rename from src/kibana/components/visualize/visualize.less
rename to src/ui/public/visualize/visualize.less
index 78a9e5539d65d..53ced1c2de031 100644
--- a/src/kibana/components/visualize/visualize.less
+++ b/src/ui/public/visualize/visualize.less
@@ -1,11 +1,8 @@
-@import (reference) "../../styles/_bootstrap.less";
-@import (reference) "../../styles/theme/_theme.less";
-@import (reference) "../../styles/_variables.less";
-@import (reference) "lesshat.less";
+@import (reference) "~ui/styles/variables";
 
 visualize {
-  .display(flex);
-  .flex-direction(column);
+  display: flex;
+  flex-direction: column;
   height: 100%;
   width: 100%;
   overflow: auto;
@@ -16,7 +13,7 @@ visualize {
   }
 
   .visualize-chart {
-    .flex(1 1 auto);
+    flex: 1 1 auto;
     overflow: auto;
 
     &.spy-visible {
@@ -43,12 +40,12 @@ visualize {
 }
 
 .visualize-error {
-  .display(flex);
-  .align-items(center);
-  .justify-content(center);
-  .top { .align-self(flext-start); }
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  .top { align-self: flext-start; }
   .item { }
-  .bottom { .align-self(flext-end); }
+  .bottom { align-self: flext-end; }
 
 }
 
@@ -58,11 +55,11 @@ ul.visualizations .media-body {
 
 visualize-spy {
   // this element should flex
-  .flex(0, 0, auto);
+  flex: 0 0 auto;
 
   // it's children should also flex vertically
-  .flex-direction(column);
-  .display(flex);
+  flex-direction: column;
+  display: flex;
 
   overflow: auto;
 
@@ -71,12 +68,12 @@ visualize-spy {
   }
 
   &.only {
-    .flex(1, 1, auto);
+    flex: 1 1 auto;
     padding-top: 0px;
   }
 
   .visualize-show-spy {
-    .flex(0, 0, auto);
+    flex: 0 0 auto;
 
     border-top: 1px solid #ecf0f1;
     margin-bottom: 3px;
@@ -109,10 +106,10 @@ visualize-spy {
   }
 
   .visualize-spy-container {
-    .flex(1, 1, auto);
+    flex: 1 1 auto;
 
-    .display(flex);
-    .flex-direction(column);
+    display: flex;
+    flex-direction: column;
 
     height: 482px;
     overflow-y: auto;
@@ -122,12 +119,12 @@ visualize-spy {
     }
 
     header + * {
-      .flex(1, 1, auto);
+      flex: 1 1 auto;
       overflow: auto;
     }
 
     > .alert {
-      .flex(0, 0, auto);
+      flex: 0 0 auto;
     }
 
     tr > td {
@@ -140,7 +137,7 @@ visualize-spy {
   }
 
   .visualize-spy-nav {
-    .flex(0, 0, auto);
+    flex: 0 0 auto;
 
     a.btn {
       margin: @padding-small-vertical @padding-small-vertical;
diff --git a/src/ui/public/watch_multi/__tests__/watch_multi.js b/src/ui/public/watch_multi/__tests__/watch_multi.js
new file mode 100644
index 0000000000000..db72e78ceb72a
--- /dev/null
+++ b/src/ui/public/watch_multi/__tests__/watch_multi.js
@@ -0,0 +1,202 @@
+
+var _ = require('lodash');
+var ngMock = require('ngMock');
+var expect = require('expect.js');
+
+describe('$scope.$watchMulti', function () {
+  var sinon = require('auto-release-sinon');
+
+  var $rootScope;
+  var $scope;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function ($injector) {
+    $rootScope = $injector.get('$rootScope');
+    $scope = $rootScope.$new();
+  }));
+
+  describe('basic functionality', function () {
+    it('exposes $watchMulti on all scopes', function () {
+      expect($rootScope.$watchMulti).to.be.a('function');
+      expect($scope).to.have.property('$watchMulti', $rootScope.$watchMulti);
+
+      var $isoScope = $scope.$new(true);
+      expect($isoScope).to.have.property('$watchMulti', $rootScope.$watchMulti);
+    });
+
+    it('returns a working unwatch function', function () {
+      $scope.a = 0;
+      $scope.b = 0;
+      var triggers = 0;
+      var unwatch = $scope.$watchMulti(['a', 'b'], function () { triggers++; });
+
+      // initial watch
+      $scope.$apply();
+      expect(triggers).to.be(1);
+
+      // prove that it triggers on chagne
+      $scope.a++;
+      $scope.$apply();
+      expect(triggers).to.be(2);
+
+      // remove watchers
+      expect($scope.$$watchers).to.not.eql([]);
+      unwatch();
+      expect($scope.$$watchers).to.eql([]);
+
+      // prove that it doesn't trigger anymore
+      $scope.a++;
+      $scope.$apply();
+      expect(triggers).to.be(2);
+    });
+  });
+
+  describe('simple scope watchers', function () {
+    it('only triggers a single watch on initialization', function () {
+      var stub = sinon.stub();
+
+      $scope.$watchMulti([
+        'one',
+        'two',
+        'three'
+      ], stub);
+      $rootScope.$apply();
+
+      expect(stub.callCount).to.be(1);
+    });
+
+    it('only triggers a single watch when multiple values change', function () {
+      var stub = sinon.spy(function (a, b) {});
+
+      $scope.$watchMulti([
+        'one',
+        'two',
+        'three'
+      ], stub);
+
+      $rootScope.$apply();
+      expect(stub.callCount).to.be(1);
+
+      $scope.one = 'a';
+      $scope.two = 'b';
+      $scope.three = 'c';
+      $rootScope.$apply();
+
+      expect(stub.callCount).to.be(2);
+    });
+
+    it('passes an array of the current and previous values, in order',
+    function () {
+      var stub = sinon.spy(function (a, b) {});
+
+      $scope.one = 'a';
+      $scope.two = 'b';
+      $scope.three = 'c';
+      $scope.$watchMulti([
+        'one',
+        'two',
+        'three'
+      ], stub);
+
+      $rootScope.$apply();
+      expect(stub.firstCall.args).to.eql([
+        ['a', 'b', 'c'],
+        ['a', 'b', 'c']
+      ]);
+
+      $scope.one = 'do';
+      $scope.two = 're';
+      $scope.three = 'mi';
+      $rootScope.$apply();
+
+      expect(stub.secondCall.args).to.eql([
+        ['do', 're', 'mi'],
+        ['a', 'b', 'c']
+      ]);
+    });
+
+    it('always has an up to date value', function () {
+      var count = 0;
+
+      $scope.vals = [1, 0];
+      $scope.$watchMulti([ 'vals[0]', 'vals[1]' ], function (cur, prev) {
+        expect(cur).to.eql($scope.vals);
+        count++;
+      });
+
+      var $child = $scope.$new();
+      $child.$watch('vals[0]', function (cur) {
+        $child.vals[1] = cur;
+      });
+
+      $rootScope.$apply();
+      expect(count).to.be(2);
+    });
+  });
+
+  describe('complex watch expressions', function () {
+    var stateWatchers;
+    var firstValue;
+    var secondValue;
+
+    beforeEach(function () {
+      var firstGetter = function () {
+        return firstValue;
+      };
+
+      var secondGetter = function () {
+        return secondValue;
+      };
+
+      stateWatchers = [{
+        fn: $rootScope.$watch,
+        get: firstGetter
+      }, {
+        fn: $rootScope.$watch,
+        get: secondGetter
+      }];
+    });
+
+    it('should trigger the watcher on initialization', function () {
+      var stub = sinon.stub();
+      firstValue = 'first';
+      secondValue = 'second';
+
+      $scope.$watchMulti(stateWatchers, stub);
+      $rootScope.$apply();
+
+      expect(stub.callCount).to.be(1);
+
+      expect(stub.firstCall.args[0]).to.eql([firstValue, secondValue]);
+      expect(stub.firstCall.args[1]).to.eql([firstValue, secondValue]);
+    });
+  });
+
+  describe('nested watchers', function () {
+    it('should trigger the handler at least once', function () {
+      var $scope = $rootScope.$new();
+      $scope.$$watchers = [{
+        get: _.noop,
+        fn: _.noop,
+        eq: false,
+        last: false
+      }, {
+        get: _.noop,
+        fn: registerWatchers,
+        eq: false,
+        last: false
+      }];
+
+      var first = sinon.stub();
+      var second = sinon.stub();
+
+      function registerWatchers() {
+        $scope.$watchMulti([first, second], function () {
+          expect(first.callCount).to.be.greaterThan(0);
+          expect(second.callCount).to.be.greaterThan(0);
+        });
+      }
+      $scope.$digest();
+    });
+  });
+});
diff --git a/src/ui/public/watch_multi/watch_multi.js b/src/ui/public/watch_multi/watch_multi.js
new file mode 100644
index 0000000000000..4bfcadfacf29e
--- /dev/null
+++ b/src/ui/public/watch_multi/watch_multi.js
@@ -0,0 +1,117 @@
+define(function (require) {
+  var _ = require('lodash');
+
+  require('ui/modules').get('kibana')
+  .config(function ($provide) {
+
+    $provide.decorator('$rootScope', function ($delegate) {
+      /**
+       * Watch multiple expressions with a single callback. Along
+       * with making code simpler it also merges all of the watcher
+       * handlers within a single tick.
+       *
+       * # expression format
+       * expressions can be specified in one of the following ways:
+       * 1. string that evaluates to a value on scope. Creates a regular $watch
+       *    expression.
+       *     'someScopeValue.prop' === $scope.$watch('someScopeValue.prop', fn);
+       *
+       * 2. #1 prefixed with '[]', which uses $watchCollection rather than $watch.
+       *     '[]expr' === $scope.$watchCollection('expr', fn);
+       *
+       * 3. #1 prefixed with '=', which uses $watch with objectEquality turned on
+       *     '=expr' === $scope.$watch('expr', fn, true);
+       *
+       * 4. a function that will be called, like a normal function water
+       *
+       * 5. an object with any of the properties:
+       *   `get`: the getter called on each itteration
+       *   `deep`: a flag to turn on objectEquality in $watch
+       *   `fn`: the watch registration function ($scope.$watch or $scope.$watchCollection)
+       *
+       * @param  {array[string|function|obj]} expressions - the list of expressions to $watch
+       * @param  {Function} fn - the callback function
+       * @return {Function} - an unwatch function, just like the return value of $watch
+       */
+      $delegate.constructor.prototype.$watchMulti = function (expressions, fn) {
+        if (!_.isArray(expressions)) throw new TypeError('expected an array of expressions to watch');
+        if (!_.isFunction(fn)) throw new TypeError('expected a function that is triggered on each watch');
+
+        var $scope = this;
+        var vals = new Array(expressions.length);
+        var prev = new Array(expressions.length);
+        var fire = false;
+        var init = 0;
+        var neededInits = expressions.length;
+
+        // first, register all of the multi-watchers
+        var unwatchers = expressions.map(function (expr, i) {
+          expr = normalizeExpression($scope, expr);
+          if (!expr) return;
+
+          return expr.fn.call($scope, expr.get, function (newVal, oldVal) {
+            if (newVal === oldVal) {
+              init += 1;
+            }
+
+            vals[i] = newVal;
+            prev[i] = oldVal;
+            fire = true;
+          }, expr.deep);
+        });
+
+        // then, the watcher that checks to see if any of
+        // the other watchers triggered this cycle
+        var flip = false;
+        unwatchers.push($scope.$watch(function () {
+          if (init < neededInits) return init;
+
+          if (fire) {
+            fire = false;
+            flip = !flip;
+          }
+          return flip;
+        }, function () {
+          if (init < neededInits) return false;
+
+          fn(vals.slice(0), prev.slice(0));
+          vals.forEach(function (v, i) {
+            prev[i] = v;
+          });
+        }));
+
+        return _.partial(_.callEach, unwatchers);
+      };
+
+      function normalizeExpression($scope, expr) {
+        if (!expr) return;
+        var norm = {
+          fn: $scope.$watch,
+          deep: false
+        };
+
+        if (_.isFunction(expr)) return _.assign(norm, { get: expr });
+        if (_.isObject(expr)) return _.assign(norm, expr);
+        if (!_.isString(expr)) return;
+
+        if (expr.substr(0, 2) === '[]') {
+          return _.assign(norm, {
+            fn: $scope.$watchCollection,
+            get: expr.substr(2)
+          });
+        }
+
+        if (expr.charAt(0) === '=') {
+          return _.assign(norm, {
+            deep: true,
+            get: expr.substr(1)
+          });
+        }
+
+        return _.assign(norm, { get: expr });
+      }
+
+      return $delegate;
+    });
+  });
+});
diff --git a/src/ui/views/chrome.jade b/src/ui/views/chrome.jade
new file mode 100644
index 0000000000000..646b9bd329a45
--- /dev/null
+++ b/src/ui/views/chrome.jade
@@ -0,0 +1,16 @@
+- var j = function (o) { return JSON.stringify(o); }
+- var appName = 'kibana';
+
+block vars
+
+doctype html
+html(lang='en')
+  head
+    meta(charset='utf-8')
+    meta(http-equiv='X-UA-Compatible', content='IE=edge,chrome=1')
+    meta(name='viewport', content='width=device-width')
+    title Kibana
+    block head
+  body(kbn-chrome, id='#{appName}-body')
+    script window.__KBN__ = !{j(kibanaPayload)};
+    block content
diff --git a/src/ui/views/uiApp.jade b/src/ui/views/uiApp.jade
new file mode 100644
index 0000000000000..72b90e4e09caf
--- /dev/null
+++ b/src/ui/views/uiApp.jade
@@ -0,0 +1,7 @@
+extends ./chrome.jade
+
+block head
+  link(rel='stylesheet', href='/bundles/#{app.id}.style.css')
+
+block content
+  script(src='/bundles/#{app.id}.bundle.js' src-map='/bundles/#{app.id}.bundle.js.map')
diff --git a/src/utils/fromRoot.js b/src/utils/fromRoot.js
new file mode 100644
index 0000000000000..2ab124dd4f335
--- /dev/null
+++ b/src/utils/fromRoot.js
@@ -0,0 +1,7 @@
+var _ = require('lodash');
+var dirname = require('path').dirname;
+var join = require('path').join;
+var normalize = require('path').normalize;
+var root = require('./packageJson').__dirname;
+
+module.exports = _.flow(_.partial(join, root), normalize);
diff --git a/src/utils/packageJson.js b/src/utils/packageJson.js
new file mode 100644
index 0000000000000..e74c50ccf6727
--- /dev/null
+++ b/src/utils/packageJson.js
@@ -0,0 +1,22 @@
+var join = require('path').join;
+var existsSync = require('fs').existsSync;
+
+var packageDir;
+var packagePath;
+
+while (!packagePath || !existsSync(packagePath)) {
+  var prev = packageDir;
+  packageDir = prev ? join(prev, '..') : __dirname;
+  packagePath = join(packageDir, 'package.json');
+
+  if (prev === packageDir) {
+    // if going up a directory doesn't work, we
+    // are already at the root of the filesystem
+    throw new Error('unable to find package.json');
+  }
+}
+
+
+module.exports = require(packagePath);
+module.exports.__filename = packagePath;
+module.exports.__dirname = packageDir;
diff --git a/src/utils/pathContains.js b/src/utils/pathContains.js
new file mode 100644
index 0000000000000..874400cc9e99f
--- /dev/null
+++ b/src/utils/pathContains.js
@@ -0,0 +1,7 @@
+'use strict';
+
+let relative = require('path').relative;
+
+module.exports = function pathContains(root, child) {
+  return relative(child, root).slice(0, 2) !== '..';
+};
diff --git a/tasks/.jshintrc b/tasks/.jshintrc
deleted file mode 100644
index 2249beaf65a2f..0000000000000
--- a/tasks/.jshintrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../.jshintrc.node"
-}
\ No newline at end of file
diff --git a/tasks/build.js b/tasks/build.js
index 71793a28c346f..d0e796011ac48 100644
--- a/tasks/build.js
+++ b/tasks/build.js
@@ -3,24 +3,19 @@ module.exports = function (grunt) {
     'get_build_props',
     'clean:target',
     'clean:build',
-    'require_css_deps:copy',
     'less:build',
     'copy:kibana_src',
-    'clean:dev_only_plugins',
-    'touch_config',
-    'replace:build_props',
-    'requirejs',
+    'clean:noDistPlugins',
+
+    'webpack:build',
     'clean:unneeded_source_in_build',
-    'copy:server_src',
-    'replace_package_json',
-    'replace:dist',
+
     'copy:dist',
-    'compile_dist_readme',
+    'dist_readme',
+    'dist_package_json',
     'chmod_kibana',
     'make_plugin_dir',
     'copy:plugin_readme',
-    'describe_bundled_plugins',
-    'npm_install_kibana',
     'clean:test_from_node_modules',
     'download_node_binaries',
     'copy:versioned_dist',
diff --git a/tasks/chmod_kibana.js b/tasks/chmod_kibana.js
deleted file mode 100644
index e7f988e6ce5fd..0000000000000
--- a/tasks/chmod_kibana.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var fs = require('fs');
-var join = require('path').join;
-module.exports = function (grunt) {
-  grunt.registerTask('chmod_kibana', 'Chmods bin/kibana', function () {
-    var done = this.async();
-    var path = join(grunt.config.get('build'), 'dist', 'kibana', 'bin', 'kibana');
-    fs.chmod(path, 0755, done);
-  });
-};
diff --git a/tasks/compile_dist_readme.js b/tasks/compile_dist_readme.js
deleted file mode 100644
index 1b1dc6874c357..0000000000000
--- a/tasks/compile_dist_readme.js
+++ /dev/null
@@ -1,60 +0,0 @@
-var marked = require('marked');
-var Promise = require('bluebird');
-var join = require('path').join;
-var TextRenderer = require('marked-text-renderer');
-var _ = require('lodash');
-var fs = require('fs');
-var entities = new (require('html-entities').AllHtmlEntities)();
-
-var readFile = Promise.promisify(fs.readFile);
-var writeFile = Promise.promisify(fs.writeFile);
-
-TextRenderer.prototype.heading = function (text, level, raw) {
-  return '\n\n' + text + '\n' + _.map(text, function () { return '='; }).join('') + '\n';
-};
-
-var process = function (input) {
-  var output = input.replace(/<\!\-\- [^\-]+ \-\->/g, '\n');
-  output = marked(output);
-  return entities.decode(output);
-};
-
-module.exports = function (grunt) {
-
-  grunt.registerTask('compile_dist_readme', function () {
-    var done = this.async();
-    var root = grunt.config.get('root');
-    var build = grunt.config.get('build');
-
-    var srcReadme =  join(root, 'README.md');
-    var distReadme = join(build, 'dist', 'kibana', 'README.txt');
-
-    var srcLicense =  join(root, 'LICENSE.md');
-    var distLicense = join(build, 'dist', 'kibana', 'LICENSE.txt');
-
-    marked.setOptions({
-      renderer: new TextRenderer(),
-      tables: true,
-      breaks: false,
-      pedantic: false,
-      sanitize: false,
-      smartLists: true,
-      smartypants: false
-    });
-
-    readFile(srcReadme, 'utf-8')
-    .then(function (data) {
-      return writeFile(distReadme, process(data.toString()));
-    })
-    .then(function () {
-      return readFile(srcLicense, 'utf-8');
-    })
-    .then(function (data) {
-      return writeFile(distLicense, process(data.toString()));
-    })
-    .then(done)
-    .catch(done);
-
-  });
-
-};
diff --git a/tasks/config/clean.js b/tasks/config/clean.js
index 562a41b8b71cc..291ba4e5f4bdf 100644
--- a/tasks/config/clean.js
+++ b/tasks/config/clean.js
@@ -1,35 +1,6 @@
 module.exports = function (grunt) {
-  var notIncludedComponents = '{font-awesome,requirejs,zeroclipboard,leaflet-draw}';
   return {
     build: '<%= build %>',
-    target: '<%= target %>',
-    unneeded_source_in_build: {
-      src: [
-        // select all top level folders in bower_components
-        '<%= build %>/kibana/public/bower_components/*',
-
-        // exclude the following top level components
-        '!<%= build %>/kibana/public/bower_components/' + notIncludedComponents,
-
-        // remove the all bower_components except for notIncludedComponents, and keep the one files they need
-        '<%= build %>/kibana/public/bower_components/' + notIncludedComponents + '/*',
-        '!<%= build %>/kibana/public/bower_components/requirejs/require.js',
-        '!<%= build %>/kibana/public/bower_components/font-awesome/fonts',
-        '!<%= build %>/kibana/public/bower_components/zeroclipboard/dist',
-        '!<%= build %>/kibana/public/bower_components/leaflet-draw/dist',
-
-        // delete the contents of the dist dir, except the ZeroClipboard.swf file
-        '<%= build %>/kibana/public/bower_components/zeroclipboard/dist/*',
-        '!<%= build %>/kibana/public/bower_components/zeroclipboard/dist/ZeroClipboard.swf',
-
-        '<%= build %>/kibana/public/**/_empty_',
-        '<%= build %>/kibana/public/**/*.less',
-        '<%= build %>/kibana/public/config',
-        '<%= build %>/kibana/public/{css-builder,normalize}.js',
-        '<%= app %>/public/{css-builder,normalize}.js'
-      ]
-    },
-    dev_only_plugins: '<%= build %>/src/plugins/<%= devPlugins %>',
-    test_from_node_modules: '<%= build %>/dist/kibana/src/node_modules/**/*test*'
+    target: '<%= target %>'
   };
 };
diff --git a/tasks/config/esvm.js b/tasks/config/esvm.js
index bb3f8cba1f531..60275aa9ebc51 100644
--- a/tasks/config/esvm.js
+++ b/tasks/config/esvm.js
@@ -1,14 +1,13 @@
 module.exports = function (grunt) {
-  var join = require('path').join;
-  var rel = require('path').join.bind(null, grunt.config.get('root'));
-  var directory = join(grunt.config.get('root'), 'esvm');
-  var dataDir = join(directory, 'data_dir');
+  var resolve = require('path').resolve;
+  var directory = resolve(__dirname, '../../esvm');
+  var dataDir = resolve(directory, 'data_dir');
 
   return {
     options: {
       directory: directory,
       branch: 'master',
-      fresh: true,
+      fresh: !grunt.option('esvm-no-fresh'),
       config: {
         path: {
           data: dataDir
diff --git a/tasks/config/jade.js b/tasks/config/jade.js
deleted file mode 100644
index 72505752b3b0b..0000000000000
--- a/tasks/config/jade.js
+++ /dev/null
@@ -1,19 +0,0 @@
-module.exports = function (grunt) {
-  var path = require('path');
-
-  return {
-    options: {
-      compileDebug: false
-    },
-    clientside: {
-      files: {
-        '<%= testUtilsDir %>/istanbul_reporter/report.jade.js': '<%= testUtilsDir %>/istanbul_reporter/report.clientside.jade'
-      },
-      options: {
-        client: true,
-        amd: true,
-        namespace: false // return the template directly in the amd wrapper
-      }
-    }
-  };
-};
\ No newline at end of file
diff --git a/tasks/config/karma.js b/tasks/config/karma.js
new file mode 100644
index 0000000000000..3ba310e5eb3c5
--- /dev/null
+++ b/tasks/config/karma.js
@@ -0,0 +1,12 @@
+module.exports = function (grunt) {
+  return {
+    unit: {
+      configFile: 'karma.conf.js',
+      singleRun: true,
+      reporters: 'dots',
+      browsers: [
+        '<%= karmaBrowser %>'
+      ]
+    }
+  };
+};
diff --git a/tasks/config/less.js b/tasks/config/less.js
deleted file mode 100644
index 665ab2105472f..0000000000000
--- a/tasks/config/less.js
+++ /dev/null
@@ -1,27 +0,0 @@
-module.exports = {
-  options: {
-    sourceMapBasepath: '<%= src %>/kibana',
-    sourceMapRootpath: '/',
-    sourceMapFileInline: true,
-    ieCompat: false,
-    paths: [
-      '<%= src %>/kibana/bower_components/lesshat/build/'
-    ]
-  },
-  dev: {
-    src: '<%= lessFiles %>',
-    expand: true,
-    ext: '.css',
-    options: {
-      sourceMap: true
-    }
-  },
-  build: {
-    src: '<%= lessFiles %>',
-    expand: true,
-    ext: '.css',
-    options: {
-      sourceMap: false
-    }
-  }
-};
diff --git a/tasks/config/licenses.js b/tasks/config/licenses.js
index be8302f948568..0da8acaa22e51 100644
--- a/tasks/config/licenses.js
+++ b/tasks/config/licenses.js
@@ -4,6 +4,7 @@ module.exports = function (grunt) {
       licenses: [
         'MIT',
         'MIT*',
+        'MIT License',
         'MIT/X11',
         'new BSD, and MIT',
         'BSD',
@@ -12,6 +13,7 @@ module.exports = function (grunt) {
         'BSD-like',
         'BSD-2-Clause',
         'BSD-3-Clause',
+        'CC-BY',
         'Apache',
         'Apache*',
         'Apache v2',
@@ -22,22 +24,32 @@ module.exports = function (grunt) {
         'Apache License, v2.0',
         'ISC',
         'WTFPL',
-        'Public-Domain'
+        'Public-Domain',
+        'UNLICENSE'
       ],
       overrides: {
-        'assert-plus@0.1.5': ['MIT'],
+        'amdefine@1.0.0': ['BSD-3-Clause', 'MIT'],
         'angular-bootstrap@0.10.0': ['MIT'],
         'angular-ui-ace@0.2.3': ['MIT'],
+        'assert-plus@0.1.5': ['MIT'],
+        'color-name@1.0.0': ['UNLICENSE'],
         'commander@2.2.0': ['MIT'],
+        'css-color-names@0.0.1': ['MIT'],
+        'css-parse@1.0.4': ['MIT'],
+        'css-stringify@1.0.5': ['MIT'],
+        'css@1.0.8': ['MIT'],
+        'cycle@1.0.3': ['Public-Domain'],
+        'FileSaver@1.1.0': ['MIT'],
+        'flatten@0.0.1': ['MIT'],
+        'indexof@0.0.1': ['MIT'],
+        'inherits@1.0.0': ['ISC'],
+        'jsonpointer@1.1.0': ['MIT'],
         'leaflet@0.7.2': ['BSD-2-Clause'],
         'moment-timezone@0.0.6': ['MIT'],
-        'zeroclipboard@2.2.0': ['MIT'],
-        'FileSaver@undefined': ['MIT'],
-        'cycle@1.0.3': ['Public-Domain'],
+        'Nonsense@0.1.2': ['Public-Domain'],
         'pkginfo@0.2.3': ['MIT'],
         'uglify-js@2.2.5': ['BSD'],
-        'amdefine@0.1.1': ['BSD-3-Clause', 'MIT'],
-        'jsonpointer@1.1.0': ['MIT']
+        'zeroclipboard@2.2.0': ['MIT'],
       }
     }
   };
diff --git a/tasks/config/mocha.js b/tasks/config/mocha.js
deleted file mode 100644
index 82ccec936629a..0000000000000
--- a/tasks/config/mocha.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var config = require('../utils/server-config');
-var unitTestUrl = require('util').format('http://localhost:%d/test/unit/', config.get('kibana.server.port'));
-
-module.exports = {
-  options: {
-    log: true,
-    logErrors: true,
-    run: false,
-    page: {
-      settings: {
-        viewportSize: {
-          width: 2400,
-          height: 1250
-        }
-      }
-    }
-  },
-  unit: {
-    options: {
-      urls: [ unitTestUrl ]
-    }
-  }
-};
diff --git a/tasks/config/replace.js b/tasks/config/replace.js
index da3cb556183b6..b2bb032b53d00 100644
--- a/tasks/config/replace.js
+++ b/tasks/config/replace.js
@@ -28,14 +28,6 @@ module.exports = function (grunt) {
           dest: join(build, 'dist', 'kibana', 'src', 'config', 'index.js')
         }
       ]
-    },
-    build_props: {
-      files: [
-        {
-          src: [join(app, 'index.html')],
-          dest: join(build, 'src', 'index.html')
-        }
-      ]
     }
   };
 
diff --git a/tasks/config/requirejs.js b/tasks/config/requirejs.js
deleted file mode 100644
index 9c10dbb74466c..0000000000000
--- a/tasks/config/requirejs.js
+++ /dev/null
@@ -1,67 +0,0 @@
-module.exports = function (grunt) {
-  var config = {
-    build: {
-      options: {
-        appDir: '<%= build %>/src',
-        dir: '<%= build %>/kibana/public',
-        mainConfigFile: '<%= build %>/src/require.config.js',
-        modules: [
-          {
-            name: 'kibana',
-            excludeShallow: [
-              '../config',
-              'text!config'
-            ],
-            include: []
-          }
-        ],
-
-        optimize: 'none',
-        optimizeCss: 'none',
-        optimizeAllPluginResources: false,
-
-        removeCombined: true,
-        findNestedDependencies: true,
-        normalizeDirDefines: 'all',
-        inlineText: true,
-        skipPragmas: true,
-
-        done: function (done, output) {
-          var analysis = require('rjs-build-analysis');
-          var tree = analysis.parse(output);
-          var duplicates = analysis.duplicates(tree);
-
-          if (duplicates.length > 0) {
-            grunt.log.subhead('Duplicates found in requirejs build:');
-            grunt.log.warn(duplicates);
-            return done(new Error('r.js built duplicate modules, please check the excludes option.'));
-          } else {
-            var relative = [];
-            var bundles = tree.bundles || [];
-            bundles.forEach(function (bundle) {
-              bundle.children.forEach(function (child) {
-                if (child.match(/\.\//)) relative.push(child + ' is relative to ' + bundle.parent);
-              });
-            });
-
-            if (relative.length) {
-              grunt.log.subhead('Relative modules found in requirejs build:');
-              grunt.log.warn(relative);
-              return done(new Error('r.js build contains relative modules, duplicates probably exist'));
-            }
-          }
-
-          done();
-        }
-      }
-    }
-  };
-
-  // include bundled plugins in the build
-  var main = config.build.options.modules[0];
-  grunt.bundled_plugin_module_ids.forEach(function (moduleId) {
-    main.include.push(moduleId);
-  });
-
-  return config;
-};
diff --git a/tasks/config/run.js b/tasks/config/run.js
index 2dabd137dc34d..931bdcafe82fa 100644
--- a/tasks/config/run.js
+++ b/tasks/config/run.js
@@ -1,35 +1,14 @@
 module.exports = function (grunt) {
-  var os = require('os');
-  var arch = os.arch();
-  var platform = os.platform();
-
-  // config:
-  // wait: should task wait until the script exits before finishing
-  // ready: if not waiting, then how do we know the process is ready?
-  // quiet: ignore stdout from the process
-  // failOnError: the process is killed if output to stderr
-
-  var options = {
-    wait: false,
-    ready: /kibana server started/i,
-    quiet: true,
-    failOnError: true
-  };
-
-  var args = ['-H', '127.0.0.1'];
-
-  var config = {
-    built_kibana: {
+  return {
+    devServer: {
       options: {
         wait: false,
-        ready: /Listening/i,
-        quiet: true,
+        ready: /Server running/,
+        quiet: false,
         failOnError: false
       },
-      cmd: './target/<%= pkg.name + "-" + pkg.version %>-' + platform + '-' + arch + '/bin/kibana',
-      args: args
+      cmd: './bin/kibana',
+      args: ['--dev', '--no-watch', '--logging.json=false']
     }
   };
-
-  return config;
 };
diff --git a/tasks/config/simplemocha.js b/tasks/config/simplemocha.js
index 30709448e7e2f..0678b66c9d931 100644
--- a/tasks/config/simplemocha.js
+++ b/tasks/config/simplemocha.js
@@ -4,5 +4,11 @@ module.exports = {
     ignoreLeaks: false,
     reporter: 'dot'
   },
-  all: { src: ['<%= root %>/test/unit/{server,tasks}/**/*.js'] }
+  all: {
+    src: [
+      'src/**/__tests__/**/*.js',
+      '!src/**/public/**',
+      '!src/ui/**'
+    ]
+  }
 };
diff --git a/tasks/config/watch.js b/tasks/config/watch.js
deleted file mode 100644
index e41bfd46ece77..0000000000000
--- a/tasks/config/watch.js
+++ /dev/null
@@ -1,36 +0,0 @@
-module.exports = function (grunt) {
-  var config = {
-    less: {
-      files: [
-        '<%= app %>/**/styles/**/*.less',
-        '<%= plugins %>/*/styles/**/*.less',
-        '<%= plugins %>/*/*.less',
-        '<%= app %>/**/components/**/*.less',
-        '<%= app %>/**/components/vislib/components/styles/**/*.less',
-        '<%= src %>/*/server/plugins/status/public/styles/*.less'
-      ],
-      tasks: ['less:dev']
-    },
-
-    jade: {
-      files: [
-        '<%= unitTestDir %>/index.jade'
-      ],
-      tasks: ['jade:test']
-    },
-
-    clientside_jade: {
-      files: [
-        '<%= testUtilsDir %>/istanbul_reporter/report.clientside.jade'
-      ],
-      tasks: ['jade:clientside']
-    }
-  };
-
-  if (grunt.option('no-test-watcher')) {
-    // unset the test watcher
-    delete config.test;
-  }
-
-  return config;
-};
diff --git a/tasks/default.js b/tasks/default.js
deleted file mode 100644
index a5ded028806dd..0000000000000
--- a/tasks/default.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// Lint and build CSS
-module.exports = function (grunt) {
-  grunt.registerTask('default', ['jshint:source', 'jscs:source', 'less']);
-};
\ No newline at end of file
diff --git a/tasks/dev.js b/tasks/dev.js
deleted file mode 100644
index ac9550c402009..0000000000000
--- a/tasks/dev.js
+++ /dev/null
@@ -1,19 +0,0 @@
-module.exports = function (grunt) {
-  var _ = require('lodash');
-
-  grunt.registerTask('dev', function () {
-    var tasks = [
-      'less:dev',
-      'jade',
-      'esvm:dev',
-      'maybe_start_kibana',
-      'watch'
-    ];
-
-    if (!grunt.option('with-es')) {
-      _.pull(tasks, 'esvm:dev');
-    }
-
-    grunt.task.run(tasks);
-  });
-};
diff --git a/tasks/dist_package_json.js b/tasks/dist_package_json.js
new file mode 100644
index 0000000000000..e44f783399fbd
--- /dev/null
+++ b/tasks/dist_package_json.js
@@ -0,0 +1,19 @@
+module.exports = function (grunt) {
+  grunt.registerTask('dist_package_json', function () {
+    var path = grunt.config.process('<%= build %>/kibana/package.json');
+    var pkg = grunt.config.get('pkg');
+
+    grunt.file.write(path, JSON.stringify({
+      name: pkg.name,
+      description: pkg.description,
+      keywords: pkg.keywords,
+      version: pkg.version,
+      build: {
+        number: grunt.config.get('buildNum'),
+        sha: grunt.config.get('commitSha')
+      },
+      repository: pkg.repository,
+      dependencies: pkg.dependencies
+    }, null, '  '));
+  });
+};
diff --git a/tasks/dist_readme.js b/tasks/dist_readme.js
new file mode 100644
index 0000000000000..7c9f7441c98fe
--- /dev/null
+++ b/tasks/dist_readme.js
@@ -0,0 +1,60 @@
+var marked = require('marked');
+var Promise = require('bluebird');
+var join = require('path').join;
+var TextRenderer = require('marked-text-renderer');
+var _ = require('lodash');
+var fs = require('fs');
+var entities = new (require('html-entities').AllHtmlEntities)();
+
+var readFile = Promise.promisify(fs.readFile);
+var writeFile = Promise.promisify(fs.writeFile);
+
+TextRenderer.prototype.heading = function (text, level, raw) {
+  return '\n\n' + text + '\n' + _.map(text, function () { return '='; }).join('') + '\n';
+};
+
+var process = function (input) {
+  var output = input.replace(/<\!\-\- [^\-]+ \-\->/g, '\n');
+  output = marked(output);
+  return entities.decode(output);
+};
+
+module.exports = function (grunt) {
+
+  grunt.registerTask('dist_readme', function () {
+    var done = this.async();
+    var root = grunt.config.get('root');
+    var build = grunt.config.get('build');
+
+    var srcReadme =  join(root, 'README.md');
+    var distReadme = join(build, 'dist', 'kibana', 'README.txt');
+
+    var srcLicense =  join(root, 'LICENSE.md');
+    var distLicense = join(build, 'dist', 'kibana', 'LICENSE.txt');
+
+    marked.setOptions({
+      renderer: new TextRenderer(),
+      tables: true,
+      breaks: false,
+      pedantic: false,
+      sanitize: false,
+      smartLists: true,
+      smartypants: false
+    });
+
+    readFile(srcReadme, 'utf-8')
+    .then(function (data) {
+      return writeFile(distReadme, process(data.toString()));
+    })
+    .then(function () {
+      return readFile(srcLicense, 'utf-8');
+    })
+    .then(function (data) {
+      return writeFile(distLicense, process(data.toString()));
+    })
+    .then(done)
+    .catch(done);
+
+  });
+
+};
diff --git a/tasks/get_build_props.js b/tasks/get_build_props.js
index 242e8afe1b0c9..f6e4f4078f6c7 100644
--- a/tasks/get_build_props.js
+++ b/tasks/get_build_props.js
@@ -1,16 +1,7 @@
 module.exports = function (grunt) {
-  var Promise = require('bluebird');
-  var spawn = require('./utils/spawn');
-
+  var exec = require('child_process').execSync;
   grunt.registerTask('get_build_props', function () {
-    Promise.props({
-      sha: spawn.silent('git', ['rev-parse', 'HEAD'])(),
-      num: spawn.silent('sh', ['-c', 'git log --format="%h" | wc -l'])()
-    })
-    .then(function (props) {
-      grunt.config.set('commitSha', props.sha.trim());
-      grunt.config.set('buildNum', props.num.trim());
-    })
-    .nodeify(this.async());
+    grunt.config.set('commitSha', String(exec('git rev-parse HEAD')).trim());
+    grunt.config.set('buildNum', parseFloat(exec('git log --format="%h" | wc -l')).trim());
   });
 };
diff --git a/tasks/jenkins.js b/tasks/jenkins.js
new file mode 100644
index 0000000000000..1d429325a031b
--- /dev/null
+++ b/tasks/jenkins.js
@@ -0,0 +1,8 @@
+module.exports = function (grunt) {
+
+  grunt.registerTask('jenkins', 'Jenkins build script', [
+    'esvm:dev',
+    'test'
+  ]);
+
+};
diff --git a/tasks/kibana_server.js b/tasks/kibana_server.js
deleted file mode 100644
index b5cc1280340bc..0000000000000
--- a/tasks/kibana_server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-module.exports = function (grunt) {
-  grunt.registerTask('kibana_server', function (keepalive) {
-    var done = this.async();
-
-    require('./utils/dev_server')({
-      'logging.quiet': !grunt.option('debug') && !grunt.option('verbose'),
-      'kibana.server.port': grunt.option('port')
-    })
-    .then(function (server) {
-      grunt.log.ok('Server started: ' + server.info.uri);
-      if (keepalive !== 'keepalive') done();
-    })
-    .catch(done);
-
-  });
-};
-
diff --git a/tasks/licenses.js b/tasks/licenses.js
index 034e057148cc3..0a472bfb71814 100644
--- a/tasks/licenses.js
+++ b/tasks/licenses.js
@@ -1,6 +1,5 @@
 var _ = require('lodash');
 var npm = require('npm');
-var bowerLicense = require('bower-license');
 var npmLicense = require('license-checker');
 
 module.exports = function (grunt) {
@@ -28,30 +27,6 @@ module.exports = function (grunt) {
       return pkgInfo;
     }
 
-    function dequeue(output) {
-      checkQueueLength--;
-      _.extend(result, output);
-
-      if (!checkQueueLength) {
-        var licenseStats = _.map(result, processPackage);
-        var invalidLicenses = _.filter(licenseStats, function (pkg) { return !pkg.valid;});
-
-        if (grunt.option('only-invalid')) {
-          grunt.log.debug(JSON.stringify(invalidLicenses, null, 2));
-        } else {
-          grunt.log.debug(JSON.stringify(licenseStats, null, 2));
-        }
-
-
-        if (invalidLicenses.length) {
-          grunt.fail.warn('Non-confirming licenses: ' + _.pluck(invalidLicenses, 'name').join(', ') +
-            '. Use --only-invalid for details.', invalidLicenses.length);
-        }
-        done();
-      }
-    }
-
-    bowerLicense.init(options, dequeue);
     npmLicense.init(options, function (allDependencies) {
       // Only check production NPM dependencies, not dev
       npm.load({production: true}, function () {
@@ -73,8 +48,24 @@ module.exports = function (grunt) {
           _.each(getDependencies(npmList.dependencies), function (packageAndVersion) {
             productionDependencies[packageAndVersion] = allDependencies[packageAndVersion];
           });
-          dequeue(productionDependencies);
 
+          var licenseStats = _.map(productionDependencies, processPackage);
+          var invalidLicenses = _.filter(licenseStats, function (pkg) { return !pkg.valid;});
+
+          if (!grunt.option('only-invalid')) {
+            grunt.log.debug(JSON.stringify(licenseStats, null, 2));
+          }
+
+
+          if (invalidLicenses.length) {
+            grunt.log.debug(JSON.stringify(invalidLicenses, null, 2));
+            grunt.fail.warn(
+              'Non-confirming licenses: ' + _.pluck(invalidLicenses, 'name').join(', '),
+              invalidLicenses.length
+            );
+          }
+
+          done();
         });
       });
     });
diff --git a/tasks/maybeStartKibana.js b/tasks/maybeStartKibana.js
new file mode 100644
index 0000000000000..3efa0f0be6e5c
--- /dev/null
+++ b/tasks/maybeStartKibana.js
@@ -0,0 +1,57 @@
+module.exports = function (grunt) {
+  var maybeStartServer = function (options) {
+    return function () {
+      var http = require('http');
+      var opts = {
+        method: 'HEAD',
+        path: '/api/status',
+        host: 'localhost',
+        port: options.port
+      };
+
+      grunt.log.debug('checking for server', JSON.stringify(opts));
+
+      var req = http.request(opts);
+
+      function onResponse(res) {
+        grunt.log.debug('Server responded with', res.statusCode);
+        if (res.statusCode === 200 && res.headers['x-app-name'] === 'kibana') {
+          grunt.log.ok('Kibana server already started on port', options.port);
+        } else {
+          grunt.log.error('Another server is already running on port', options.port);
+          process.exit(1);
+        }
+        done(res);
+      }
+
+      function onError(err) {
+        if (err.code !== 'ECONNREFUSED') {
+          grunt.log.error('Kibana server check failed', err);
+        }
+
+        grunt.config.set(options.name, true);
+        grunt.task.run(options.tasks);
+        done();
+      }
+
+      var done = (function (cb) {
+        return function (res) {
+          req.removeListener('error', onError);
+          req.removeListener('response', onResponse);
+          if (res) res.socket.destroy();
+          cb();
+        };
+      })(this.async());
+
+      req.on('error', onError);
+      req.on('response', onResponse);
+      req.end();
+    };
+  };
+
+  grunt.registerTask('maybeStartKibana', maybeStartServer({
+    name: 'kibana-server',
+    port: grunt.option('port') || 5601,
+    tasks: ['run:devServer']
+  }));
+};
diff --git a/tasks/maybe_start_kibana.js b/tasks/maybe_start_kibana.js
deleted file mode 100644
index 6bbeccefc036b..0000000000000
--- a/tasks/maybe_start_kibana.js
+++ /dev/null
@@ -1,59 +0,0 @@
-module.exports = function (grunt) {
-  var config = require('./utils/server-config');
-
-  var maybeStartServer = function (options) {
-    return function () {
-      var http = require('http');
-      var opts = {
-        method: 'HEAD',
-        path: '/status/health',
-        host: 'localhost',
-        port: options.port
-      };
-
-      grunt.log.debug('checking for server', JSON.stringify(opts));
-
-      var req = http.request(opts);
-
-      function onResponse(res) {
-        grunt.log.debug('Server responded with', res.statusCode);
-        if (res.statusCode === 200) {
-          grunt.log.ok('Kibana server already started on port', options.port);
-        } else {
-          grunt.log.error('Another server is already running on port', options.port);
-          process.exit(1);
-        }
-        done(res);
-      }
-
-      function onError(err) {
-        if (err.code !== 'ECONNREFUSED') {
-          grunt.log.error('Kibana server check failed', err);
-        }
-
-        grunt.config.set(options.name, true);
-        grunt.task.run(options.tasks);
-        done();
-      }
-
-      var done = (function (cb) {
-        return function (res) {
-          req.removeListener('error', onError);
-          req.removeListener('response', onResponse);
-          if (res) res.socket.destroy();
-          cb();
-        };
-      })(this.async());
-
-      req.on('error', onError);
-      req.on('response', onResponse);
-      req.end();
-    };
-  };
-
-  grunt.registerTask('maybe_start_kibana', maybeStartServer({
-    name: 'kibana-server',
-    port: grunt.option('port') || config.get('kibana.server.port'),
-    tasks: ['kibana_server']
-  }));
-};
diff --git a/tasks/replace_package_json.js b/tasks/replace_package_json.js
deleted file mode 100644
index 43330cffb3b1e..0000000000000
--- a/tasks/replace_package_json.js
+++ /dev/null
@@ -1,19 +0,0 @@
-module.exports = function (grunt) {
-  grunt.registerTask('replace_package_json', function () {
-    var path = grunt.config.process('<%= build %>/kibana/package.json');
-    var pkg = grunt.config.get('pkg');
-
-    grunt.file.write(path, JSON.stringify({
-      name: pkg.name,
-      description: pkg.description,
-      keywords: pkg.keywords,
-      version: pkg.version,
-      build: {
-        number: grunt.config.get('buildNum'),
-        sha: grunt.config.get('commitSha')
-      },
-      repository: pkg.repository,
-      dependencies: pkg.dependencies
-    }, null, '  '));
-  });
-};
diff --git a/tasks/require_css_deps.js b/tasks/require_css_deps.js
deleted file mode 100644
index 1ac7edb91aa4f..0000000000000
--- a/tasks/require_css_deps.js
+++ /dev/null
@@ -1,15 +0,0 @@
-module.exports = function (grunt) {
-  var join = require('path').join;
-
-  grunt.registerTask('require_css_deps:copy', function () {
-    [
-      'css-builder.js',
-      'normalize.js'
-    ].forEach(function (dep) {
-      grunt.file.copy(
-        join(grunt.config.get('bowerComponentsDir'), 'require-css', dep),
-        join(grunt.config.get('build'), 'src', dep)
-      );
-    });
-  });
-};
diff --git a/tasks/run_build.js b/tasks/run_build.js
deleted file mode 100644
index 6960fdec8776a..0000000000000
--- a/tasks/run_build.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var os = require('os');
-
-module.exports = function (grunt) {
-  grunt.registerTask('run_build', [
-    'build',
-    '_extract_built',
-    'run:built_kibana',
-    '_open_built_kibana',
-    'wait:built_kibana'
-  ]);
-
-  var arch = os.arch();
-  var platform = os.platform();
-  var join = require('path').join;
-  var extract = require('./utils/spawn')(
-    'tar',
-    [
-      '-xzf',
-      grunt.config.process('<%= pkg.name %>-<%= pkg.version %>-' + platform + '-' + arch + '.tar.gz')
-    ],
-    join(__dirname, '../target')
-  );
-
-  grunt.registerTask('_extract_built', function () {
-    extract().nodeify(this.async());
-  });
-
-  grunt.registerTask('_open_built_kibana', function () {
-    require('opn')('http://localhost:5601');
-  });
-};
diff --git a/tasks/test.js b/tasks/test.js
index 1214e62b0474e..17674759f10d4 100644
--- a/tasks/test.js
+++ b/tasks/test.js
@@ -6,38 +6,25 @@ module.exports = function (grunt) {
       return;
     }
 
-    var tasks = [
-      'licenses',
+    grunt.task.run(_.compact([
       'jshint:source',
       'jscs:source',
-      'maybe_start_kibana',
-      'jade',
-      'less:build',
+      'maybeStartKibana',
       'simplemocha:all',
-      'mocha:unit'
-    ];
-
-    if (process.env.TRAVIS) tasks.unshift('esvm:dev');
-
-    grunt.task.run(tasks);
+      'karma:unit'
+    ]));
   });
 
   grunt.registerTask('quick-test', function () {
     grunt.task.run([
-      'maybe_start_kibana',
+      'maybeStartKibana',
       'simplemocha:all',
-      'mocha:unit'
+      'karma:unit'
     ]);
   });
 
-  grunt.registerTask('coverage', [
-    'blanket',
-    'maybe_start_kibana',
-    'mocha:coverage'
-  ]);
-
   grunt.registerTask('test:watch', [
-    'maybe_start_kibana',
+    'maybeStartKibana',
     'watch:test'
   ]);
 };
diff --git a/tasks/touch_config.js b/tasks/touch_config.js
deleted file mode 100644
index 5c68fe034f7f7..0000000000000
--- a/tasks/touch_config.js
+++ /dev/null
@@ -1,8 +0,0 @@
-module.exports = function (grunt) {
-  var join = require('path').join;
-  grunt.registerTask('touch_config', function () {
-    var configFile = join(grunt.config.get('build'), 'src', 'config');
-    grunt.log.ok('Touching: ' + configFile);
-    grunt.file.write(configFile, 'delete this');
-  });
-};
diff --git a/tasks/travis.js b/tasks/travis.js
new file mode 100644
index 0000000000000..7b525629a4fda
--- /dev/null
+++ b/tasks/travis.js
@@ -0,0 +1,8 @@
+module.exports = function (grunt) {
+
+  grunt.registerTask('travis', 'Travis CI build script', [
+    'esvm:dev',
+    'test'
+  ]);
+
+};
diff --git a/tasks/utils/dev_server.js b/tasks/utils/dev_server.js
deleted file mode 100644
index e318fe4961d67..0000000000000
--- a/tasks/utils/dev_server.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var Kibana = require('../../');
-var devStatics = require('./dev_statics');
-
-module.exports = function (settings) {
-  var kibana = new Kibana(settings || {}, [devStatics]);
-  return kibana.listen();
-};
-
-
-if (require.main === module) {
-  module.exports();
-}
diff --git a/tasks/utils/dev_statics/index.js b/tasks/utils/dev_statics/index.js
deleted file mode 100644
index cceb463091438..0000000000000
--- a/tasks/utils/dev_statics/index.js
+++ /dev/null
@@ -1,83 +0,0 @@
-var root = require('requirefrom')('');
-var kibana = root('');
-var path = require('path');
-var glob = require('glob');
-var join = path.join;
-var rel = join.bind(null, __dirname);
-var ROOT = rel('../../../');
-var SRC = join(ROOT, 'src');
-var NODE_MODULES = join(ROOT, 'node_modules');
-var APP = join(SRC, 'kibana');
-var TEST = join(ROOT, 'test');
-var istanbul = require('./lib/istanbul');
-var amdWrapper = require('./lib/amd_wrapper');
-var kibanaSrcFilter = require('./lib/kibana_src_filter');
-
-module.exports = new kibana.Plugin({
-  name: 'dev_statics',
-
-  init: function (server, options) {
-
-
-    server.ext('onPreHandler', istanbul({ root: SRC, displayRoot: SRC, filter: kibanaSrcFilter }));
-    server.ext('onPreHandler', istanbul({ root: APP, displayRoot: SRC, filter: kibanaSrcFilter }));
-
-    server.route({
-      path: '/test/{paths*}',
-      method: 'GET',
-      handler: {
-        directory: {
-          path: TEST
-        }
-      }
-    });
-
-    server.route({
-      path: '/amd-wrap/{paths*}',
-      method: 'GET',
-      handler: amdWrapper({ root: ROOT })
-    });
-
-    server.route({
-      path: '/src/{paths*}',
-      method: 'GET',
-      handler: {
-        directory: {
-          path: SRC
-        }
-      }
-    });
-
-    server.route({
-      path: '/node_modules/{paths*}',
-      method: 'GET',
-      handler: {
-        directory: {
-          path: NODE_MODULES
-        }
-      }
-    });
-
-    server.route({
-      path: '/specs',
-      method: 'GET',
-      handler: function (request, reply) {
-        var unit = join(ROOT, '/test/unit/');
-        glob(join(unit, 'specs/**/*.js'), function (er, files) {
-          var moduleIds = files
-            .filter(function (filename) {
-              return path.basename(filename).charAt(0) !== '_';
-            })
-            .map(function (filename) {
-              return path.relative(unit, filename).replace(/\\/g, '/').replace(/\.js$/, '');
-            });
-
-          return reply(moduleIds);
-        });
-      }
-    });
-
-
-  }
-
-});
diff --git a/tasks/utils/dev_statics/lib/amd_wrapper.js b/tasks/utils/dev_statics/lib/amd_wrapper.js
deleted file mode 100644
index 1718b07fa213d..0000000000000
--- a/tasks/utils/dev_statics/lib/amd_wrapper.js
+++ /dev/null
@@ -1,44 +0,0 @@
-module.exports = function (opts) {
-
-  var root = opts.root || '/';
-  var path = require('path');
-  var fs = require('fs');
-  var random = require('lodash').sample;
-  var pathPrefix = opts.pathPrefix || '/amd-wrap/';
-
-  var rap = [
-    'yo yo yo',
-    'check it',
-    'yeeaahh!',
-    'grocery bag...'
-  ];
-
-  return function (request, reply) {
-    // only allow prefixed requests
-    if (request.path.substring(0, pathPrefix.length) !== pathPrefix) return reply.continue();
-
-    // strip the prefix and form the filename
-    var filename = path.join(root, request.path.replace('/amd-wrap/', ''));
-
-    fs.readFile(filename, 'utf8', function (err, contents) {
-      // file does not exist
-      if (err) {
-        if (err.code === 'ENOENT') {
-          return reply.continue();
-        }
-        return reply(err);
-      }
-
-      // respond with the wrapped code
-      var source = [
-        'define(function (require, exports, module) { console.log("' + random(rap) + '");',
-        contents,
-        '\n});'
-      ].join('\n');
-
-      return reply(source).code(200).type('application/javascript');
-    });
-
-  };
-
-};
diff --git a/tasks/utils/dev_statics/lib/istanbul.js b/tasks/utils/dev_statics/lib/istanbul.js
deleted file mode 100644
index 5bae6f617e5d2..0000000000000
--- a/tasks/utils/dev_statics/lib/istanbul.js
+++ /dev/null
@@ -1,92 +0,0 @@
-var Istanbul = require('istanbul');
-var i = new Istanbul.Instrumenter({
-  embedSource: true,
-  preserveComments: true,
-  noAutoWrap: true
-});
-
-module.exports = function instrumentationMiddleware(opts) {
-  var fs = require('fs');
-  var path = require('path');
-
-  // for root directory that files will be served from
-  var root = opts.root || '/';
-
-  // the root directory used to create a relative file path
-  // for display in coverage reports
-  var displayRoot = opts.displayRoot || null;
-
-  // filter the files in root that can be instrumented
-  var filter = opts.filter || function (filename) {
-    // by default only instrument *.js files
-    return /\.js$/.test(filename);
-  };
-
-  // cache filename resolution
-  var fileMap = {};
-
-  function filenameForReq(request) {
-    if (request.query.instrument == null) return false;
-
-    // expected absolute path to the file
-    var filename = path.join(root, request.path);
-
-    // shortcut for dev where we could be reloading on every save
-    if (fileMap[filename] !== void 0) return fileMap[filename];
-
-    var ret = filename;
-
-    if (!fs.existsSync(filename) || !opts.filter(filename)) {
-      ret = false;
-    }
-
-    // cache the return value for next time
-    fileMap[filename] = ret;
-    return ret;
-  }
-
-  return function (request, reply) {
-    // resolve the request to a readable filename
-    var filename = filenameForReq(request);
-    // the file either doesn't exist of it was filtered out by opts.filter
-    if (!filename) return reply.continue();
-
-
-    fs.stat(filename, function (err, stat) {
-      if (err && err.code !== 'ENOENT') return reply(err).takeover();
-
-      if (err || !stat.isFile()) {
-        // file was deleted, clear cache and move on
-        delete fileMap[filename];
-        return reply.continue();
-      }
-
-      var etag = '"' + stat.size + '-' + Number(stat.mtime) + '"';
-      if (request.headers['if-none-match'] === etag) {
-        return reply('').code(304).takeover();
-      }
-
-
-      fs.readFile(filename, 'utf8', function (err, content) {
-        if (err) {
-          return reply(err).takeover();
-        }
-
-        var source = i.instrumentSync(
-          content,
-          // make file names easier to read
-          displayRoot ? path.relative(displayRoot, filename) : filename
-        );
-
-        return reply(source)
-          .code(200)
-          .type('application/javascript')
-          .etag(etag)
-          .takeover();
-      });
-    });
-  };
-
-
-};
-
diff --git a/tasks/utils/dev_statics/lib/kibana_src_filter.js b/tasks/utils/dev_statics/lib/kibana_src_filter.js
deleted file mode 100644
index 7e2fd1956264d..0000000000000
--- a/tasks/utils/dev_statics/lib/kibana_src_filter.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = function (filename) {
-  return filename.match(/.*\/src\/.*\.js$/)
-    && !filename.match(/.*\/src\/kibana\/bower_components\/.*\.js$/)
-    && !filename.match(/.*\/src\/kibana\/utils\/(event_emitter|rison)\.js$/);
-};
diff --git a/tasks/utils/server-config.js b/tasks/utils/server-config.js
deleted file mode 100644
index 2a2b21d949dc7..0000000000000
--- a/tasks/utils/server-config.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('../../src/server/lib/config')();
diff --git a/tasks/utils/spawn.js b/tasks/utils/spawn.js
deleted file mode 100644
index 470bfafa31b24..0000000000000
--- a/tasks/utils/spawn.js
+++ /dev/null
@@ -1,60 +0,0 @@
-var Promise = require('bluebird');
-var grunt = require('grunt');
-var estream = require('event-stream');
-var cp = require('child_process');
-var path = require('path');
-
-// create a function that will spawn another process based on the args when called
-module.exports = function (cmd, args, cwd, silent) {
-  return function () {
-    var defer = Promise.defer();
-    var opts = {
-      stdio: 'pipe',
-      cwd: cwd || path.join(__dirname, '../..')
-    };
-
-    var endsWithNlRE = /\n\r?$/;
-    var relDir = opts.cwd ? path.relative(process.cwd(), opts.cwd) + ' ' : '';
-    if (!silent) grunt.log.writeln(relDir + '$ ' + cmd + ' ' + args.join(' '));
-    var childProc = cp.spawn(cmd, args, opts);
-
-    // track when we are in a series of empty lines, and use this info to limit empty lines to one
-    var empty = 0;
-    var maxEmpty = 1;
-
-    var buffer = '';
-
-    ['stdout', 'stderr'].forEach(function (stream) {
-      var out = childProc[stream]
-        .pipe(estream.split())
-        .pipe(
-          estream.map(function (line, cb) {
-            if (!line) { empty++; if (empty > maxEmpty) return; }
-            else empty = 0;
-
-            buffer += line + '\n';
-            cb(null, '  ' + line + '\n');
-          })
-        );
-
-      if (!silent) {
-        out.pipe(process[stream]);
-      }
-    });
-
-    childProc.on('close', function (code) {
-      if (code > 0) {
-        var err = new Error('Process exitted with non-zero code ' + code);
-        err.outpur = buffer;
-        defer.reject(err);
-      }
-      else defer.resolve(buffer);
-    });
-
-    return defer.promise;
-  };
-};
-
-module.exports.silent = function (cmd, args, cwd) {
-  return module.exports(cmd, args, cwd, true);
-};
\ No newline at end of file
diff --git a/tasks/version.js b/tasks/version.js
deleted file mode 100644
index 8e1eee43385bf..0000000000000
--- a/tasks/version.js
+++ /dev/null
@@ -1,31 +0,0 @@
-module.exports = function (grunt) {
-  var root = require('path').resolve.bind(null, __dirname, '..');
-  var updateVersion = require('./utils/updateVersion');
-
-  var README_PATH = root('README.md');
-  var PKG_JSON_PATH = root('package.json');
-
-  function replace(source, from, to) {
-    return String(source).split(from).join(to);
-  }
-
-  grunt.registerTask('version', function (updateExpr) {
-    var oldVersion = grunt.config.get('pkg.version');
-    var version = updateVersion(oldVersion, updateExpr);
-    grunt.log.debug('switching from %s to %s', oldVersion, version);
-
-    // update grunt config
-    grunt.config.set('pkg.version', version);
-
-    // write back to package.json
-    var pkgJson = grunt.file.read(PKG_JSON_PATH);
-    pkgJson = replace(pkgJson, JSON.stringify(oldVersion), JSON.stringify(version));
-    grunt.file.write(PKG_JSON_PATH, pkgJson);
-    grunt.log.ok('updated package.json', version);
-
-    // write the readme
-    var readme = grunt.file.read(README_PATH);
-    grunt.file.write(README_PATH, replace(readme, oldVersion, version));
-    grunt.log.ok('updated readme', version);
-  });
-};
diff --git a/test/.jshintrc b/test/.jshintrc
deleted file mode 100644
index c7a488515be93..0000000000000
--- a/test/.jshintrc
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "extends": "../.jshintrc.browser",
-  "mocha": true,
-  "globals": {
-    // expect.js
-    "expect": true,
-
-    // angular mocks
-    "module": true,
-    "inject": true
-  }
-}
\ No newline at end of file
diff --git a/test/unit/index.html b/test/unit/index.html
deleted file mode 100644
index b837817ffabf2..0000000000000
--- a/test/unit/index.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Kibana4 Tests</title>
-
-    <link rel="stylesheet" href="/node_modules/mocha/mocha.css" />
-    <script src="/node_modules/expect.js/index.js"></script>
-    <script src="/node_modules/mocha/mocha.js"></script>
-    <script src="/test/utils/Nonsense.js"></script>
-    <script src="/src/kibana/bower_components/requirejs/require.js"></script>
-    <script src="/src/kibana/require.config.js"></script>
-    <script>(function () {
-      /* globals mocha,Nonsense */
-
-      var COVERAGE = window.COVERAGE = !!(/coverage/i.test(window.location.search));
-      var DISABLE_RESIZE_CHECKER = window.DISABLE_RESIZE_CHECKER = true;
-
-      var SEED = parseFloat((window.location.search.match(/[&?]SEED=([^&]+)(?:&|$)/) || [])[1]);
-      if (isNaN(SEED)) SEED = Date.now();
-      console.log('Random-ness seed: ' + SEED);
-
-      Math.nonsense = new Nonsense(SEED);
-      Math.random = function () {
-        return Math.nonsense.frac();
-      };
-
-      require.config({
-        baseUrl: '/',
-        paths: {
-          config: '/config',
-          specList: '/specs',
-          test_utils: '../../test/utils',
-          fixtures: '../../test/unit/fixtures',
-          vislib_fixtures: '../../test/unit/specs/vislib/fixture',
-          specs: '../../test/unit/specs',
-          sinon: '../../test/utils/sinon',
-          bluebird: 'bower_components/bluebird/js/browser/bluebird',
-          angular: 'bower_components/angular-mocks/angular-mocks',
-          angular_src: 'bower_components/angular/angular'
-        },
-        shim: {
-          angular_src: {
-            deps: [
-              'jquery'
-            ]
-          },
-          angular: {
-            deps: [
-              'jquery',
-              'angular_src'
-            ],
-            exports: 'angular'
-          },
-          'angular-route': ['angular'],
-          'sinon/sinon': {
-            deps: [
-              'sinon/sinon-timers-1.8.2'
-            ],
-            exports: 'sinon'
-          }
-        },
-        waitSeconds: 6000,
-        // mark all requested files with instrument query param
-        urlArgs: COVERAGE ? 'instrument=true' : void 0
-      });
-
-      mocha.setup({
-        ui: 'bdd',
-        timeout: 5000,
-        reporter: 'html'
-      });
-
-      function setupMocha() {
-        require(['lodash', 'jquery'], function (_, $) {
-          $(function () {
-
-            var _desc = window.describe;
-            window.describe = _.wrap(_desc, unwindDescribeArrays);
-            window.describe.only = _.wrap(_desc.only, unwindDescribeArrays);
-            function unwindDescribeArrays(fn, name, body) {
-              if (!body && name && name instanceof Array) {
-                body = name[1]; name = name[0];
-              }
-
-              return fn.call(this, name, body);
-            }
-
-            if (COVERAGE) setupCoverage(runTests);
-            else runTests();
-          })
-        });
-      }
-
-      function setupCoverage(done) {
-        document.title = document.title.replace('Tests', 'Coverage');
-        require([
-          'test_utils/istanbul_reporter/reporter'
-        ], function (IstanbulReporter) {
-          mocha.reporter(IstanbulReporter);
-          done();
-        });
-      }
-
-      function runTests() {
-        require([
-          'text!specList',
-          'kibana',
-          'sinon/sinon',
-          'angular'
-        ], loadSpecs);
-      }
-
-      function loadSpecs(specListJson) {
-        var deps = JSON.parse(specListJson);
-        deps.unshift('sinon/sinon');
-        deps.unshift('kibana');
-
-        sessionStorage.clear();
-        localStorage.clear();
-
-        require(deps, bootstrap);
-      }
-
-      function bootstrap(kibana, sinon) {
-        kibana.load(function () {
-          var xhr = sinon.useFakeXMLHttpRequest();
-
-          window.mochaRunner = mocha.run().on('end', function () {
-            window.mochaResults = this.stats;
-            window.mochaResults.details = getFailedTests(this);
-            xhr.restore();
-          });
-
-          function getFailedTests(runner) {
-            var fails = [];
-            var suiteStack = [];
-
-            (function recurse(suite) {
-              suiteStack.push(suite);
-
-              (suite.tests || [])
-              .filter(function (test) {
-                return test.state && test.state !== 'passed' && test.state !== 'pending';
-              })
-              .forEach(function (test) {
-                fails.push({
-                  title: suiteStack.concat(test).reduce(function (title, suite) {
-                    if (suite.title) {
-                      return (title ? title + ' ' : '') + suite.title;
-                    } else {
-                      return title;
-                    }
-                  }, ''),
-                  err: test.err ? (test.err.stack || test.err.message) : 'unknown error'
-                });
-              });
-
-              (suite.suites || []).forEach(recurse);
-
-              suiteStack.pop();
-            }(runner.suite));
-
-            return fails;
-          }
-        });
-      }
-
-      setupMocha();
-
-    })();</script>
-  </head>
-  <body><div id="mocha"></div></body>
-</html>
diff --git a/test/unit/server/.jshintrc b/test/unit/server/.jshintrc
deleted file mode 100644
index 8aad2e019cb45..0000000000000
--- a/test/unit/server/.jshintrc
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "extends": "../../../.jshintrc.node",
-  "mocha": true
-}
diff --git a/test/unit/server/bin/plugin/plugin.js b/test/unit/server/bin/plugin/plugin.js
deleted file mode 100644
index e071c62f0d0e6..0000000000000
--- a/test/unit/server/bin/plugin/plugin.js
+++ /dev/null
@@ -1,80 +0,0 @@
-var root = require('requirefrom')('');
-var plugin = root('src/server/bin/plugin/plugin');
-var expect = require('expect.js');
-var sinon = require('sinon');
-var installer = root('src/server/bin/plugin/pluginInstaller');
-var remover = root('src/server/bin/plugin/pluginRemover');
-var settingParser = root('src/server/bin/plugin/settingParser');
-
-describe('kibana cli', function () {
-
-  describe('plugin installer', function () {
-
-    describe('commander options', function () {
-
-      var program = {
-        command: function () { return program; },
-        description: function () { return program; },
-        option: function () { return program; },
-        action: function () { return program; }
-      };
-
-      it('should define the command', function () {
-        sinon.spy(program, 'command');
-
-        plugin(program);
-        expect(program.command.calledWith('plugin')).to.be(true);
-
-        program.command.restore();
-      });
-
-      it('should define the description', function () {
-        sinon.spy(program, 'description');
-
-        plugin(program);
-        expect(program.description.calledWith('Maintain Plugins')).to.be(true);
-
-        program.description.restore();
-      });
-
-      it('should define the command line options', function () {
-        var spy = sinon.spy(program, 'option');
-
-        var options = [
-          /-i/,
-          /-r/,
-          /-s/,
-          /-u/,
-          /-t/
-        ];
-
-        plugin(program);
-
-        for (var i = 0; i < spy.callCount; i++) {
-          var call = spy.getCall(i);
-          for (var o = 0; o < options.length; o++) {
-            var option = options[o];
-            if (call.args[0].match(option)) {
-              options.splice(o, 1);
-              break;
-            }
-          }
-        }
-
-        expect(options).to.have.length(0);
-      });
-
-      it('should call the action function', function () {
-        sinon.spy(program, 'action');
-
-        plugin(program);
-        expect(program.action.calledOnce).to.be(true);
-
-        program.action.restore();
-      });
-
-    });
-
-  });
-
-});
\ No newline at end of file
diff --git a/test/unit/server/bin/plugin/pluginDownloader.js b/test/unit/server/bin/plugin/pluginDownloader.js
deleted file mode 100644
index cf889b3e6105d..0000000000000
--- a/test/unit/server/bin/plugin/pluginDownloader.js
+++ /dev/null
@@ -1,249 +0,0 @@
-var root = require('requirefrom')('');
-var expect = require('expect.js');
-var sinon = require('sinon');
-var nock = require('nock');
-var glob = require('glob');
-var rimraf = require('rimraf');
-var join = require('path').join;
-var pluginLogger = root('src/server/bin/plugin/pluginLogger');
-var pluginDownloader = root('src/server/bin/plugin/pluginDownloader');
-
-describe('kibana cli', function () {
-
-  describe('plugin downloader', function () {
-
-    var testWorkingPath = join(__dirname, '.test.data');
-    var logger;
-    var downloader;
-
-    beforeEach(function () {
-      logger = pluginLogger(false);
-      sinon.stub(logger, 'log');
-      sinon.stub(logger, 'error');
-      rimraf.sync(testWorkingPath);
-    });
-
-    afterEach(function () {
-      logger.log.restore();
-      logger.error.restore();
-      rimraf.sync(testWorkingPath);
-    });
-
-    describe('_downloadSingle', function () {
-
-      beforeEach(function () {
-        downloader = pluginDownloader({}, logger);
-      });
-
-      afterEach(function () {
-      });
-
-      it('should throw an ENOTFOUND error for a 404 error', function () {
-        var couchdb = nock('http://www.files.com')
-                .get('/plugin.tar.gz')
-                .reply(404);
-
-        var source = 'http://www.files.com/plugin.tar.gz';
-
-        var errorStub = sinon.stub();
-        return downloader._downloadSingle(source, testWorkingPath, 0, logger)
-        .catch(errorStub)
-        .then(function (data) {
-          expect(errorStub.called).to.be(true);
-          expect(errorStub.lastCall.args[0].message).to.match(/ENOTFOUND/);
-
-          var files = glob.sync('**/*', { cwd: testWorkingPath });
-          expect(files).to.eql([]);
-        });
-      });
-
-      it('should download and extract a valid plugin', function () {
-        var filename = join(__dirname, 'replies/test-plugin-master.tar.gz');
-        var couchdb = nock('http://www.files.com')
-        .defaultReplyHeaders({
-          'content-length': '10'
-        })
-        .get('/plugin.tar.gz')
-        .replyWithFile(200, filename);
-
-        var source = 'http://www.files.com/plugin.tar.gz';
-
-        return downloader._downloadSingle(source, testWorkingPath, 0, logger)
-        .then(function (data) {
-          var files = glob.sync('**/*', { cwd: testWorkingPath });
-          var expected = [
-            'README.md',
-            'index.js',
-            'package.json',
-            'public',
-            'public/app.js'
-          ];
-          expect(files.sort()).to.eql(expected.sort());
-        });
-      });
-
-      it('should abort the download and extraction for a corrupt archive.', function () {
-        var filename = join(__dirname, 'replies/corrupt.tar.gz');
-        var couchdb = nock('http://www.files.com')
-        .get('/plugin.tar.gz')
-        .replyWithFile(200, filename);
-
-        var source = 'http://www.files.com/plugin.tar.gz';
-
-        var errorStub = sinon.stub();
-        return downloader._downloadSingle(source, testWorkingPath, 0, logger)
-        .catch(errorStub)
-        .then(function (data) {
-          expect(errorStub.called).to.be(true);
-
-          var files = glob.sync('**/*', { cwd: testWorkingPath });
-          expect(files).to.eql([]);
-        });
-      });
-
-    });
-
-    describe('download', function () {
-
-      beforeEach(function () {});
-
-      afterEach(function () {});
-
-      it('should loop through bad urls until it finds a good one.', function () {
-        var filename = join(__dirname, 'replies/test-plugin-master.tar.gz');
-        var settings = {
-          urls: [
-            'http://www.files.com/badfile1.tar.gz',
-            'http://www.files.com/badfile2.tar.gz',
-            'I am a bad uri',
-            'http://www.files.com/goodfile.tar.gz'
-          ],
-          workingPath: testWorkingPath,
-          timeout: 0
-        };
-        downloader = pluginDownloader(settings, logger);
-
-        var couchdb = nock('http://www.files.com')
-        .defaultReplyHeaders({
-          'content-length': '10'
-        })
-        .get('/badfile1.tar.gz')
-        .reply(404)
-        .get('/badfile2.tar.gz')
-        .reply(404)
-        .get('/goodfile.tar.gz')
-        .replyWithFile(200, filename);
-
-        var errorStub = sinon.stub();
-        return downloader.download(settings, logger)
-        .catch(errorStub)
-        .then(function (data) {
-          expect(errorStub.called).to.be(false);
-
-          expect(logger.log.getCall(0).args[0]).to.match(/badfile1.tar.gz/);
-          expect(logger.log.getCall(1).args[0]).to.match(/badfile2.tar.gz/);
-          expect(logger.log.getCall(2).args[0]).to.match(/I am a bad uri/);
-          expect(logger.log.getCall(3).args[0]).to.match(/goodfile.tar.gz/);
-          expect(logger.log.lastCall.args[0]).to.match(/complete/i);
-
-          var files = glob.sync('**/*', { cwd: testWorkingPath });
-          var expected = [
-            'README.md',
-            'index.js',
-            'package.json',
-            'public',
-            'public/app.js'
-          ];
-          expect(files.sort()).to.eql(expected.sort());
-        });
-      });
-
-      it('should stop looping through urls when it finds a good one.', function () {
-        var filename = join(__dirname, 'replies/test-plugin-master.tar.gz');
-        var settings = {
-          urls: [
-            'http://www.files.com/badfile1.tar.gz',
-            'http://www.files.com/badfile2.tar.gz',
-            'http://www.files.com/goodfile.tar.gz',
-            'http://www.files.com/badfile3.tar.gz'
-          ],
-          workingPath: testWorkingPath,
-          timeout: 0
-        };
-        downloader = pluginDownloader(settings, logger);
-
-        var couchdb = nock('http://www.files.com')
-        .defaultReplyHeaders({
-          'content-length': '10'
-        })
-        .get('/badfile1.tar.gz')
-        .reply(404)
-        .get('/badfile2.tar.gz')
-        .reply(404)
-        .get('/goodfile.tar.gz')
-        .replyWithFile(200, filename)
-        .get('/badfile3.tar.gz')
-        .reply(404);
-
-        var errorStub = sinon.stub();
-        return downloader.download(settings, logger)
-        .catch(errorStub)
-        .then(function (data) {
-          expect(errorStub.called).to.be(false);
-
-          for (var i = 0; i < logger.log.callCount; i++) {
-            expect(logger.log.getCall(i).args[0]).to.not.match(/badfile3.tar.gz/);
-          }
-
-          var files = glob.sync('**/*', { cwd: testWorkingPath });
-          var expected = [
-            'README.md',
-            'index.js',
-            'package.json',
-            'public',
-            'public/app.js'
-          ];
-          expect(files.sort()).to.eql(expected.sort());
-        });
-      });
-
-      it('should throw an error when it doesn\'t find a good url.', function () {
-        var settings = {
-          urls: [
-            'http://www.files.com/badfile1.tar.gz',
-            'http://www.files.com/badfile2.tar.gz',
-            'http://www.files.com/badfile3.tar.gz'
-          ],
-          workingPath: testWorkingPath,
-          timeout: 0
-        };
-        downloader = pluginDownloader(settings, logger);
-
-        var couchdb = nock('http://www.files.com')
-        .defaultReplyHeaders({
-          'content-length': '10'
-        })
-        .get('/badfile1.tar.gz')
-        .reply(404)
-        .get('/badfile2.tar.gz')
-        .reply(404)
-        .get('/badfile3.tar.gz')
-        .reply(404);
-
-        var errorStub = sinon.stub();
-        return downloader.download(settings, logger)
-        .catch(errorStub)
-        .then(function (data) {
-          expect(errorStub.called).to.be(true);
-          expect(errorStub.lastCall.args[0].message).to.match(/not a valid/i);
-
-          var files = glob.sync('**/*', { cwd: testWorkingPath });
-          expect(files).to.eql([]);
-        });
-      });
-
-    });
-
-  });
-
-});
\ No newline at end of file
diff --git a/test/unit/server/bin/plugin/settingParser.js b/test/unit/server/bin/plugin/settingParser.js
deleted file mode 100644
index a5ed9ac29adbc..0000000000000
--- a/test/unit/server/bin/plugin/settingParser.js
+++ /dev/null
@@ -1,323 +0,0 @@
-var root = require('requirefrom')('');
-var settingParser = root('src/server/bin/plugin/settingParser');
-var path = require('path');
-var expect = require('expect.js');
-
-describe('kibana cli', function () {
-
-  describe('plugin installer', function () {
-
-    describe('command line option parsing', function () {
-
-      describe('parseMilliseconds function', function () {
-
-        var parser = settingParser();
-
-        it('should return 0 for an empty string', function () {
-          var value = '';
-
-          var result = parser.parseMilliseconds(value);
-
-          expect(result).to.be(0);
-        });
-
-        it('should return 0 for a number with an invalid unit of measure', function () {
-          var result = parser.parseMilliseconds('1gigablasts');
-          expect(result).to.be(0);
-        });
-
-        it('should assume a number with no unit of measure is specified as milliseconds', function () {
-          var result = parser.parseMilliseconds(1);
-          expect(result).to.be(1);
-
-          result = parser.parseMilliseconds('1');
-          expect(result).to.be(1);
-        });
-
-        it('should interpret a number with "s" as the unit of measure as seconds', function () {
-          var result = parser.parseMilliseconds('5s');
-          expect(result).to.be(5 * 1000);
-        });
-
-        it('should interpret a number with "second" as the unit of measure as seconds', function () {
-          var result = parser.parseMilliseconds('5second');
-          expect(result).to.be(5 * 1000);
-        });
-
-        it('should interpret a number with "seconds" as the unit of measure as seconds', function () {
-          var result = parser.parseMilliseconds('5seconds');
-          expect(result).to.be(5 * 1000);
-        });
-
-        it('should interpret a number with "m" as the unit of measure as minutes', function () {
-          var result = parser.parseMilliseconds('9m');
-          expect(result).to.be(9 * 1000 * 60);
-        });
-
-        it('should interpret a number with "minute" as the unit of measure as minutes', function () {
-          var result = parser.parseMilliseconds('9minute');
-          expect(result).to.be(9 * 1000 * 60);
-        });
-
-        it('should interpret a number with "minutes" as the unit of measure as minutes', function () {
-          var result = parser.parseMilliseconds('9minutes');
-          expect(result).to.be(9 * 1000 * 60);
-        });
-
-      });
-
-      describe('parse function', function () {
-
-        var options;
-        var parser;
-        beforeEach(function () {
-          options = { install: 'dummy/dummy' };
-        });
-
-        it('should require the user to specify either install and remove', function () {
-          options.install = null;
-          parser = settingParser(options);
-
-          expect(parser.parse).withArgs().to.throwError(/Please specify either --install or --remove./);
-        });
-
-        it('should not allow the user to specify both install and remove', function () {
-          options.remove = 'package';
-          options.install = 'org/package/version';
-          parser = settingParser(options);
-
-          expect(parser.parse).withArgs().to.throwError(/Please specify either --install or --remove./);
-        });
-
-        describe('quiet option', function () {
-
-          it('should default to false', function () {
-            parser = settingParser(options);
-            var settings = parser.parse(options);
-
-            expect(settings.quiet).to.be(false);
-          });
-
-          it('should set settings.quiet property to true', function () {
-            options.parent = { quiet: true };
-            parser = settingParser(options);
-            var settings = parser.parse(options);
-
-            expect(settings.quiet).to.be(true);
-          });
-
-        });
-
-        describe('silent option', function () {
-
-          it('should default to false', function () {
-            parser = settingParser(options);
-            var settings = parser.parse(options);
-
-            expect(settings).to.have.property('silent', false);
-          });
-
-          it('should set settings.silent property to true', function () {
-            options.silent = true;
-            parser = settingParser(options);
-            var settings = parser.parse(options);
-
-            expect(settings).to.have.property('silent', true);
-          });
-
-        });
-
-
-        describe('timeout option', function () {
-
-          it('should default to 0 (milliseconds)', function () {
-            parser = settingParser(options);
-            var settings = parser.parse(options);
-
-            expect(settings).to.have.property('timeout', 0);
-          });
-
-          it('should set settings.timeout property to specified value', function () {
-            options.timeout = 1234;
-            parser = settingParser(options);
-            var settings = parser.parse(options);
-
-            expect(settings).to.have.property('timeout', 1234);
-          });
-
-        });
-
-        describe('install option', function () {
-
-          it('should set settings.action property to "install"', function () {
-            options.install = 'org/package/version';
-            parser = settingParser(options);
-            var settings = parser.parse(options);
-
-            expect(settings).to.have.property('action', 'install');
-          });
-
-          it('should allow two parts to the install parameter', function () {
-            options.install = 'kibana/test-plugin';
-            parser = settingParser(options);
-
-            expect(parser.parse).withArgs().to.not.throwError();
-
-            var settings = parser.parse(options);
-
-            expect(settings).to.have.property('organization', 'kibana');
-            expect(settings).to.have.property('package', 'test-plugin');
-            expect(settings).to.have.property('version', undefined);
-          });
-
-          it('should allow three parts to the install parameter', function () {
-            options.install = 'kibana/test-plugin/v1.0.1';
-            parser = settingParser(options);
-
-            expect(parser.parse).withArgs().to.not.throwError();
-
-            var settings = parser.parse(options);
-
-            expect(settings).to.have.property('organization', 'kibana');
-            expect(settings).to.have.property('package', 'test-plugin');
-            expect(settings).to.have.property('version', 'v1.0.1');
-          });
-
-          it('should not allow one part to the install parameter', function () {
-            options.install = 'test-plugin';
-            parser = settingParser(options);
-
-            expect(parser.parse).withArgs().to.throwError(/Invalid install option. Please use the format <org>\/<plugin>\/<version>./);
-          });
-
-          it('should not allow more than three parts to the install parameter', function () {
-            options.install = 'kibana/test-plugin/v1.0.1/dummy';
-            parser = settingParser(options);
-
-            expect(parser.parse).withArgs().to.throwError(/Invalid install option. Please use the format <org>\/<plugin>\/<version>./);
-          });
-
-          it('should populate the urls collection properly when no version specified', function () {
-            options.install = 'kibana/test-plugin';
-            parser = settingParser(options);
-
-            var settings = parser.parse();
-
-            expect(settings.urls).to.have.property('length', 2);
-            expect(settings.urls).to.contain('https://download.elastic.co/kibana/test-plugin/test-plugin-latest.tar.gz');
-            expect(settings.urls).to.contain('https://github.com/kibana/test-plugin/archive/master.tar.gz');
-          });
-
-          it('should populate the urls collection properly version specified', function () {
-            options.install = 'kibana/test-plugin/v1.1.1';
-            parser = settingParser(options);
-
-            var settings = parser.parse();
-
-            expect(settings.urls).to.have.property('length', 2);
-            expect(settings.urls).to.contain('https://download.elastic.co/kibana/test-plugin/test-plugin-v1.1.1.tar.gz');
-            expect(settings.urls).to.contain('https://github.com/kibana/test-plugin/archive/v1.1.1.tar.gz');
-          });
-
-          it('should populate the pluginPath', function () {
-            options.install = 'kibana/test-plugin';
-            parser = settingParser(options);
-
-            var settings = parser.parse();
-            var expected = path.resolve(__dirname, '..', '..', '..', '..', '..', 'src', 'server', 'bin', 'plugins', 'test-plugin');
-
-            expect(settings).to.have.property('pluginPath', expected);
-          });
-
-          describe('with url option', function () {
-
-            it('should allow one part to the install parameter', function () {
-              options.install = 'test-plugin';
-              options.url = 'http://www.google.com/plugin.tar.gz';
-              parser = settingParser(options);
-
-              expect(parser.parse).withArgs().to.not.throwError();
-
-              var settings = parser.parse();
-
-              expect(settings).to.have.property('package', 'test-plugin');
-            });
-
-            it('should not allow more than one part to the install parameter', function () {
-              options.url = 'http://www.google.com/plugin.tar.gz';
-              options.install = 'kibana/test-plugin';
-              parser = settingParser(options);
-
-              expect(parser.parse).withArgs()
-                .to.throwError(/Invalid install option. When providing a url, please use the format <plugin>./);
-            });
-
-            it('should result in only the specified url in urls collection', function () {
-              var url = 'http://www.google.com/plugin.tar.gz';
-              options.install = 'test-plugin';
-              options.url = url;
-              parser = settingParser(options);
-
-              var settings = parser.parse();
-
-              expect(settings).to.have.property('urls');
-              expect(settings.urls).to.be.an('array');
-              expect(settings.urls).to.have.property('length', 1);
-              expect(settings.urls).to.contain(url);
-            });
-
-          });
-
-        });
-
-        describe('remove option', function () {
-
-          it('should set settings.action property to "remove"', function () {
-            options.install = null;
-            options.remove = 'package';
-            parser = settingParser(options);
-
-            var settings = parser.parse();
-
-            expect(settings).to.have.property('action', 'remove');
-          });
-
-          it('should allow one part to the remove parameter', function () {
-            options.install = null;
-            options.remove = 'test-plugin';
-            parser = settingParser(options);
-
-            var settings = parser.parse();
-
-            expect(settings).to.have.property('package', 'test-plugin');
-          });
-
-          it('should not allow more than one part to the install parameter', function () {
-            options.install = null;
-            options.remove = 'kibana/test-plugin';
-            parser = settingParser(options);
-
-            expect(parser.parse).withArgs()
-              .to.throwError(/Invalid remove option. Please use the format <plugin>./);
-          });
-
-          it('should populate the pluginPath', function () {
-            options.install = null;
-            options.remove = 'test-plugin';
-            parser = settingParser(options);
-
-            var settings = parser.parse();
-            var expected = path.resolve(__dirname, '..', '..', '..', '..', '..', 'src', 'server', 'bin', 'plugins', 'test-plugin');
-
-            expect(settings).to.have.property('pluginPath', expected);
-          });
-
-        });
-
-      });
-
-    });
-
-  });
-
-});
\ No newline at end of file
diff --git a/test/unit/server/lib/config/check_path.js b/test/unit/server/lib/config/check_path.js
deleted file mode 100644
index 134a5e105acbd..0000000000000
--- a/test/unit/server/lib/config/check_path.js
+++ /dev/null
@@ -1,18 +0,0 @@
-var root = require('requirefrom')('');
-var checkPath = root('src/server/lib/config/check_path');
-var expect = require('expect.js');
-var path = require('path');
-var _ = require('lodash');
-
-describe('checkPath(path)', function () {
-
-  it('should return true for files that exist', function () {
-    expect(checkPath(__dirname)).to.be(true);
-  });
-
-  it('should return true for files that exist', function () {
-    expect(checkPath(path.join(__dirname, 'something_fake'))).to.be(false);
-  });
-
-});
-
diff --git a/test/unit/server/lib/config/config.js b/test/unit/server/lib/config/config.js
deleted file mode 100644
index 253c5bad724ff..0000000000000
--- a/test/unit/server/lib/config/config.js
+++ /dev/null
@@ -1,215 +0,0 @@
-var root = require('requirefrom')('');
-var Config = root('src/server/lib/config/config');
-var expect = require('expect.js');
-var _ = require('lodash');
-var Joi = require('joi');
-
-/**
- * Plugins should defined a config method that takes a joi object. By default
- * it should return a way to disallow config
- *
- * Config should be newed up with a joi schema (containing defaults via joi)
- *
- * var schema = { ... }
- * new Config(schema);
- *
- */
-
-var data = {
-  test: {
-    hosts: ['host-01', 'host-02'],
-    client: {
-      type: 'datastore',
-      host: 'store-01',
-      port: 5050
-    }
-  }
-};
-
-var schema = Joi.object({
-  test: Joi.object({
-    enable: Joi.boolean().default(true),
-    hosts: Joi.array().items(Joi.string()),
-    client: Joi.object({
-      type: Joi.string().default('datastore'),
-      host: Joi.string(),
-      port: Joi.number()
-    }).default(),
-    undefValue: Joi.string()
-  }).default()
-}).default();
-
-describe('lib/config/config', function () {
-  describe('class Config()', function () {
-
-    describe('constructor', function () {
-
-      it('should not allow any config if the schema is not passed', function (done) {
-        var config = new Config();
-        var run = function () {
-          config.set('something.enable', true);
-        };
-        expect(run).to.throwException();
-        done();
-      });
-
-      it('should set defaults', function () {
-        var config = new Config(schema);
-        expect(config.get('test.enable')).to.be(true);
-        expect(config.get('test.client.type')).to.be('datastore');
-      });
-
-    });
-
-    describe('#reset(object)', function () {
-
-      var config;
-      beforeEach(function () {
-        config = new Config(schema);
-      });
-
-      it('should reset the config object with new values', function () {
-        config.set(data);
-        var newData = config.get();
-        newData.test.enable = false;
-        config.reset(newData);
-        expect(config.get()).to.eql(newData);
-      });
-
-    });
-
-    describe('#has(key)', function () {
-
-      var config;
-      beforeEach(function () {
-        config = new Config(schema);
-      });
-
-      it('should return true for fields that exist in the schema', function () {
-        expect(config.has('test.undefValue')).to.be(true);
-      });
-
-      it('should return true for partial objects that exist in the schema', function () {
-        expect(config.has('test.client')).to.be(true);
-      });
-
-      it('should return false for fields that do not exist in the schema', function () {
-        expect(config.has('test.client.pool')).to.be(false);
-      });
-
-    });
-
-    describe('#set(key, value)', function () {
-      var config;
-
-      beforeEach(function () {
-        config = new Config(schema);
-      });
-
-      it('should use a key and value to set a config value', function () {
-        config.set('test.enable', false);
-        expect(config.get('test.enable')).to.be(false);
-      });
-
-      it('should use an object to set config values', function () {
-        var hosts = ['host-01', 'host-02'];
-        config.set({ test: { enable: false, hosts: hosts } });
-        expect(config.get('test.enable')).to.be(false);
-        expect(config.get('test.hosts')).to.eql(hosts);
-      });
-
-      it('should use a flatten object to set config values', function () {
-        var hosts = ['host-01', 'host-02'];
-        config.set({ 'test.enable': false, 'test.hosts': hosts });
-        expect(config.get('test.enable')).to.be(false);
-        expect(config.get('test.hosts')).to.eql(hosts);
-      });
-
-      it('should override values with just the values present', function () {
-        var newData = _.cloneDeep(data);
-        config.set(data);
-        newData.test.enable = false;
-        config.set({ test: { enable: false } });
-        expect(config.get()).to.eql(newData);
-      });
-
-      it('should thow an exception when setting a value with the wrong type', function (done) {
-        var run = function () {
-          config.set('test.enable', 'something');
-        };
-        expect(run).to.throwException(function (err) {
-          expect(err).to.have.property('name', 'ValidationError');
-          expect(err.details[0].message).to.be('"enable" must be a boolean');
-          done();
-        });
-      });
-
-
-    });
-
-    describe('#get(key)', function () {
-
-      var config;
-
-      beforeEach(function () {
-        config = new Config(schema);
-        config.set(data);
-      });
-
-      it('should return the whole config object when called without a key', function () {
-        var newData = _.cloneDeep(data);
-        newData.test.enable = true;
-        expect(config.get()).to.eql(newData);
-      });
-
-      it('should return the value using dot notation', function () {
-        expect(config.get('test.enable')).to.be(true);
-      });
-
-      it('should return the clone of partial object using dot notation', function () {
-        expect(config.get('test.client')).to.not.be(data.test.client);
-        expect(config.get('test.client')).to.eql(data.test.client);
-      });
-
-      it('should throw exception for unknown config values', function () {
-        var run = function () {
-          config.get('test.does.not.exist');
-        };
-        expect(run).to.throwException(/Unknown config key: test.does.not.exist/);
-      });
-
-      it('should not throw exception for undefined known config values', function () {
-        var run = function getUndefValue() {
-          config.get('test.undefValue');
-        };
-        expect(run).to.not.throwException();
-      });
-
-    });
-
-    describe('#extendSchema(key, schema)', function () {
-      var config;
-      beforeEach(function () {
-        config = new Config(schema);
-      });
-
-      it('should allow you to extend the schema at the top level', function () {
-        var newSchema = Joi.object({ test: Joi.boolean().default(true) }).default();
-        config.extendSchema('myTest', newSchema);
-        expect(config.get('myTest.test')).to.be(true);
-      });
-
-      it('should NOT allow you to extend the schema if somethign else is there', function () {
-        var newSchema = Joi.object({ test: Joi.boolean().default(true) }).default();
-        config.extendSchema('test', newSchema);
-        var run = function () {
-          config.get('test.test');
-        };
-        expect(run).to.throwException();
-      });
-
-    });
-
-  });
-});
-
diff --git a/test/unit/server/lib/config/explode_by.js b/test/unit/server/lib/config/explode_by.js
deleted file mode 100644
index c93abc38ebe14..0000000000000
--- a/test/unit/server/lib/config/explode_by.js
+++ /dev/null
@@ -1,33 +0,0 @@
-var root = require('requirefrom')('');
-var explodeBy = root('src/server/lib/config/explode_by');
-var expect = require('expect.js');
-
-describe('explode_by(dot, flatObject)', function () {
-
-  it('should explode a flatten object with dots', function () {
-    var flatObject = {
-      'test.enable': true,
-      'test.hosts': ['host-01', 'host-02']
-    };
-    expect(explodeBy('.', flatObject)).to.eql({
-      test: {
-        enable: true,
-        hosts: ['host-01', 'host-02']
-      }
-    });
-  });
-
-  it('should explode a flatten object with slashes', function () {
-    var flatObject = {
-      'test/enable': true,
-      'test/hosts': ['host-01', 'host-02']
-    };
-    expect(explodeBy('/', flatObject)).to.eql({
-      test: {
-        enable: true,
-        hosts: ['host-01', 'host-02']
-      }
-    });
-  });
-
-});
diff --git a/test/unit/server/lib/config/flatten_with.js b/test/unit/server/lib/config/flatten_with.js
deleted file mode 100644
index 018deb4067504..0000000000000
--- a/test/unit/server/lib/config/flatten_with.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var root = require('requirefrom')('');
-var flattenWith = root('src/server/lib/config/flatten_with');
-var expect = require('expect.js');
-
-describe('flatten_with(dot, nestedObj)', function () {
-
-  it('should flatten object with dot', function () {
-    var nestedObj = {
-      test: {
-        enable: true,
-        hosts: ['host-01', 'host-02'],
-        client: {
-          type: 'nosql',
-          pool: [{ port: 5051 }, { port: 5052 }]
-        }
-      }
-    };
-    expect(flattenWith('.', nestedObj)).to.eql({
-      'test.enable': true,
-      'test.hosts': ['host-01', 'host-02'],
-      'test.client.type': 'nosql',
-      'test.client.pool': [{ port: 5051 }, { port: 5052 }]
-    });
-  });
-
-});
-
-
diff --git a/test/unit/server/lib/config/index.js b/test/unit/server/lib/config/index.js
deleted file mode 100644
index 9676e0f5d4577..0000000000000
--- a/test/unit/server/lib/config/index.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var root = require('requirefrom')('');
-var config = root('src/server/lib/config');
-var Config = root('src/server/lib/config/config');
-var expect = require('expect.js');
-
-describe('server.config()', function (arg) {
-
-  it('should return a Config object', function () {
-    var conf = config();
-    expect(conf).to.be.an(Config);
-  });
-
-});
-
diff --git a/test/unit/server/lib/config/override.js b/test/unit/server/lib/config/override.js
deleted file mode 100644
index d6145ed3cb699..0000000000000
--- a/test/unit/server/lib/config/override.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var root = require('requirefrom')('');
-var override = root('src/server/lib/config/override');
-var expect = require('expect.js');
-
-describe('override(target, source)', function () {
-
-  it('should override the values form source to target', function () {
-    var target = {
-      test: {
-        enable: true,
-        host: ['host-01', 'host-02'],
-        client: {
-          type: 'sql'
-        }
-      }
-    };
-    var source = { test: { client: { type: 'nosql' } } };
-    expect(override(target, source)).to.eql({
-      test: {
-        enable: true,
-        host: ['host-01', 'host-02'],
-        client: {
-          type: 'nosql'
-        }
-      }
-    });
-  });
-
-});
diff --git a/test/unit/server/lib/config/schema.js b/test/unit/server/lib/config/schema.js
deleted file mode 100644
index 4cc33686908dc..0000000000000
--- a/test/unit/server/lib/config/schema.js
+++ /dev/null
@@ -1,27 +0,0 @@
-var root = require('requirefrom')('');
-var schema = root('src/server/lib/config/schema');
-var expect = require('expect.js');
-var Joi = require('joi');
-var package = root('./package.json');
-var path = require('path');
-
-describe('lib/config/schema', function () {
-
-  describe('defaults', function () {
-
-    it('should resolve the package.json', function () {
-      var results = Joi.validate({}, schema);
-      expect(results.value.kibana.package).to.eql(package);
-    });
-
-    it('should resolve the publicFolder', function () {
-      var results = Joi.validate({}, schema);
-      var publicFolder = path.resolve(__dirname, '..', '..', '..', '..', '..', 'src', 'kibana');
-      expect(results.value.kibana.publicFolder).to.eql(publicFolder);
-    });
-
-  });
-
-});
-
-
diff --git a/test/unit/server/lib/plugins/check_dependencies.js b/test/unit/server/lib/plugins/check_dependencies.js
deleted file mode 100644
index 819d58531aa1f..0000000000000
--- a/test/unit/server/lib/plugins/check_dependencies.js
+++ /dev/null
@@ -1,76 +0,0 @@
-var checkDependencies = require('../../../../../src/server/lib/plugins/check_dependencies');
-var expect = require('expect.js');
-
-describe('src/server/lib/check_dependencies', function () {
-
-  it('should return true for first -> second -> third', function () {
-    var deps = {
-      first: [],
-      second: ['first'],
-      third: ['second']
-    };
-
-    var results = checkDependencies('first', deps);
-    expect(results).to.be(true);
-  });
-
-  it('should throw an error for first -> third -> second -> first', function () {
-    var deps = {
-      first: ['third'],
-      second: ['first'],
-      third: ['second']
-    };
-
-    var run = function () {
-      checkDependencies('first', deps);
-    };
-    expect(run).to.throwException(function (e) {
-      expect(e.message).to.be('Circular dependency: first -> third -> second -> first');
-    });
-  });
-
-  it('should throw an error for first -> missing', function () {
-    var deps = {
-      first: ['missing']
-    };
-
-    var run = function () {
-      checkDependencies('first', deps);
-    };
-    expect(run).to.throwException(function (e) {
-      expect(e.message).to.be('Missing dependency: missing');
-    });
-  });
-
-  it('should throw an error for missing dependency', function () {
-    var deps = {
-      first: ['missing']
-    };
-
-    var run = function () {
-      checkDependencies('missing', deps);
-    };
-    expect(run).to.throwException(function (e) {
-      expect(e.message).to.be('Missing dependency: missing');
-    });
-  });
-
-  it('should throw an error on complex circulars', function () {
-    var deps = {
-      first: ['second', 'fifth'],
-      second: ['fourth'],
-      third: [],
-      fourth: ['third'],
-      fifth: ['sixth'],
-      sixth: ['first']
-    };
-
-    var run = function () {
-      checkDependencies('first', deps);
-    };
-    expect(run).to.throwException(function (e) {
-      expect(e.message).to.be('Circular dependency: first -> fifth -> sixth -> first');
-    });
-  });
-
-});
diff --git a/test/unit/server/lib/plugins/plugin.js b/test/unit/server/lib/plugins/plugin.js
deleted file mode 100644
index 7ec137fe1bee3..0000000000000
--- a/test/unit/server/lib/plugins/plugin.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var expect = require('expect.js');
-var Plugin = require('../../../../../src/server/lib/plugins/plugin');
-
-describe('lib/plugins/plugin', function () {
-
-  it('should assign attributes passed into the created to the object', function () {
-    var plugin = new Plugin({ name: 'test', require: ['config'] });
-    expect(plugin).to.have.property('name', 'test');
-    expect(plugin).to.have.property('require');
-    expect(plugin.require).to.eql(['config']);
-  });
-
-  it('should by default assign an empty array to the require attribute', function () {
-    var plugin = new Plugin();
-    expect(plugin).to.have.property('require');
-    expect(plugin.require).to.eql([]);
-  });
-
-  it('should by default assign a function to init attribute that rejects a promise', function (done) {
-    var plugin = new Plugin();
-    expect(plugin).to.have.property('init');
-    plugin.init().catch(function (err) {
-      expect(err.message).to.be('You must override the init function for plugins');
-      done();
-    });
-  });
-
-});
diff --git a/test/unit/server/lib/plugins/register_plugins.js b/test/unit/server/lib/plugins/register_plugins.js
deleted file mode 100644
index aba259c424893..0000000000000
--- a/test/unit/server/lib/plugins/register_plugins.js
+++ /dev/null
@@ -1,174 +0,0 @@
-var expect = require('expect.js');
-var sinon = require('sinon');
-var registerPlugins = require('../../../../../src/server/lib/plugins/register_plugins');
-var Status = require('../../../../../src/server/lib/status/status');
-var systemStatus = require('../../../../../src/server/lib/status');
-var Promise = require('bluebird');
-
-function createInit() {
-  return sinon.stub().returns(Promise.resolve());
-}
-
-describe('server/lib/register_plugins', function () {
-  var server, get;
-
-  beforeEach(function () {
-    get = sinon.stub();
-    server = {
-      register: sinon.stub(),
-      config: sinon.stub().returns({ get: get }),
-      expose: sinon.stub(),
-      log: sinon.stub()
-    };
-  });
-
-  describe('registerPlugins() wrapper', function () {
-
-    var options = { foo: 'bar' };
-
-    it('should pass server, options and next to the init function', function () {
-      var next = function (err) {
-        server.register.args[0][1](err);
-      };
-      server.register.yieldsTo('register', server, options, next);
-      var plugin = { name: 'first', init: createInit() };
-      var plugins = [plugin];
-      return registerPlugins(server, plugins).then(function () {
-        expect(plugin.init.args[0][0]).to.equal(server);
-        expect(plugin.init.args[0][1]).to.equal(options);
-      });
-    });
-
-    it('should call next() when plugin.init completes', function () {
-      var called = false;
-      var next = function (err) {
-        called = true;
-        server.register.args[0][1](err);
-      };
-      server.register.yieldsTo('register', server, options, next);
-      var plugin = { name: 'first', init: createInit() };
-      var plugins = [plugin];
-      return registerPlugins(server, plugins).then(function () {
-        expect(called).to.be(true);
-      });
-    });
-
-    it('should attach the server to the plugin', function () {
-      var next = function (err) {
-        server.register.args[0][1](err);
-      };
-      server.register.yieldsTo('register', server, options, next);
-      var plugin = { name: 'first', init: createInit() };
-      var plugins = [plugin];
-      return registerPlugins(server, plugins).then(function () {
-        expect(plugin).to.have.property('server');
-        expect(plugin.server).to.eql(server);
-      });
-    });
-
-    var greenSpy, yellowSpy, createStatus;
-    beforeEach(function () {
-      greenSpy = sinon.spy(Status.prototype, 'green');
-      yellowSpy = sinon.spy(Status.prototype, 'yellow');
-      createStatus = sinon.spy(systemStatus, 'createStatus');
-    });
-
-    afterEach(function () {
-      Status.prototype.green.restore();
-      Status.prototype.yellow.restore();
-      systemStatus.createStatus.restore();
-    });
-
-    it('should call status.createStatus() with plugin', function () {
-      var next = function (err) {
-        server.register.args[0][1](err);
-      };
-      server.register.yieldsTo('register', server, options, next);
-      var plugin = { name: 'first', init: createInit() };
-      var plugins = [plugin];
-      return registerPlugins(server, plugins).then(function () {
-        sinon.assert.calledOnce(createStatus);
-        expect(plugin).to.have.property('status');
-        expect(createStatus.args[0][0]).to.eql(plugin);
-      });
-    });
-    it('should not set the status before init is called', function () {
-      var next = function (err) {
-        server.register.args[0][1](err);
-      };
-      server.register.yieldsTo('register', server, options, next);
-      var plugin = { name: 'first', init: createInit() };
-      var plugins = [plugin];
-      return registerPlugins(server, plugins).then(function () {
-        expect(yellowSpy).to.have.property('callCount', 0);
-      });
-    });
-
-    it('should set the status to green and "Ready" after init', function () {
-      var next = function (err) {
-        server.register.args[0][1](err);
-      };
-      server.register.yieldsTo('register', server, options, next);
-      var plugin = { name: 'first', init: createInit() };
-      var plugins = [plugin];
-      return registerPlugins(server, plugins).then(function () {
-        sinon.assert.calledOnce(greenSpy);
-        expect(greenSpy.calledAfter(plugin.init)).to.be(true);
-        expect(greenSpy.args[0][0]).to.be('Ready');
-      });
-    });
-
-  });
-
-  describe('dependencies', function () {
-    var nextStub;
-
-    beforeEach(function () {
-      var count = 0;
-      var next = function (err) {
-        server.register.args[count++][1](err);
-      };
-      server.register.yieldsTo('register', server, {}, next);
-    });
-
-    it('should run second after first and third and third after first', function () {
-      var first = { name: 'first', init: createInit() };
-      var second = { name: 'second', require: ['first', 'third'], init: createInit() };
-      var third = { name: 'third', require: ['first'], init: createInit() };
-      var plugins = [second, first, third];
-      return registerPlugins(server, plugins).then(function () {
-        expect(second.init.calledAfter(first.init)).to.be(true);
-        expect(second.init.calledAfter(third.init)).to.be(true);
-        expect(third.init.calledAfter(first.init)).to.be(true);
-        sinon.assert.calledThrice(server.register);
-      });
-    });
-
-    it('should run first, second, third', function () {
-      var first = { name: 'first', init: createInit() };
-      var second = { name: 'second', require: ['first'], init: createInit() };
-      var third = { name: 'third', require: ['second'], init: createInit() };
-      var plugins = [second, first, third];
-      return registerPlugins(server, plugins).then(function () {
-        sinon.assert.calledOnce(first.init);
-        expect(second.init.calledAfter(first.init)).to.be(true);
-        expect(third.init.calledAfter(second.init)).to.be(true);
-        sinon.assert.calledThrice(server.register);
-      });
-    });
-
-    it('should detect circular dependencies', function (done) {
-      var first = { name: 'first', require: ['third'], init: sinon.stub() };
-      var second = { name: 'second', require: ['first'], init: sinon.stub() };
-      var third = { name: 'third', require: ['second'], init: sinon.stub() };
-      var plugins = [second, first, third];
-      registerPlugins(server, plugins).catch(function (err) {
-        expect(err).to.be.a(Error);
-        expect(err.message).to.be('Circular dependency: second -> first -> third -> second');
-        done();
-      });
-    });
-
-  }); // end dependencies tests
-
-});
diff --git a/test/unit/server/lib/status/index.js b/test/unit/server/lib/status/index.js
deleted file mode 100644
index 5138a88b66c80..0000000000000
--- a/test/unit/server/lib/status/index.js
+++ /dev/null
@@ -1,38 +0,0 @@
-var expect = require('expect.js');
-var sinon = require('sinon');
-var status = require('../../../../../src/server/lib/status');
-var Status = require('../../../../../src/server/lib/status/status');
-
-describe('lib/status/index.js', function () {
-
-  var plugin, yellowSpy;
-  beforeEach(function () {
-    plugin = {
-      name: 'test',
-      server: { expose: sinon.stub(), log: sinon.stub() }
-    };
-    yellowSpy = sinon.spy(Status.prototype, 'yellow');
-  });
-
-  afterEach(function () {
-    Status.prototype.yellow.restore();
-  });
-
-  it('should create a new status for a plugin', function () {
-    status.createStatus(plugin);
-    expect(status.data).to.have.property('test');
-    expect(status.data.test).to.eql(plugin.status);
-  });
-
-  it('should attach a logger to the change status', function () {
-    status.createStatus(plugin);
-    plugin.status.green('Ready!');
-    sinon.assert.calledOnce(plugin.server.log);
-  });
-
-  it('should serialize the statuses when toJSON is called', function () {
-    status.createStatus(plugin);
-    expect(JSON.stringify(status)).to.eql(JSON.stringify(status.data));
-  });
-
-});
diff --git a/test/unit/server/lib/status/log_status_change.js b/test/unit/server/lib/status/log_status_change.js
deleted file mode 100644
index 4d2214c0f98a9..0000000000000
--- a/test/unit/server/lib/status/log_status_change.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var expect = require('expect.js');
-var sinon = require('sinon');
-var logStatusChange = require('../../../../../src/server/lib/status/log_status_change');
-
-describe('lib/status/log_status_change', function () {
-
-  var plugin;
-  var current = { state: 'yellow', message: 'Initialize' };
-  var previous = { state: 'red', message: '' };
-
-  beforeEach(function () {
-    plugin = { name: 'test', server: { log: sinon.stub() } };
-  });
-
-  it('should call plugin.server.log', function () {
-    var fn = logStatusChange(plugin);
-    fn(current, previous);
-    sinon.assert.calledOnce(plugin.server.log);
-  });
-
-  it('should call plugin.server.log with plugin and error message', function () {
-    var fn = logStatusChange(plugin);
-    fn(current, previous);
-    sinon.assert.calledOnce(plugin.server.log);
-    expect(plugin.server.log.args[0][0]).to.be('plugin');
-    expect(plugin.server.log.args[0][1]).to.be('[ test ] Change status from red to yellow - Initialize');
-  });
-
-});
diff --git a/test/unit/server/lib/status/status.js b/test/unit/server/lib/status/status.js
deleted file mode 100644
index c692b55f447e9..0000000000000
--- a/test/unit/server/lib/status/status.js
+++ /dev/null
@@ -1,65 +0,0 @@
-var expect = require('expect.js');
-var sinon = require('sinon');
-var Status = require('../../../../../src/server/lib/status/status');
-
-describe('lib/status/status.js', function () {
-
-  it('should have a undefined state when initialized', function () {
-    var obj = new Status('test');
-    expect(obj).to.have.property('state');
-    expect(obj.statue).to.be(undefined);
-  });
-
-  it('should only trigger the change listner when something changes', function () {
-    var obj = new Status('test');
-    var stub = sinon.stub();
-    obj.on('change', stub);
-    obj.green('Ready');
-    obj.green('Ready');
-    obj.red('Not Ready');
-    sinon.assert.calledTwice(stub);
-  });
-
-  it('should create a JSON representation of the status', function () {
-    var obj = new Status('test');
-    obj.green('Ready');
-    expect(obj.toJSON()).to.eql({ state: 'green', message: 'Ready' });
-  });
-
-  function testState(color) {
-    it('should change the state to ' + color + ' when #' + color + '() is called', function () {
-      var obj = new Status('test');
-      var message = 'testing ' + color;
-      obj[color](message);
-      expect(obj).to.have.property('state', color);
-      expect(obj).to.have.property('message', message);
-    });
-
-    it('should trigger the "change" listner when #' + color + '() is called', function (done) {
-      var obj = new Status('test');
-      var message = 'testing ' + color;
-      obj.on('change', function (current, previous) {
-        expect(current).to.eql({ state: color, message: message });
-        expect(previous).to.eql({ state: undefined, message: 'uninitialized' });
-        done();
-      });
-      obj[color](message);
-    });
-
-    it('should trigger the "' + color + '" listner when #' + color + '() is called', function (done) {
-      var obj = new Status('test');
-      var message = 'testing ' + color;
-      obj.on(color, function (msg, prev) {
-        expect(msg).to.be(message);
-        expect(prev).to.eql({ state: undefined, message: 'uninitialized' });
-        done();
-      });
-      obj[color](message);
-    });
-  }
-
-  testState('green');
-  testState('yellow');
-  testState('red');
-
-});
diff --git a/test/unit/server/plugins/elasticsearch/check_es_version.js b/test/unit/server/plugins/elasticsearch/check_es_version.js
deleted file mode 100644
index 94b13dfe35911..0000000000000
--- a/test/unit/server/plugins/elasticsearch/check_es_version.js
+++ /dev/null
@@ -1,70 +0,0 @@
-var root = require('requirefrom')('');
-var _ = require('lodash');
-var checkEsVersion = root('src/server/plugins/elasticsearch/lib/check_es_version');
-var Promise = require('bluebird');
-var sinon = require('sinon');
-
-describe('plugins/elasticsearch', function () {
-  describe('lib/check_es_version', function () {
-    var server;
-
-    beforeEach(function () {
-      var get = sinon.stub().withArgs('elasticserach.minimumVerison').returns('1.4.3');
-      var config = function () { return { get: get }; };
-      server = { config: config, plugins: { elasticsearch: { client: { nodes: {} } } } };
-    });
-
-    function setNodes(/* ...versions */) {
-      var versions = _.shuffle(arguments);
-      var nodes = {};
-      var i = 0;
-
-      while (versions.length) {
-        var name = 'node-' + (++i);
-        var version = versions.shift();
-
-        var node = {
-          version: version,
-          http_address: 'http_address',
-          ip: 'ip'
-        };
-
-        if (!_.isString(version)) _.assign(node, version);
-        nodes[name] = node;
-      }
-
-      var client = server.plugins.elasticsearch.client;
-      client.nodes.info = sinon.stub().returns(Promise.resolve({ nodes: nodes }));
-
-    }
-
-    it('passes with single a node that matches', function () {
-      setNodes('1.4.3');
-      return checkEsVersion(server)();
-    });
-
-    it('passes with multiple nodes that satisfy', function () {
-      setNodes('1.4.3', '1.4.4', '1.4.3-Beta1');
-      return checkEsVersion(server)();
-    });
-
-    it('fails with a single node that is out of date', function () {
-      setNodes('1.4.4', '1.4.2', '1.4.5');
-      return checkEsVersion(server)()
-      .then(function () {
-        throw new Error('expected validation to fail');
-      }, _.noop);
-    });
-
-    it('passes if that single node is a client node', function () {
-      setNodes(
-        '1.4.4',
-        { version: '1.4.2', attributes: { client: 'true' } },
-        '1.4.5'
-      );
-
-      return checkEsVersion(server)();
-    });
-
-  });
-});
diff --git a/test/unit/server/plugins/elasticsearch/create_kibana_index.js b/test/unit/server/plugins/elasticsearch/create_kibana_index.js
deleted file mode 100644
index 280265311ec9e..0000000000000
--- a/test/unit/server/plugins/elasticsearch/create_kibana_index.js
+++ /dev/null
@@ -1,139 +0,0 @@
-var root = require('requirefrom')('');
-var _ = require('lodash');
-var sinon = require('sinon');
-var expect = require('expect.js');
-var createKibanaIndex = root('src/server/plugins/elasticsearch/lib/create_kibana_index');
-var SetupError = root('src/server/plugins/elasticsearch/lib/setup_error');
-var Promise = require('bluebird');
-
-describe('plugins/elasticsearch', function () {
-  describe('lib/create_kibana_index', function () {
-
-    var server, client, config;
-    beforeEach(function () {
-      server = {};
-      client = {};
-      var config = { kibana: { index: '.my-kibana' } };
-      var get = sinon.stub();
-      get.returns(config);
-      get.withArgs('kibana.index').returns(config.kibana.index);
-      config = function () { return { get: get }; };
-      _.set(client, 'indices.create', sinon.stub());
-      _.set(client, 'cluster.health', sinon.stub());
-      _.set(server, 'plugins.elasticsearch.client', client);
-      _.set(server, 'config', config);
-    });
-
-    describe('successful requests', function () {
-
-      beforeEach(function () {
-        client.indices.create.returns(Promise.resolve());
-        client.cluster.health.returns(Promise.resolve());
-      });
-
-      it('should check cluster.health upon successful index creation', function () {
-        var fn = createKibanaIndex(server);
-        return fn.then(function () {
-          sinon.assert.calledOnce(client.cluster.health);
-        });
-      });
-
-      it('should be created with mappings for config.buildNum', function () {
-        var fn = createKibanaIndex(server);
-        return fn.then(function () {
-          var params = client.indices.create.args[0][0];
-          expect(params)
-            .to.have.property('body');
-          expect(params.body)
-            .to.have.property('mappings');
-          expect(params.body.mappings)
-            .to.have.property('config');
-          expect(params.body.mappings.config)
-            .to.have.property('properties');
-          expect(params.body.mappings.config.properties)
-            .to.have.property('buildNum');
-          expect(params.body.mappings.config.properties.buildNum)
-            .to.have.property('type', 'string');
-          expect(params.body.mappings.config.properties.buildNum)
-            .to.have.property('index', 'not_analyzed');
-        });
-      });
-
-      it('should be created with 1 shard and 1 replica', function () {
-        var fn = createKibanaIndex(server);
-        return fn.then(function () {
-          var params = client.indices.create.args[0][0];
-          expect(params)
-            .to.have.property('body');
-          expect(params.body)
-            .to.have.property('settings');
-          expect(params.body.settings)
-            .to.have.property('number_of_shards', 1);
-          expect(params.body.settings)
-            .to.have.property('number_of_replicas', 1);
-        });
-      });
-
-      it('should be created with 1 shard and 1 replica', function () {
-        var fn = createKibanaIndex(server);
-        return fn.then(function () {
-          var params = client.indices.create.args[0][0];
-          expect(params)
-            .to.have.property('body');
-          expect(params.body)
-            .to.have.property('settings');
-          expect(params.body.settings)
-            .to.have.property('number_of_shards', 1);
-          expect(params.body.settings)
-            .to.have.property('number_of_replicas', 1);
-        });
-      });
-
-      it('should be created with index name set in the config', function () {
-        var fn = createKibanaIndex(server);
-        return fn.then(function () {
-          var params = client.indices.create.args[0][0];
-          expect(params)
-            .to.have.property('index', '.my-kibana');
-        });
-      });
-
-
-    });
-
-    describe('failure requests', function () {
-      it('should reject with a SetupError', function () {
-        var error = new Error('Oops!');
-        client.indices.create.returns(Promise.reject(error));
-        var fn = createKibanaIndex(server);
-        return fn.catch(function (err) {
-          expect(err).to.be.a(SetupError);
-        });
-      });
-
-      it('should reject with an error if index creation fails', function () {
-        var error = new Error('Oops!');
-        client.indices.create.returns(Promise.reject(error));
-        var fn = createKibanaIndex(server);
-        return fn.catch(function (err) {
-          expect(err.message).to.be('Unable to create Kibana index ".my-kibana"');
-          expect(err).to.have.property('origError', error);
-        });
-      });
-
-
-      it('should reject with an error if health check fails', function () {
-        var error = new Error('Oops!');
-        client.indices.create.returns(Promise.resolve());
-        client.cluster.health.returns(Promise.reject(error));
-        var fn = createKibanaIndex(server);
-        return fn.catch(function (err) {
-          expect(err.message).to.be('Waiting for Kibana index ".my-kibana" to come online failed.');
-          expect(err).to.have.property('origError', error);
-        });
-      });
-    });
-
-  });
-});
-
diff --git a/test/unit/server/plugins/elasticsearch/health_check.js b/test/unit/server/plugins/elasticsearch/health_check.js
deleted file mode 100644
index 8229ba429345c..0000000000000
--- a/test/unit/server/plugins/elasticsearch/health_check.js
+++ /dev/null
@@ -1,141 +0,0 @@
-var root = require('requirefrom')('');
-var healthCheck = root('src/server/plugins/elasticsearch/lib/health_check');
-var Promise = require('bluebird');
-var sinon = require('sinon');
-var expect = require('expect.js');
-var NoConnections = require('elasticsearch').errors.NoConnections;
-
-
-describe('plugins/elasticsearch', function () {
-  describe('lib/health_check', function () {
-
-    var health, plugin, server, get, client;
-    beforeEach(function () {
-      // setup the plugin stub
-      plugin = {
-        name: 'elasticsearch',
-        status: {
-          red: sinon.stub(),
-          green: sinon.stub(),
-          yellow: sinon.stub()
-        }
-      };
-      // setup the config().get() stub
-      get = sinon.stub();
-      // set up the elasticsearch client stub
-      client = {
-        cluster: { health: sinon.stub() },
-        indices: { create: sinon.stub() },
-        nodes: { info: sinon.stub() },
-        ping: sinon.stub(),
-        create: sinon.stub(),
-        search: sinon.stub().returns(Promise.resolve({ hits: { hits: [] } })),
-      };
-      client.nodes.info.returns(Promise.resolve({
-        nodes: {
-          'node-01': {
-            version: '1.5.0',
-            http_address: 'inet[/127.0.0.1:9200]',
-            ip: '127.0.0.1'
-          }
-        }
-      }));
-      // Setup the server mock
-      server = {
-        log: sinon.stub(),
-        config: function () { return { get: get }; },
-        plugins: { elasticsearch: { client: client  } }
-      };
-
-      health = healthCheck(plugin, server);
-    });
-
-    it('should set the cluster green if everything is ready', function () {
-      get.withArgs('elasticsearch.minimumVerison').returns('1.4.4');
-      get.withArgs('kibana.index').returns('.my-kibana');
-      client.ping.returns(Promise.resolve());
-      client.cluster.health.returns(Promise.resolve({ timed_out: false, status: 'green' }));
-      return health.run()
-        .then(function () {
-          sinon.assert.calledOnce(plugin.status.yellow);
-          expect(plugin.status.yellow.args[0][0]).to.be('Waiting for Elasticsearch');
-          sinon.assert.calledOnce(client.ping);
-          sinon.assert.calledOnce(client.nodes.info);
-          sinon.assert.calledOnce(client.cluster.health);
-          sinon.assert.calledOnce(plugin.status.green);
-          expect(plugin.status.green.args[0][0]).to.be('Kibana index ready');
-        });
-    });
-
-    it('should set the cluster red if the ping fails, then to green', function () {
-      this.timeout(3000);
-      get.withArgs('elasticsearch.url').returns('http://localhost:9200');
-      get.withArgs('elasticsearch.minimumVerison').returns('1.4.4');
-      get.withArgs('kibana.index').returns('.my-kibana');
-      client.ping.onCall(0).returns(Promise.reject(new NoConnections()));
-      client.ping.onCall(1).returns(Promise.resolve());
-      client.cluster.health.returns(Promise.resolve({ timed_out: false, status: 'green' }));
-      return health.run()
-        .then(function () {
-          sinon.assert.calledOnce(plugin.status.yellow);
-          expect(plugin.status.yellow.args[0][0]).to.be('Waiting for Elasticsearch');
-          sinon.assert.calledOnce(plugin.status.red);
-          /* jscs:disable maximumLineLength */
-          expect(plugin.status.red.args[0][0]).to.be('Unable to connect to Elasticsearch at http://localhost:9200. Retrying in 2.5 seconds.');
-          /* jscs:enable maximumLineLength */
-          sinon.assert.calledTwice(client.ping);
-          sinon.assert.calledOnce(client.nodes.info);
-          sinon.assert.calledOnce(client.cluster.health);
-          sinon.assert.calledOnce(plugin.status.green);
-          expect(plugin.status.green.args[0][0]).to.be('Kibana index ready');
-        });
-
-    });
-
-    it('should set the cluster red if the health check status is red, then to green', function () {
-      this.timeout(3000);
-      get.withArgs('elasticsearch.url').returns('http://localhost:9200');
-      get.withArgs('elasticsearch.minimumVerison').returns('1.4.4');
-      get.withArgs('kibana.index').returns('.my-kibana');
-      client.ping.returns(Promise.resolve());
-      client.cluster.health.onCall(0).returns(Promise.resolve({ timed_out: false, status: 'red' }));
-      client.cluster.health.onCall(1).returns(Promise.resolve({ timed_out: false, status: 'green' }));
-      return health.run()
-        .then(function () {
-          sinon.assert.calledOnce(plugin.status.yellow);
-          expect(plugin.status.yellow.args[0][0]).to.be('Waiting for Elasticsearch');
-          sinon.assert.calledOnce(plugin.status.red);
-          /* jscs:disable maximumLineLength */
-          expect(plugin.status.red.args[0][0]).to.be('Elasticsearch is still initializing the kibana index... Trying again in 2.5 second.');
-          /* jscs:enable maximumLineLength */
-          sinon.assert.calledOnce(client.ping);
-          sinon.assert.calledOnce(client.nodes.info);
-          sinon.assert.calledTwice(client.cluster.health);
-          sinon.assert.calledOnce(plugin.status.green);
-          expect(plugin.status.green.args[0][0]).to.be('Kibana index ready');
-        });
-    });
-
-    it('should set the cluster yellow if the health check timed_out and create index', function () {
-      this.timeout(3000);
-      get.withArgs('elasticsearch.url').returns('http://localhost:9200');
-      get.withArgs('elasticsearch.minimumVerison').returns('1.4.4');
-      get.withArgs('kibana.index').returns('.my-kibana');
-      client.ping.returns(Promise.resolve());
-      client.cluster.health.onCall(0).returns(Promise.resolve({ timed_out: true, status: 'red' }));
-      client.cluster.health.onCall(1).returns(Promise.resolve({ timed_out: false, status: 'green' }));
-      client.indices.create.returns(Promise.resolve());
-      return health.run()
-        .then(function () {
-          sinon.assert.calledTwice(plugin.status.yellow);
-          expect(plugin.status.yellow.args[0][0]).to.be('Waiting for Elasticsearch');
-          expect(plugin.status.yellow.args[1][0]).to.be('No existing Kibana index found');
-          sinon.assert.calledOnce(client.ping);
-          sinon.assert.calledOnce(client.indices.create);
-          sinon.assert.calledOnce(client.nodes.info);
-          sinon.assert.calledTwice(client.cluster.health);
-        });
-    });
-
-  });
-});
diff --git a/test/unit/server/plugins/elasticsearch/is_upgradeable.js b/test/unit/server/plugins/elasticsearch/is_upgradeable.js
deleted file mode 100644
index d2c7982680bc4..0000000000000
--- a/test/unit/server/plugins/elasticsearch/is_upgradeable.js
+++ /dev/null
@@ -1,69 +0,0 @@
-var root = require('requirefrom')('');
-var isUpgradeable = root('src/server/plugins/elasticsearch/lib/is_upgradeable');
-var expect = require('expect.js');
-var util = require('util');
-var package = root('package.json');
-var sinon = require('sinon');
-
-describe('plugins/elasticsearch', function () {
-  describe('lib/isUpgradeable', function () {
-
-    var config = {};
-    var server = {
-      config: function () {
-        return config;
-      }
-    };
-
-    function upgradeDoc(_id, version, bool) {
-      it(util.format('should return %s for %s <= %s', bool, _id, version), function () {
-        var doc = { _id: _id };
-        config.get = sinon.stub().withArgs('kibana.package.version').returns(version);
-        expect(isUpgradeable(server, doc)).to.be(bool);
-      });
-    }
-
-    upgradeDoc('1.0.0-beta1', package.version, false);
-    upgradeDoc(package.version, package.version, false);
-    upgradeDoc('4.0.0-RC1', '4.0.0-RC2', true);
-    upgradeDoc('4.0.0-rc2', '4.0.0-rc1', false);
-    upgradeDoc('4.0.0-rc2', '4.0.0', true);
-    upgradeDoc('4.0.0-rc2', '4.0.2', true);
-    upgradeDoc('4.0.1', '4.1.0-rc', true);
-    upgradeDoc('4.0.0-rc1', '4.0.0', true);
-    upgradeDoc('4.0.0-rc1-snapshot', '4.0.0', false);
-    upgradeDoc('4.1.0-rc1-snapshot', '4.1.0-rc1', false);
-
-    it('should handle missing _id field', function () {
-      config.get = sinon.stub().withArgs('kibana.package.version').returns(package.version);
-      var doc = {
-        '_index': '.kibana',
-        '_type': 'config',
-        '_score': 1,
-        '_source': {
-          'buildNum': 1.7976931348623157e+308,
-          'defaultIndex': '[logstash-]YYYY.MM.DD'
-        }
-      };
-      expect(isUpgradeable(server, doc)).to.be(false);
-    });
-
-    it('should handle _id of @@version', function () {
-      config.get = sinon.stub().withArgs('kibana.package.version').returns(package.version);
-      var doc = {
-        '_index': '.kibana',
-        '_type': 'config',
-        '_id': '@@version',
-        '_score': 1,
-        '_source': {
-          'buildNum': 1.7976931348623157e+308,
-          'defaultIndex': '[logstash-]YYYY.MM.DD'
-        }
-      };
-      expect(isUpgradeable(server, doc)).to.be(false);
-    });
-
-  });
-
-
-});
diff --git a/test/unit/server/plugins/elasticsearch/routes.js b/test/unit/server/plugins/elasticsearch/routes.js
deleted file mode 100644
index 4768669380d3a..0000000000000
--- a/test/unit/server/plugins/elasticsearch/routes.js
+++ /dev/null
@@ -1,104 +0,0 @@
-var root = require('requirefrom')('');
-var expect = require('expect.js');
-var Kibana = root('src/server');
-var findPort = root('test/utils/find_port');
-root('test/utils/ensure_elasticsearch');
-var util = require('util');
-var format = util.format;
-
-
-describe('plugins/elasticsearch', function () {
-  describe('routes', function () {
-    var server, config;
-
-    beforeEach(function () {
-      return findPort(7000, 8000).then(function (port) {
-        config = { 'kibana.server.port': port, 'logging.quiet': true};
-        var kibana = new Kibana(config);
-        return kibana.listen().then(function (_server) {
-          server = _server;
-        });
-      });
-    });
-
-    afterEach(function (done) {
-      server.stop(done);
-    });
-
-    function testRoute(options) {
-      var statusCode = options.statusCode || 200;
-      describe(format('%s %s', options.method, options.url), function () {
-        it('should should return ' + statusCode, function (done) {
-          server.inject(options, function (res) {
-            expect(res.statusCode).to.be(statusCode);
-            done();
-          });
-        });
-      });
-    }
-
-
-    testRoute({
-      method: 'GET',
-      url: '/elasticsearch/_nodes'
-    });
-
-    testRoute({
-      method: 'GET',
-      url: '/elasticsearch/'
-    });
-
-    testRoute({
-      method: 'POST',
-      url: '/elasticsearch/.kibana',
-      payload: '{settings: {number_of_shards: 1, number_of_replicas: 1}}',
-      statusCode: 201
-    });
-
-    testRoute({
-      method: 'GET',
-      url: '/elasticsearch/.kibana'
-    });
-
-    testRoute({
-      method: 'POST',
-      url: '/elasticsearch/.kibana/_bulk',
-      payload: '{}',
-      statusCode: 400
-    });
-
-    testRoute({
-      method: 'GET',
-      url: '/elasticsearch/.kibana/_mapping/*/field/_source'
-    });
-
-    testRoute({
-      method: 'POST',
-      url: '/elasticsearch/.kibana/index-pattern/_search?fields=',
-      payload: '{query: {match_all: {}}, size: 2147483647}'
-    });
-
-    testRoute({
-      method: 'POST',
-      url: '/elasticsearch/.kibana/__kibanaQueryValidator/_validate/query?explain=true&ignore_unavailable=true',
-      payload: '{query: {query_string: {analyze_wildcard: true, query: "*"}}}'
-    });
-
-    testRoute({
-      method: 'POST',
-      url: '/elasticsearch/_mget?timeout=0&ignore_unavailable=true&preference=1429574531063',
-      payload: '{docs: [{_index: ".kibana", _type: "index-pattern", _id: "[logstash-]YYYY.MM.DD"}]}'
-    });
-
-    /* jscs:disable maximumLineLength */
-    testRoute({
-      method: 'POST',
-      url: '/elasticsearch/_msearch?timeout=0&ignore_unavailable=true&preference=1429577952339',
-      payload: '{"index":"logstash-2015.04.21","ignore_unavailable":true}\n{"size":500,"sort":{"@timestamp":"desc"},"query":{"filtered":{"query":{"query_string":{"analyze_wildcard":true,"query":"*"}},"filter":{"bool":{"must":[{"range":{"@timestamp":{"gte":1429577068175,"lte":1429577968175}}}],"must_not":[]}}}},"highlight":{"pre_tags":["@kibana-highlighted-field@"],"post_tags":["@/kibana-highlighted-field@"],"fields":{"*":{}}},"aggs":{"2":{"date_histogram":{"field":"@timestamp","interval":"30s","pre_zone":"-07:00","pre_zone_adjust_large_interval":true,"min_doc_count":0,"extended_bounds":{"min":1429577068175,"max":1429577968175}}}},"fields":["*","_source"],"script_fields":{},"fielddata_fields":["timestamp_offset","@timestamp","utc_time"]}\n'
-    });
-    /* jscs:enable maximumLineLength */
-
-  });
-});
-
-
diff --git a/test/unit/server/plugins/elasticsearch/upgrade_config.js b/test/unit/server/plugins/elasticsearch/upgrade_config.js
deleted file mode 100644
index 6e1387c08b6db..0000000000000
--- a/test/unit/server/plugins/elasticsearch/upgrade_config.js
+++ /dev/null
@@ -1,146 +0,0 @@
-var root = require('requirefrom')('');
-var upgradeConfig = root('src/server/plugins/elasticsearch/lib/upgrade_config');
-var Promise = require('bluebird');
-var sinon = require('sinon');
-var expect = require('expect.js');
-
-describe('pluigns/elasticsearch', function () {
-  describe('lib/upgrade_config', function () {
-
-    var get, server, client, config, upgrade;
-    beforeEach(function () {
-      get = sinon.stub();
-      get.withArgs('kibana.package.version').returns('4.0.1');
-      get.withArgs('kibana.index').returns('.my-kibana');
-      client = { create: sinon.stub() };
-      server = {
-        log: sinon.stub(),
-        config: function () { return { get: get }; },
-        plugins: { elasticsearch: { client: client } }
-      };
-      upgrade = upgradeConfig(server);
-    });
-
-    describe('nothing is found', function () {
-      var env = process.env.NODE_ENV;
-      var response = { hits: { hits:[] } };
-
-      beforeEach(function () {
-        client.create.returns(Promise.resolve());
-      });
-
-      describe('production', function () {
-        beforeEach(function () {
-          process.env.NODE_ENV = 'production';
-        });
-
-        it('should resolve buildNum to kibana.buildNum', function () {
-          get.withArgs('kibana.buildNum').returns(5801);
-          return upgrade(response).then(function (resp) {
-            sinon.assert.calledOnce(client.create);
-            var params = client.create.args[0][0];
-            expect(params.body).to.have.property('buildNum', 5801);
-          });
-        });
-
-        it('should resolve version to kibana.package.version', function () {
-          return upgrade(response).then(function (resp) {
-            var params = client.create.args[0][0];
-            expect(params).to.have.property('id', '4.0.1');
-          });
-        });
-      });
-
-      describe('development', function () {
-        beforeEach(function () {
-          process.env.NODE_ENV = 'development';
-        });
-
-        it('should resolve buildNum to the max integer', function () {
-          return upgrade(response).then(function (resp) {
-            var params = client.create.args[0][0];
-            expect(params.body).to.have.property('buildNum', (Math.pow(2, 53) - 1));
-          });
-        });
-
-        it('should resolve version to @@version', function () {
-          return upgrade(response).then(function (resp) {
-            var params = client.create.args[0][0];
-            expect(params).to.have.property('id', '@@version');
-          });
-        });
-
-
-      });
-
-      afterEach(function () {
-        process.env.NODE_ENV = env;
-      });
-    });
-
-    it('should resolve with undefined if the current version is found', function () {
-      var response = { hits: { hits: [ { _id: '4.0.1' } ] } };
-      return upgrade(response).then(function (resp) {
-        expect(resp).to.be(undefined);
-      });
-    });
-
-    it('should resolve with undefined if the nothing is upgradeable', function () {
-      var response = { hits: { hits: [ { _id: '4.0.1-beta1' }, { _id: '4.0.0-snapshot1' } ] } };
-      return upgrade(response).then(function (resp) {
-        expect(resp).to.be(undefined);
-      });
-    });
-
-    it('should update the build number on the new config', function () {
-      get.withArgs('kibana.buildNum').returns(5801);
-      client.create.returns(Promise.resolve());
-      var response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1 } } ] } };
-      return upgrade(response).then(function (resp) {
-        sinon.assert.calledOnce(client.create);
-        var params = client.create.args[0][0];
-        expect(params).to.have.property('body');
-        expect(params.body).to.have.property('buildNum', 5801);
-        expect(params).to.have.property('index', '.my-kibana');
-        expect(params).to.have.property('type', 'config');
-        expect(params).to.have.property('id', '4.0.1');
-      });
-    });
-
-    it('should update the build number to max integer if buildNum is template string', function () {
-      get.withArgs('kibana.buildNum').returns('@@buildNum');
-      client.create.returns(Promise.resolve());
-      var response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1 } } ] } };
-      return upgrade(response).then(function (resp) {
-        sinon.assert.calledOnce(client.create);
-        var params = client.create.args[0][0];
-        expect(params).to.have.property('body');
-        expect(params.body).to.have.property('buildNum', Math.pow(2, 53) - 1);
-      });
-    });
-
-    it('should log a message for upgrades', function () {
-      get.withArgs('kibana.buildNum').returns(5801);
-      client.create.returns(Promise.resolve());
-      var response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1 } } ] } };
-      return upgrade(response).then(function (resp) {
-        sinon.assert.calledOnce(server.log);
-        expect(server.log.args[0][0]).to.be('plugin');
-        expect(server.log.args[0][1]).to.be('[ elasticsearch ] Upgrade config from 4.0.0 to 4.0.1');
-      });
-    });
-
-    it('should copy attributes from old config', function () {
-      get.withArgs('kibana.buildNum').returns(5801);
-      client.create.returns(Promise.resolve());
-      var response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1, defaultIndex: 'logstash-*' } } ] } };
-      return upgrade(response).then(function (resp) {
-        sinon.assert.calledOnce(client.create);
-        var params = client.create.args[0][0];
-        expect(params).to.have.property('body');
-        expect(params.body).to.have.property('defaultIndex', 'logstash-*');
-      });
-    });
-
-  });
-});
diff --git a/test/unit/specs/apps/discover/directives/discover_field.js b/test/unit/specs/apps/discover/directives/discover_field.js
deleted file mode 100644
index ade8c41187479..0000000000000
--- a/test/unit/specs/apps/discover/directives/discover_field.js
+++ /dev/null
@@ -1,82 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var $ = require('jquery');
-  var _ = require('lodash');
-  var sinon = require('test_utils/auto_release_sinon');
-
-  // Load the kibana app dependencies.
-  require('services/private');
-  require('plugins/discover/components/field_chooser/discover_field');
-
-  var $parentScope, $scope, indexPattern;
-
-  var init = function ($elem, props) {
-    inject(function ($rootScope, $compile) {
-      $parentScope = $rootScope;
-      _.assign($parentScope, props);
-      $compile($elem)($parentScope);
-      $elem.scope().$digest();
-      $scope = $elem.scope();
-    });
-  };
-
-  var destroy = function () {
-    $scope.$destroy();
-    $parentScope.$destroy();
-  };
-
-  var details = {
-    'total': 379,
-    'exists': 379,
-    'missing': 0,
-    'buckets': [
-      {'value': 'info',     'count': 359, 'percent': '94.7'},
-      {'value': 'success',  'count': 135, 'percent': '35.6'},
-      {'value': 'security', 'count': 123, 'percent': '32.5'},
-      {'value': 'warning',  'count': 108, 'percent': '28.5'},
-      {'value': 'login',    'count': 17,  'percent': '4.5'}
-    ]
-  };
-
-  describe('discoverField', function () {
-    var $elem;
-
-    beforeEach(module('kibana'));
-    beforeEach(function () {
-      $elem = angular.element('<discover-field></discover-field>');
-      inject(function (Private) {
-        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-      });
-      init($elem, {
-        field: indexPattern.fields.byName.extension,
-        increaseFieldCounter: sinon.spy(),
-        toggle: function (field) {
-          indexPattern.fields.byName[field].display = !!!indexPattern.fields.byName[field].display;
-        }
-      });
-    });
-
-    afterEach(function () {
-      destroy();
-    });
-
-    describe('toggleDisplay', function () {
-      it('should exist', function (done) {
-        expect($scope.toggleDisplay).to.be.a(Function);
-        done();
-      });
-
-      it('should toggle the display of the field', function (done) {
-        $scope.toggleDisplay($scope.field);
-        expect($scope.field.display).to.be(true);
-        done();
-      });
-
-      it('should increase the field popularity', function (done) {
-        $scope.toggleDisplay($scope.field);
-        expect($scope.increaseFieldCounter.called).to.be(true);
-        done();
-      });
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/apps/discover/directives/field_calculator.js b/test/unit/specs/apps/discover/directives/field_calculator.js
deleted file mode 100644
index c0366aa6f67da..0000000000000
--- a/test/unit/specs/apps/discover/directives/field_calculator.js
+++ /dev/null
@@ -1,146 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var fieldCalculator = require('plugins/discover/components/field_chooser/lib/field_calculator');
-
-  // Load the kibana app dependencies.
-  require('services/private');
-
-  var indexPattern;
-
-  describe('fieldCalculator', function () {
-    beforeEach(module('kibana'));
-    beforeEach(function () {
-      inject(function (Private) {
-        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-      });
-    });
-
-
-    it('should have a _countMissing that counts nulls & undefineds in an array', function () {
-      var values = [['foo', 'bar'], 'foo', 'foo', undefined, ['foo', 'bar'], 'bar', 'baz', null, null, null, 'foo', undefined];
-      expect(fieldCalculator._countMissing(values)).to.be(5);
-    });
-
-    describe('_groupValues', function () {
-      var groups, params, values;
-      beforeEach(function () {
-        values = [['foo', 'bar'], 'foo', 'foo', undefined, ['foo', 'bar'], 'bar', 'baz', null, null, null, 'foo', undefined];
-        params = {};
-        groups = fieldCalculator._groupValues(values, params);
-      });
-
-      it('should have a _groupValues that counts values', function () {
-        expect(groups).to.be.an(Object);
-      });
-
-      it('should throw an error if any value is a plain object', function () {
-        expect(function () { fieldCalculator._groupValues([{}, true, false], params); })
-          .to.throwError();
-      });
-
-      it('should have a a key for value in the array when not grouping array terms', function () {
-        expect(_.keys(groups).length).to.be(3);
-        expect(groups.foo).to.be.a(Object);
-        expect(groups.bar).to.be.a(Object);
-        expect(groups.baz).to.be.a(Object);
-      });
-
-      it('should count array terms independently', function () {
-        expect(groups['foo,bar']).to.be(undefined);
-        expect(groups.foo.count).to.be(5);
-        expect(groups.bar.count).to.be(3);
-        expect(groups.baz.count).to.be(1);
-      });
-
-      describe('grouped array terms', function () {
-        beforeEach(function () {
-          params.grouped = true;
-          groups = fieldCalculator._groupValues(values, params);
-        });
-
-        it('should group array terms when passed params.grouped', function () {
-          expect(_.keys(groups).length).to.be(4);
-          expect(groups['foo,bar']).to.be.a(Object);
-        });
-
-        it('should contain the original array as the value', function () {
-          expect(groups['foo,bar'].value).to.eql(['foo', 'bar']);
-        });
-
-        it('should count the pairs seperately from the values they contain', function () {
-          expect(groups['foo,bar'].count).to.be(2);
-          expect(groups.foo.count).to.be(3);
-          expect(groups.bar.count).to.be(1);
-        });
-      });
-    });
-
-    describe('getFieldValues', function () {
-      var hits;
-
-      beforeEach(function () {
-        hits = _.each(require('fixtures/real_hits.js'), indexPattern.flattenHit);
-      });
-
-      it('Should return an array of values for _source fields', function () {
-        var extensions = fieldCalculator.getFieldValues(hits, indexPattern.fields.byName.extension);
-        expect(extensions).to.be.an(Array);
-        expect(_.filter(extensions, function (v) { return v === 'html'; }).length).to.be(8);
-        expect(_.uniq(_.clone(extensions)).sort()).to.eql(['gif', 'html', 'php', 'png']);
-      });
-
-      it('Should return an array of values for core meta fields', function () {
-        var types = fieldCalculator.getFieldValues(hits, indexPattern.fields.byName._type);
-        expect(types).to.be.an(Array);
-        expect(_.filter(types, function (v) { return v === 'apache'; }).length).to.be(18);
-        expect(_.uniq(_.clone(types)).sort()).to.eql(['apache', 'nginx']);
-      });
-    });
-
-
-    describe('getFieldValueCounts', function () {
-      var params;
-      beforeEach(function () {
-        params = {
-          hits: require('fixtures/real_hits.js'),
-          field: indexPattern.fields.byName.extension,
-          count: 3
-        };
-      });
-
-      it('counts the top 3 values', function () {
-        var extensions = fieldCalculator.getFieldValueCounts(params);
-        expect(extensions).to.be.an(Object);
-        expect(extensions.buckets).to.be.an(Array);
-        expect(extensions.buckets.length).to.be(3);
-        expect(_.pluck(extensions.buckets, 'value')).to.eql(['html', 'php', 'gif']);
-        expect(extensions.error).to.be(undefined);
-      });
-
-      it('fails to analyze geo and attachment types', function () {
-        params.field = indexPattern.fields.byName.point;
-        expect(fieldCalculator.getFieldValueCounts(params).error).to.not.be(undefined);
-
-        params.field = indexPattern.fields.byName.area;
-        expect(fieldCalculator.getFieldValueCounts(params).error).to.not.be(undefined);
-
-        params.field = indexPattern.fields.byName.request_body;
-        expect(fieldCalculator.getFieldValueCounts(params).error).to.not.be(undefined);
-      });
-
-      it('fails to analyze fields that are in the mapping, but not the hits', function () {
-        params.field = indexPattern.fields.byName.ip;
-        expect(fieldCalculator.getFieldValueCounts(params).error).to.not.be(undefined);
-      });
-
-      it('counts the total hits', function () {
-        expect(fieldCalculator.getFieldValueCounts(params).total).to.be(params.hits.length);
-      });
-
-      it('counts the hits the field exists in', function () {
-        params.field = indexPattern.fields.byName.phpmemory;
-        expect(fieldCalculator.getFieldValueCounts(params).exists).to.be(5);
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/apps/discover/directives/field_chooser.js b/test/unit/specs/apps/discover/directives/field_chooser.js
deleted file mode 100644
index 59177855cee24..0000000000000
--- a/test/unit/specs/apps/discover/directives/field_chooser.js
+++ /dev/null
@@ -1,235 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var $ = require('jquery');
-  var _ = require('lodash');
-  var sinon = require('test_utils/auto_release_sinon');
-
-  // Load the kibana app dependencies.
-  require('services/private');
-  require('plugins/discover/components/field_chooser/field_chooser');
-
-  var $parentScope;
-  var $scope;
-  var config;
-  var hits;
-  var indexPattern;
-  var indexPatternList;
-
-  // Sets up the directive, take an element, and a list of properties to attach to the parent scope.
-  var init = function ($elem, props) {
-    inject(function ($rootScope, $compile, $timeout, _config_) {
-      config = _config_;
-      $parentScope = $rootScope;
-      _.assign($parentScope, props);
-      $compile($elem)($parentScope);
-
-      // Required for test to run solo. Sigh
-      $timeout(function () {
-        $elem.scope().$digest();
-      }, 0);
-
-      $scope = $elem.isolateScope();
-    });
-  };
-
-  var destroy = function () {
-    $scope.$destroy();
-    $parentScope.$destroy();
-  };
-
-  describe('discover field chooser directives', function () {
-    var $elem = angular.element(
-      '<disc-field-chooser' +
-      '  columns="columns"' +
-      '  toggle="toggle"' +
-      '  hits="hits"' +
-      '  field-counts="fieldCounts"' +
-      '  filter="filter"' +
-      '  index-pattern="indexPattern"' +
-      '  index-pattern-list="indexPatternList"' +
-      '  state="state">' +
-      '</disc-field-chooser>'
-    );
-
-    beforeEach(module('kibana'));
-    beforeEach(function () {
-      inject(function (Private) {
-        hits = Private(require('fixtures/hits'));
-        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-        indexPatternList = [ 'b', 'a', 'c' ];
-      });
-
-      var fieldCounts = _.transform(hits, function (counts, hit) {
-        _.keys(indexPattern.flattenHit(hit)).forEach(function (key) {
-          counts[key] = (counts[key] || 0) + 1;
-        });
-      }, {});
-
-      init($elem, {
-        columns: [],
-        toggle: sinon.spy(),
-        hits: hits,
-        fieldCounts: fieldCounts,
-        filter: sinon.spy(),
-        indexPattern: indexPattern,
-        indexPatternList: indexPatternList
-      });
-
-      $scope.$digest();
-    });
-
-    afterEach(function () {
-      destroy();
-    });
-
-    var getSections = function (ctx) {
-      return {
-        selected: $('.discover-selected-fields', ctx),
-        popular: $('.discover-popular-fields', ctx),
-        unpopular: $('.discover-unpopular-fields', ctx),
-      };
-    };
-
-    describe('Index list', function () {
-      it('should be in alphabetical order', function (done) {
-        expect($elem.find('li.sidebar-item-title').text()).to.be('abc');
-        done();
-      });
-    });
-
-    describe('Field listing', function () {
-      it('should have Selected Fields, Fields and Popular Fields sections', function (done) {
-        var headers = $elem.find('.sidebar-list-header');
-        expect(headers.length).to.be(3);
-        done();
-      });
-
-      it('should have 2 popular fields, 1 unpopular field and no selected fields', function (done) {
-        var section = getSections($elem);
-
-        expect(section.selected.find('li').length).to.be(0);
-
-        expect(section.popular.text()).to.contain('ssl');
-        expect(section.popular.text()).to.contain('@timestamp');
-        expect(section.popular.text()).to.not.contain('ip\n');
-
-        expect(section.unpopular.text()).to.contain('extension');
-        expect(section.unpopular.text()).to.contain('machine.os');
-        expect(section.unpopular.text()).to.not.contain('ssl');
-        done();
-      });
-
-
-      it('should show the popular fields header if there are popular fields', function (done) {
-        var section = getSections($elem);
-        expect(section.popular.hasClass('ng-hide')).to.be(false);
-        expect(section.popular.find('li:not(.sidebar-list-header)').length).to.be.above(0);
-        done();
-      });
-
-      it('should not show the popular fields if there are not any', function (done) {
-
-        // Re-init
-        destroy();
-
-        _.each(indexPattern.fields, function (field) { field.$$spec.count = 0;}); // Reset the popular fields
-        init($elem, {
-          columns: [],
-          toggle: sinon.spy(),
-          hits: require('fixtures/hits'),
-          filter: sinon.spy(),
-          indexPattern: indexPattern
-        });
-
-        var section = getSections($elem);
-
-        $scope.$digest();
-        expect(section.popular.hasClass('ng-hide')).to.be(true);
-        expect(section.popular.find('li:not(.sidebar-list-header)').length).to.be(0);
-        done();
-      });
-
-      it('should move the field into selected when it is added to the columns array', function (done) {
-        var section = getSections($elem);
-        $scope.columns.push('bytes');
-        $scope.$digest();
-
-        expect(section.selected.text()).to.contain('bytes');
-        expect(section.popular.text()).to.not.contain('bytes');
-
-        $scope.columns.push('ip');
-        $scope.$digest();
-        expect(section.selected.text()).to.contain('ip\n');
-        expect(section.unpopular.text()).to.not.contain('ip\n');
-
-        expect(section.popular.text()).to.contain('ssl');
-
-        done();
-      });
-    });
-
-    describe('details processing', function () {
-      var field;
-      function getField() { return _.find($scope.fields, { name: 'bytes' }); }
-
-      beforeEach(function () {
-        field = getField();
-      });
-
-      it('should have a details function', function () {
-        expect($scope.details).to.be.a(Function);
-      });
-
-      it('should increase the field popularity when called', function () {
-        indexPattern.popularizeField = sinon.spy();
-        $scope.details(field);
-        expect(indexPattern.popularizeField.called).to.be(true);
-      });
-
-      it('should append a details object to the field', function () {
-        $scope.details(field);
-        expect(field.details).to.not.be(undefined);
-      });
-
-      it('should delete the field details if they already exist', function () {
-        $scope.details(field);
-        expect(field.details).to.not.be(undefined);
-        $scope.details(field);
-        expect(field.details).to.be(undefined);
-      });
-
-      it('... unless recompute is true', function () {
-        $scope.details(field);
-        expect(field.details).to.not.be(undefined);
-        $scope.details(field, true);
-        expect(field.details).to.not.be(undefined);
-      });
-
-      it('should create buckets with formatted and raw values', function () {
-        $scope.details(field);
-        expect(field.details.buckets).to.not.be(undefined);
-        expect(field.details.buckets[0].value).to.be(40.141592);
-        expect(field.details.buckets[0].display).to.be('40.142');
-      });
-
-
-      it('should recalculate the details on open fields if the hits change', function () {
-        $scope.hits = [
-          { _source: { bytes: 1024 } }
-        ];
-        $scope.$apply();
-
-        field = getField();
-        $scope.details(field);
-        expect(getField().details.total).to.be(1);
-
-        $scope.hits = [
-          { _source: { notbytes: 1024 } }
-        ];
-        $scope.$apply();
-        field = getField();
-        expect(field.details).to.not.have.property('total');
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/apps/discover/hit_sort_fn.js b/test/unit/specs/apps/discover/hit_sort_fn.js
deleted file mode 100644
index 60ebe6c12e45a..0000000000000
--- a/test/unit/specs/apps/discover/hit_sort_fn.js
+++ /dev/null
@@ -1,75 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  require('angular').module('hitSortFunctionTests', ['kibana']);
-
-  describe('hit sort function', function () {
-    var createHitSortFn;
-
-    beforeEach(module('hitSortFunctionTests'));
-    beforeEach(inject(function (Private) {
-      createHitSortFn = Private(require('plugins/discover/_hit_sort_fn'));
-    }));
-
-
-    var runSortTest = function (dir, sortOpts) {
-      var groupSize = _.random(10, 30);
-      var total = sortOpts.length * groupSize;
-
-      var hits = new Array(total);
-      sortOpts = sortOpts.map(function (opt) {
-        if (_.isArray(opt)) return opt;
-        else return [opt];
-      });
-      var sortOptLength = sortOpts.length;
-
-      for (var i = 0; i < hits.length; i++) {
-        hits[i] = {
-          _source: {},
-          sort: sortOpts[i % sortOptLength]
-        };
-      }
-
-      hits.sort(createHitSortFn(dir))
-      .forEach(function (hit, i, hits) {
-        var group = Math.floor(i / groupSize);
-        expect(hit.sort).to.eql(sortOpts[group]);
-      });
-    };
-
-
-    it('sorts a list of hits in ascending order', function () {
-      runSortTest('asc', [200, 404, 500]);
-    });
-
-    it('sorts a list of hits in descending order', function () {
-      runSortTest('desc', [10, 3, 1]);
-    });
-
-    it('breaks ties in ascending order', function () {
-      runSortTest('asc', [
-        [ 'apache',  200,  'facebook.com' ],
-        [ 'apache',  200,  'twitter.com'  ],
-        [ 'apache',  301,  'facebook.com' ],
-        [ 'apache',  301,  'twitter.com'  ],
-        [ 'nginx',   200,  'facebook.com' ],
-        [ 'nginx',   200,  'twitter.com'  ],
-        [ 'nginx',   301,  'facebook.com' ],
-        [ 'nginx',   301,  'twitter.com'  ]
-      ]);
-    });
-
-    it('breaks ties in descending order', function () {
-      runSortTest('desc', [
-        [ 'nginx',   301,  'twitter.com'  ],
-        [ 'nginx',   301,  'facebook.com' ],
-        [ 'nginx',   200,  'twitter.com'  ],
-        [ 'nginx',   200,  'facebook.com' ],
-        [ 'apache',  301,  'twitter.com'  ],
-        [ 'apache',  301,  'facebook.com' ],
-        [ 'apache',  200,  'twitter.com'  ],
-        [ 'apache',  200,  'facebook.com' ]
-      ]);
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/apps/doc/doc.js b/test/unit/specs/apps/doc/doc.js
deleted file mode 100644
index c85af49080ee2..0000000000000
--- a/test/unit/specs/apps/doc/doc.js
+++ /dev/null
@@ -1,130 +0,0 @@
-define(function (require) {
-
-  // Load the kibana app dependencies.
-  require('angular-route');
-
-  require('plugins/doc/index');
-
-  var $scope, createController, timefilter;
-
-  var init = function (index, type, id) {
-
-    module('kibana');
-
-    // Stub services
-    module(function ($provide) {
-      $provide.service('$route', function (Private) {
-        this.current = {
-          locals: {
-            indexPattern: Private(require('fixtures/stubbed_logstash_index_pattern'))
-          },
-          params: {
-            index: index || 'myIndex',
-            type: type || 'myType',
-            id: id || 'myId'
-          }
-        };
-      });
-
-      $provide.service('es', function (Private, $q) {
-        this.search = function (config) {
-          var deferred = $q.defer();
-
-          switch (config.index) {
-            case 'goodSearch':
-              deferred.resolve({
-                hits: {
-                  total: 1,
-                  hits: [{
-                    _source: {
-                      foo: true
-                    }
-                  }]
-                }
-              });
-              break;
-            case 'badSearch':
-              deferred.resolve({
-                hits: {
-                  total: 0,
-                  hits: []
-                }
-              });
-              break;
-            case 'missingIndex':
-              deferred.reject({status: 404});
-              break;
-            case 'badRequest':
-              deferred.reject({status: 500});
-              break;
-          }
-
-          return deferred.promise;
-        };
-      });
-    });
-
-    // Create the scope
-    inject(function ($rootScope, $controller, _timefilter_) {
-      $scope = $rootScope.$new();
-      timefilter = _timefilter_;
-
-      createController = function () {
-        return $controller('doc', {
-          '$scope': $scope
-        });
-      };
-    });
-
-    createController();
-  };
-
-
-  describe('Doc app controller', function () {
-
-    it('should set status=found if the document was found', function (done) {
-      init('goodSearch');
-      $scope.$digest();
-      expect($scope.status).to.be('found');
-      done();
-    });
-
-    it('should attach the hit to scope', function (done) {
-      init('goodSearch');
-      $scope.$digest();
-      expect($scope.hit).to.be.an(Object);
-      expect($scope.hit._source).to.be.an(Object);
-      done();
-    });
-
-    it('should set status=notFound if the document was missing', function (done) {
-      init('badSearch');
-      $scope.$digest();
-      expect($scope.status).to.be('notFound');
-      done();
-    });
-
-    it('should set status=notFound if the request returns a 404', function (done) {
-      init('missingIndex');
-      $scope.$digest();
-      expect($scope.status).to.be('notFound');
-      done();
-    });
-
-    it('should set status=error if the request fails with any other code', function (done) {
-      init('badRequest');
-      $scope.$digest();
-      expect($scope.status).to.be('error');
-      done();
-    });
-
-    it('should disable the time filter', function (done) {
-      init();
-      expect(timefilter.enabled).to.be(false);
-      done();
-    });
-
-
-  });
-
-});
diff --git a/test/unit/specs/components/agg_response/geo_json/geo_json.js b/test/unit/specs/components/agg_response/geo_json/geo_json.js
deleted file mode 100644
index 193d99d087e61..0000000000000
--- a/test/unit/specs/components/agg_response/geo_json/geo_json.js
+++ /dev/null
@@ -1,180 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  describe('GeoJson Agg Response Converter', function () {
-    var vis;
-    var tabify;
-    var convert;
-    var esResponse;
-    var aggs;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      var Vis = Private(require('components/vis/vis'));
-      var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-
-      esResponse = Private(require('fixtures/agg_resp/geohash_grid'));
-      tabify = Private(require('components/agg_response/tabify/tabify'));
-      convert = Private(require('components/agg_response/geo_json/geo_json'));
-
-      vis = new Vis(indexPattern, {
-        type: 'tile_map',
-        aggs: [
-          { schema: 'metric', type: 'avg', params: { field: 'bytes' } },
-          { schema: 'split', type: 'terms', params: { field: '@tags' } },
-          { schema: 'segment', type: 'geohash_grid', params: { field: 'geo.coordinates', precision: 3 } }
-        ],
-        params: {
-          isDesaturated: true,
-          mapType: 'Scaled%20Circle%20Markers'
-        }
-      });
-
-      aggs = {
-        metric: vis.aggs[0],
-        split: vis.aggs[1],
-        geo: vis.aggs[2]
-      };
-    }));
-
-    [ { asAggConfigResults: true }, { asAggConfigResults: false } ].forEach(function (tableOpts) {
-
-      function makeTable() {
-        return _.sample(_.sample(tabify(vis, esResponse, tableOpts).tables).tables);
-      }
-
-      function makeSingleChart(table) {
-        return convert(vis, table || makeTable(), tableOpts);
-      }
-
-      function makeGeoJson() {
-        return makeSingleChart().geoJson;
-      }
-
-      describe('with table ' + JSON.stringify(tableOpts), function () {
-        it('outputs a chart', function () {
-          var table = makeTable();
-          var chart = makeSingleChart(table);
-          expect(chart).to.only.have.keys(
-            'title',
-            'tooltipFormatter',
-            'valueFormatter',
-            'geohashGridAgg',
-            'geoJson'
-          );
-
-          expect(chart.title).to.be(table.title());
-          expect(chart.tooltipFormatter).to.be.a('function');
-          expect(chart.valueFormatter).to.be(aggs.metric.fieldFormatter());
-          expect(chart.geohashGridAgg).to.be(aggs.geo);
-          expect(chart.geoJson).to.be.an('object');
-        });
-
-        it('outputs geohash points as features in a feature collection', function () {
-          var table = makeTable();
-          var chart = makeSingleChart(table);
-          var geoJson = chart.geoJson;
-
-          expect(geoJson.type).to.be('FeatureCollection');
-          expect(geoJson.features).to.be.an('array');
-          expect(geoJson.features).to.have.length(table.rows.length);
-        });
-
-        it('exports a bunch of properties about the geo hash grid', function () {
-          var geoJson = makeGeoJson();
-          var props = geoJson.properties;
-
-          // props
-          expect(props).to.be.an('object');
-          expect(props).to.have.keys('min', 'max');
-
-          // props.min
-          expect(props.min).to.be.a('number');
-          expect(props.min).to.be.greaterThan(0);
-
-          // props.max
-          expect(props.max).to.be.a('number');
-          expect(props.max).to.be.greaterThan(0);
-        });
-
-        describe('properties', function () {
-          describe('includes one feature per row in the table', function () {
-            this.timeout(60000);
-
-            var table;
-            var chart;
-            var geoColI;
-            var metricColI;
-
-            before(function () {
-              table = makeTable();
-              chart = makeSingleChart(table);
-              geoColI = _.findIndex(table.columns, { aggConfig: aggs.geo });
-              metricColI = _.findIndex(table.columns, { aggConfig: aggs.metric });
-            });
-
-            it('should be geoJson format', function () {
-              table.rows.forEach(function (row, i) {
-                var feature = chart.geoJson.features[i];
-                expect(feature).to.have.property('geometry');
-                expect(feature.geometry).to.be.an('object');
-                expect(feature).to.have.property('properties');
-                expect(feature.properties).to.be.an('object');
-              });
-            });
-
-            it('should have valid geometry data', function () {
-              table.rows.forEach(function (row, i) {
-                var geometry = chart.geoJson.features[i].geometry;
-                expect(geometry.type).to.be('Point');
-                expect(geometry).to.have.property('coordinates');
-                expect(geometry.coordinates).to.be.an('array');
-                expect(geometry.coordinates).to.have.length(2);
-                expect(geometry.coordinates[0]).to.be.a('number');
-                expect(geometry.coordinates[1]).to.be.a('number');
-              });
-            });
-
-            it('should have value properties data', function () {
-              table.rows.forEach(function (row, i) {
-                var props = chart.geoJson.features[i].properties;
-                var keys = ['value', 'geohash', 'aggConfigResult', 'rectangle', 'center'];
-                expect(props).to.be.an('object');
-                expect(props).to.only.have.keys(keys);
-                expect(props.geohash).to.be.a('string');
-                if (props.value != null) expect(props.value).to.be.a('number');
-              });
-            });
-
-            it('should use latLng in properties and lngLat in geometry', function () {
-              table.rows.forEach(function (row, i) {
-                var geometry = chart.geoJson.features[i].geometry;
-                var props = chart.geoJson.features[i].properties;
-                expect(props.center).to.eql(geometry.coordinates.slice(0).reverse());
-              });
-            });
-
-            it('should handle both AggConfig and non-AggConfig results', function () {
-              table.rows.forEach(function (row, i) {
-                var props = chart.geoJson.features[i].properties;
-                if (tableOpts.asAggConfigResults) {
-                  expect(props.aggConfigResult).to.be(row[metricColI]);
-                  expect(props.value).to.be(row[metricColI].value);
-                  expect(props.geohash).to.be(row[geoColI].value);
-                } else {
-                  expect(props.aggConfigResult).to.be(null);
-                  expect(props.value).to.be(row[metricColI]);
-                  expect(props.geohash).to.be(row[geoColI]);
-                }
-              });
-            });
-          });
-        });
-      });
-    });
-
-    describe('geoJson tooltip formatter', function () {});
-  });
-
-});
-
diff --git a/test/unit/specs/components/agg_response/hierarchical/array_to_linked_list.js b/test/unit/specs/components/agg_response/hierarchical/array_to_linked_list.js
deleted file mode 100644
index 930dad2fc3b6f..0000000000000
--- a/test/unit/specs/components/agg_response/hierarchical/array_to_linked_list.js
+++ /dev/null
@@ -1,27 +0,0 @@
-define(function (require) {
-  var arrayToLinkedList = require('components/agg_response/hierarchical/_array_to_linked_list');
-  describe('buildHierarchicalData()', function () {
-    describe('arrayToLinkedList', function () {
-
-      var results;
-      beforeEach(function () {
-        results = arrayToLinkedList([
-          { id: 1 },
-          { id: 2 },
-          { id: 3 }
-        ]);
-      });
-
-      it('should set the next element', function () {
-        expect(results[0]).to.have.property('_next', results[1]);
-        expect(results[1]).to.have.property('_next', results[2]);
-      });
-
-      it('should set the previous element', function () {
-        expect(results[1]).to.have.property('_previous', results[0]);
-        expect(results[2]).to.have.property('_previous', results[1]);
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/agg_response/hierarchical/build_hierarchical_data.js b/test/unit/specs/components/agg_response/hierarchical/build_hierarchical_data.js
deleted file mode 100644
index e4a2311100c91..0000000000000
--- a/test/unit/specs/components/agg_response/hierarchical/build_hierarchical_data.js
+++ /dev/null
@@ -1,278 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var fixtures = require('fixtures/fake_hierarchical_data');
-  var sinon = require('test_utils/auto_release_sinon');
-
-  var Vis;
-  var Notifier;
-  var AggConfigs;
-  var indexPattern;
-  var buildHierarchicalData;
-
-  describe('buildHierarchicalData()', function () {
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private, $injector) {
-      // stub the error method before requiring vis causes Notifier#error to be bound
-      Notifier = $injector.get('Notifier');
-      sinon.stub(Notifier.prototype, 'error');
-
-      Vis = Private(require('components/vis/vis'));
-      AggConfigs = Private(require('components/vis/AggConfigs'));
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-      buildHierarchicalData = Private(require('components/agg_response/hierarchical/build_hierarchical_data'));
-    }));
-
-
-    describe('metric only', function () {
-      var vis, results;
-
-      beforeEach(function () {
-        var id = 1;
-        vis = new Vis(indexPattern, {
-          type: 'pie',
-          aggs: [
-            { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-          ]
-        });
-        vis.aggs[0].id = 'agg_1';
-        results = buildHierarchicalData(vis, fixtures.metricOnly);
-
-      });
-
-      it('should set the slices with one children with the name _all', function () {
-        expect(results).to.have.property('slices');
-        expect(results.slices).to.have.property('children');
-        expect(results.slices.children).to.have.length(1);
-        expect(results.slices.children[0]).to.have.property('name', '_all');
-        expect(results.slices.children[0]).to.have.property('size', 412032);
-        expect(results).to.have.property('names');
-        expect(results.names).to.eql(['_all']);
-        expect(results).to.have.property('raw');
-        expect(results.raw).to.have.property('rows');
-        expect(results.raw.rows).to.have.length(1);
-        expect(results.raw.rows).to.eql([[412032]]);
-      });
-
-    });
-
-    describe('rows and columns', function () {
-
-      it('should set the rows', function () {
-        var id = 1;
-        var vis = new Vis(indexPattern, {
-          type: 'pie',
-          aggs: [
-            { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-            { type: 'terms', schema: 'split', params: { field: 'extension', row: true }},
-            { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
-            { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
-          ]
-        });
-        // We need to set the aggs to a known value.
-        _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
-        var results = buildHierarchicalData(vis, fixtures.threeTermBuckets);
-        expect(results).to.have.property('rows');
-      });
-
-      it('should set the columns', function () {
-        var id = 1;
-        var vis = new Vis(indexPattern, {
-          type: 'pie',
-          aggs: [
-            { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-            { type: 'terms', schema: 'split', params: { field: 'extension', row: false }},
-            { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
-            { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
-          ]
-        });
-        // We need to set the aggs to a known value.
-        _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
-        var results = buildHierarchicalData(vis, fixtures.threeTermBuckets);
-        expect(results).to.have.property('columns');
-      });
-
-    });
-
-    describe('threeTermBuckets', function () {
-      var vis, results;
-
-      beforeEach(function () {
-        var id = 1;
-        vis = new Vis(indexPattern, {
-          type: 'pie',
-          aggs: [
-            { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-            { type: 'terms', schema: 'split', params: { field: 'extension' }},
-            { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
-            { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
-          ]
-        });
-        // We need to set the aggs to a known value.
-        _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
-        results = buildHierarchicalData(vis, fixtures.threeTermBuckets);
-      });
-
-      it('should set the hits attribute for the results', function () {
-        expect(results).to.have.property('rows');
-        _.each(results.rows, function (item) {
-          expect(item).to.have.property('names');
-          expect(item).to.have.property('slices');
-          expect(item.slices).to.have.property('children');
-        });
-        expect(results).to.have.property('raw');
-      });
-
-      it('should set the parent of the first item in the split', function () {
-        expect(results).to.have.property('rows');
-        expect(results.rows).to.have.length(3);
-        expect(results.rows[0]).to.have.property('slices');
-        expect(results.rows[0].slices).to.have.property('children');
-        expect(results.rows[0].slices.children).to.have.length(2);
-        expect(results.rows[0].slices.children[0]).to.have.property('aggConfigResult');
-        expect(results.rows[0].slices.children[0].aggConfigResult.$parent).to.have.property('key', 'png');
-      });
-
-    });
-
-    describe('oneHistogramBucket', function () {
-      var vis, results;
-
-      beforeEach(function () {
-        var id = 1;
-        vis = new Vis(indexPattern, {
-          type: 'pie',
-          aggs: [
-            {
-              type: 'count',
-              schema: 'metric'
-            },
-            { type: 'histogram', schema: 'segment', params: { field: 'bytes', interval: 8192 }}
-          ]
-        });
-        // We need to set the aggs to a known value.
-        _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
-        results = buildHierarchicalData(vis, fixtures.oneHistogramBucket);
-      });
-
-      it('should set the hits attribute for the results', function () {
-        expect(results).to.have.property('slices');
-        expect(results.slices).to.property('children');
-        expect(results).to.have.property('names');
-        expect(results.names).to.have.length(6);
-        expect(results).to.have.property('raw');
-      });
-
-
-    });
-
-    describe('oneRangeBucket', function () {
-      var vis, results;
-
-      beforeEach(function () {
-        var id = 1;
-        vis = new Vis(indexPattern, {
-          type: 'pie',
-          aggs: [
-            {
-              type: 'count',
-              schema: 'metric'
-            },
-            {
-              type: 'range',
-              schema: 'segment',
-              params: {
-                field: 'bytes',
-                ranges: [
-                  { from: 0, to: 1000 },
-                  { from: 1000, to: 2000 }
-                ]
-              }
-            }
-          ]
-        });
-        // We need to set the aggs to a known value.
-        _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
-        results = buildHierarchicalData(vis, fixtures.oneRangeBucket);
-      });
-
-      it('should set the hits attribute for the results', function () {
-        expect(results).to.have.property('slices');
-        expect(results.slices).to.property('children');
-        expect(results).to.have.property('names');
-        expect(results.names).to.have.length(2);
-        expect(results).to.have.property('raw');
-      });
-
-    });
-
-    describe('oneFilterBucket', function () {
-      var vis, results;
-
-      beforeEach(function () {
-        var id = 1;
-        vis = new Vis(indexPattern, {
-          type: 'pie',
-          aggs: [
-            { type: 'count', schema: 'metric' },
-            { type: 'filters', schema: 'segment', params: {
-                filters: [
-                  { input: { query: { query_string: { query: '_type:apache' } } } },
-                  { input: { query: { query_string: { query: '_type:nginx' } } } }
-                ]
-              }
-            }
-          ]
-        });
-        // We need to set the aggs to a known value.
-        _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
-        results = buildHierarchicalData(vis, fixtures.oneFilterBucket);
-      });
-
-      it('should set the hits attribute for the results', function () {
-        expect(results).to.have.property('slices');
-        expect(results).to.have.property('names');
-        expect(results.names).to.have.length(2);
-        expect(results).to.have.property('raw');
-      });
-
-    });
-
-    describe('oneFilterBucket that is a split', function () {
-      var vis, results;
-
-      beforeEach(function () {
-        var id = 1;
-        vis = new Vis(indexPattern, {
-          type: 'pie',
-          aggs: [
-            { type: 'count', schema: 'metric' },
-            { type: 'filters', schema: 'split', params: {
-                filters: [
-                  { input: { query: { query_string: { query: '_type:apache' } } } },
-                  { input: { query: { query_string: { query: '_type:nginx' } } } }
-                ]
-              }
-            }
-          ]
-        });
-        // We need to set the aggs to a known value.
-        _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
-        results = buildHierarchicalData(vis, fixtures.oneFilterBucket);
-      });
-
-      it('should set the hits attribute for the results', function () {
-        var errCall = Notifier.prototype.error.getCall(0);
-        expect(errCall).to.be.ok();
-        expect(errCall.args[0]).to.contain('not supported');
-
-        expect(results).to.have.property('slices');
-        expect(results).to.have.property('names');
-        expect(results.names).to.have.length(2);
-        expect(results).to.have.property('raw');
-      });
-    });
-
-  });
-});
-
diff --git a/test/unit/specs/components/agg_response/hierarchical/collect_branch.js b/test/unit/specs/components/agg_response/hierarchical/collect_branch.js
deleted file mode 100644
index 5b014e609f147..0000000000000
--- a/test/unit/specs/components/agg_response/hierarchical/collect_branch.js
+++ /dev/null
@@ -1,57 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var collectBranch = require('components/agg_response/hierarchical/_collect_branch');
-  describe('collectBranch()', function () {
-    var results;
-    var convert = function (name) {
-      return 'converted:' + name;
-    };
-
-    beforeEach(function () {
-      results = collectBranch({
-        name: 'bucket3',
-        depth: 3,
-        size: 6,
-        field: { format: { convert: convert } },
-        aggConfig: { params: { field: { displayName: 'field3' } }, fieldFormatter: _.constant(String) },
-        parent: {
-          name: 'bucket2',
-          depth: 2,
-          size: 12,
-          aggConfig: { label: 'field2', fieldFormatter: _.constant(String) },
-          parent: {
-            name: 'bucket1',
-            depth: 1,
-            size: 24,
-            parent: {}
-          }
-        }
-      });
-    });
-
-    it('should return an array with bucket objects', function () {
-      expect(results).to.be.an(Array);
-      expect(results).to.have.length(3);
-
-      expect(results[0]).to.have.property('metric', 24);
-      expect(results[0]).to.have.property('depth', 0);
-      expect(results[0]).to.have.property('bucket', 'bucket1');
-      expect(results[0]).to.have.property('field', 'level 1');
-      expect(results[0]).to.have.property('aggConfig');
-
-      expect(results[1]).to.have.property('metric', 12);
-      expect(results[1]).to.have.property('depth', 1);
-      expect(results[1]).to.have.property('bucket', 'bucket2');
-      expect(results[1]).to.have.property('field', 'field2');
-      expect(results[1]).to.have.property('aggConfig');
-
-      expect(results[2]).to.have.property('metric', 6);
-      expect(results[2]).to.have.property('depth', 2);
-      expect(results[2]).to.have.property('bucket', 'bucket3');
-      expect(results[2]).to.have.property('field', 'field3');
-      expect(results[2]).to.have.property('aggConfig');
-
-    });
-
-  });
-});
diff --git a/test/unit/specs/components/agg_response/hierarchical/create_raw_data.js b/test/unit/specs/components/agg_response/hierarchical/create_raw_data.js
deleted file mode 100644
index 636e9c7b977b0..0000000000000
--- a/test/unit/specs/components/agg_response/hierarchical/create_raw_data.js
+++ /dev/null
@@ -1,80 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var fixtures = require('fixtures/fake_hierarchical_data');
-  var createRawData = require('components/agg_response/hierarchical/_create_raw_data');
-  var arrayToLinkedList = require('components/agg_response/hierarchical/_array_to_linked_list');
-
-  var AggConfigs;
-  var Vis;
-  var indexPattern;
-
-  describe('buildHierarchicalData()', function () {
-    describe('createRawData()', function () {
-      var vis, results;
-
-      beforeEach(module('kibana'));
-
-      beforeEach(inject(function (Private) {
-        Vis = Private(require('components/vis/vis'));
-        AggConfigs = Private(require('components/vis/AggConfigs'));
-        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-      }));
-
-      beforeEach(function () {
-        var id = 1;
-        vis = new Vis(indexPattern, {
-          type: 'pie',
-          aggs: [
-            { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-            { type: 'terms', schema: 'split', params: { field: 'extension' }},
-            { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
-            { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
-          ]
-        });
-        var buckets = arrayToLinkedList(vis.aggs.bySchemaGroup.buckets);
-        // We need to set the aggs to a known value.
-        _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
-        results = createRawData(vis, fixtures.threeTermBuckets);
-      });
-
-      it('should have columns set', function () {
-        expect(results).to.have.property('columns');
-        expect(results.columns).to.have.length(6);
-        _.each(results.columns, function (column) {
-          expect(column).to.have.property('aggConfig');
-          var agg = column.aggConfig;
-          expect(column).to.have.property('categoryName', agg.schema.name);
-          expect(column).to.have.property('id', agg.id);
-          expect(column).to.have.property('aggType', agg.type);
-          expect(column).to.have.property('field', agg.params.field);
-          expect(column).to.have.property('label', agg.type.makeLabel(agg));
-        });
-        expect(results.columns[0].aggConfig.id).to.be('agg_2');
-        expect(results.columns[1].aggConfig.id).to.be('agg_1');
-        expect(results.columns[2].aggConfig.id).to.be('agg_3');
-        expect(results.columns[3].aggConfig.id).to.be('agg_1');
-        expect(results.columns[4].aggConfig.id).to.be('agg_4');
-        expect(results.columns[5].aggConfig.id).to.be('agg_1');
-      });
-
-      it('should have rows set', function () {
-        expect(results).to.have.property('rows');
-        expect(results.rows).to.eql([
-          ['png', 412032, 'IT', 9299, 'win', 0],
-          ['png', 412032, 'IT', 9299, 'mac', 9299],
-          ['png', 412032, 'US', 8293, 'linux', 3992],
-          ['png', 412032, 'US', 8293, 'mac', 3029],
-          ['css', 412032, 'MX', 9299, 'win', 4992],
-          ['css', 412032, 'MX', 9299, 'mac', 5892],
-          ['css', 412032, 'US', 8293, 'linux', 3992],
-          ['css', 412032, 'US', 8293, 'mac', 3029],
-          ['html', 412032, 'CN', 9299, 'win', 4992],
-          ['html', 412032, 'CN', 9299, 'mac', 5892],
-          ['html', 412032, 'FR', 8293, 'win', 3992],
-          ['html', 412032, 'FR', 8293, 'mac', 3029]
-        ]);
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/agg_response/hierarchical/extract_buckets.js b/test/unit/specs/components/agg_response/hierarchical/extract_buckets.js
deleted file mode 100644
index 3fac9c85396f9..0000000000000
--- a/test/unit/specs/components/agg_response/hierarchical/extract_buckets.js
+++ /dev/null
@@ -1,45 +0,0 @@
-define(function (require) {
-  var extractBuckets = require('components/agg_response/hierarchical/_extract_buckets');
-
-  describe('buildHierarchicalData()', function () {
-    describe('extractBuckets()', function () {
-
-      it('should normalize a bucket object into an array', function () {
-
-        var bucket = {
-          buckets: {
-            foo: { doc_count: 1 },
-            bar: { doc_count: 2 }
-          }
-        };
-
-        var buckets = extractBuckets(bucket);
-        expect(buckets).to.be.an(Array);
-        expect(buckets).to.have.length(2);
-        expect(buckets[0]).to.have.property('key', 'foo');
-        expect(buckets[0]).to.have.property('doc_count', 1);
-        expect(buckets[1]).to.have.property('key', 'bar');
-        expect(buckets[1]).to.have.property('doc_count', 2);
-      });
-
-      it('should return an empty array for undefined buckets', function () {
-        var buckets = extractBuckets();
-        expect(buckets).to.be.an(Array);
-        expect(buckets).to.have.length(0);
-      });
-
-      it('should return the bucket array', function () {
-        var bucket =  {
-          buckets: [
-            { key: 'foo', doc_count: 1 },
-            { key: 'bar', doc_count: 2 }
-          ]
-        };
-        var buckets = extractBuckets(bucket);
-        expect(buckets).to.be.an(Array);
-        expect(buckets).to.be(bucket.buckets);
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/agg_response/hierarchical/transform_aggregation.js b/test/unit/specs/components/agg_response/hierarchical/transform_aggregation.js
deleted file mode 100644
index c1f5566110af1..0000000000000
--- a/test/unit/specs/components/agg_response/hierarchical/transform_aggregation.js
+++ /dev/null
@@ -1,95 +0,0 @@
-define(function (require) {
-  describe('buildHierarchicalData()', function () {
-    describe('transformAggregation()', function () {
-      var _ = require('lodash');
-      var transform;
-      var fixture;
-
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private) {
-        transform = Private(require('components/agg_response/hierarchical/_transform_aggregation'));
-      }));
-
-      beforeEach(function () {
-
-        function fakeAgg(id, name) {
-          return {
-            id: id,
-            name: name,
-            schema: { group: 'buckets' },
-            getKey: _.noop,
-            fieldFormatter: _.constant(String)
-          };
-        }
-
-        fixture = {};
-        fixture.agg = fakeAgg('agg_2', 'test');
-        fixture.agg._next = fakeAgg('agg_3', 'example');
-
-        fixture.metric = fakeAgg('agg_1', 'metric');
-        fixture.metric.getValue = function (b) { return _.has(b, this.id) ? b[this.id] : b.doc_count; };
-
-        fixture.aggData = {
-          buckets: [
-            { key: 'foo', doc_count: 2, agg_3: { buckets: [ { key: 'win', doc_count: 1 }, { key: 'mac', doc_count: 1 }]}},
-            { key: 'bar', doc_count: 4, agg_3: {  buckets: [ { key: 'win', doc_count: 2 }, { key: 'mac', doc_count: 2 }]}}
-          ]
-        };
-
-      });
-
-      it('relies on metricAgg#getValue() for the size of the children', function () {
-        var aggData = {
-          buckets: [
-            { key: 'foo' },
-            { key: 'bar' }
-          ]
-        };
-
-        var football = {};
-        fixture.metric.getValue = _.constant(football);
-
-        var children = transform(fixture.agg, fixture.metric, aggData);
-        expect(children).to.be.an(Array);
-        expect(children).to.have.length(2);
-        expect(children[0]).to.have.property('size', football);
-        expect(children[1]).to.have.property('size', football);
-      });
-
-      it('should create two levels of metrics', function () {
-        var children = transform(fixture.agg, fixture.metric, fixture.aggData);
-        fixture.metric.getValue = function (b) { return b.doc_count; };
-
-        expect(children).to.be.an(Array);
-        expect(children).to.have.length(2);
-        expect(children[0]).to.have.property('children');
-        expect(children[1]).to.have.property('children');
-        expect(children[0]).to.have.property('aggConfig', fixture.agg);
-        expect(children[1]).to.have.property('aggConfig', fixture.agg);
-        expect(children[0].children).to.have.length(2);
-        expect(children[1].children).to.have.length(2);
-        expect(children[0]).to.have.property('name', 'foo');
-        expect(children[0]).to.have.property('size', 2);
-        expect(children[1]).to.have.property('name', 'bar');
-        expect(children[1]).to.have.property('size', 4);
-        expect(children[0].children[0]).to.have.property('size', 1);
-        expect(children[0].children[0]).to.have.property('aggConfig', fixture.agg.agg_3);
-        expect(children[0].children[0]).to.have.property('name', 'win');
-        expect(children[0].children[1]).to.have.property('size', 1);
-        expect(children[0].children[1]).to.have.property('parent', children[0]);
-        expect(children[0].children[1]).to.have.property('aggConfig', fixture.agg.agg_3);
-        expect(children[0].children[1]).to.have.property('name', 'mac');
-        expect(children[1].children[0]).to.have.property('size', 2);
-        expect(children[0].children[1]).to.have.property('parent', children[0]);
-        expect(children[1].children[0]).to.have.property('aggConfig', fixture.agg.agg_3);
-        expect(children[1].children[0]).to.have.property('name', 'win');
-        expect(children[1].children[1]).to.have.property('size', 2);
-        expect(children[1].children[1]).to.have.property('parent', children[1]);
-        expect(children[1].children[1]).to.have.property('aggConfig', fixture.agg.agg_3);
-        expect(children[1].children[1]).to.have.property('name', 'mac');
-        expect(children[1].children[1]).to.have.property('parent', children[1]);
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/agg_response/point_series/_add_to_siri.js b/test/unit/specs/components/agg_response/point_series/_add_to_siri.js
deleted file mode 100644
index 986d4bc3590dd..0000000000000
--- a/test/unit/specs/components/agg_response/point_series/_add_to_siri.js
+++ /dev/null
@@ -1,56 +0,0 @@
-define(function (require) {
-  return ['addToSiri', function () {
-
-    var addToSiri;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      addToSiri = Private(require('components/agg_response/point_series/_add_to_siri'));
-    }));
-
-    it('creates a new series the first time it sees an id', function () {
-      var series = {};
-      var point = {};
-      var id = 'id';
-      addToSiri(series, point, id);
-
-      expect(series).to.have.own.property(id);
-      expect(series[id]).to.be.an('object');
-      expect(series[id].label).to.be(id);
-      expect(series[id].values).to.have.length(1);
-      expect(series[id].values[0]).to.be(point);
-    });
-
-    it('adds points to existing series if id has been seen', function () {
-      var series = {};
-      var id = 'id';
-
-      var point = {};
-      addToSiri(series, point, id);
-
-      var point2 = {};
-      addToSiri(series, point2, id);
-
-      expect(series).to.have.own.property(id);
-      expect(series[id]).to.be.an('object');
-      expect(series[id].label).to.be(id);
-      expect(series[id].values).to.have.length(2);
-      expect(series[id].values[0]).to.be(point);
-      expect(series[id].values[1]).to.be(point2);
-    });
-
-    it('allows overriding the series label', function () {
-      var series = {};
-      var id = 'id';
-      var label = 'label';
-      var point = {};
-      addToSiri(series, point, id, label);
-
-      expect(series).to.have.own.property(id);
-      expect(series[id]).to.be.an('object');
-      expect(series[id].label).to.be(label);
-      expect(series[id].values).to.have.length(1);
-      expect(series[id].values[0]).to.be(point);
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_response/point_series/_fake_x_aspect.js b/test/unit/specs/components/agg_response/point_series/_fake_x_aspect.js
deleted file mode 100644
index 714f3140d82b9..0000000000000
--- a/test/unit/specs/components/agg_response/point_series/_fake_x_aspect.js
+++ /dev/null
@@ -1,44 +0,0 @@
-define(function (require) {
-  return ['makeFakeXAspect', function () {
-
-    var makeFakeXAspect;
-    var Vis;
-    var AggType;
-    var AggConfig;
-    var indexPattern;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      Vis = Private(require('components/vis/vis'));
-      AggConfig = Private(require('components/vis/AggConfig'));
-      AggType = Private(require('components/agg_types/_agg_type'));
-      indexPattern = Private(require('components/vis/vis'));
-      makeFakeXAspect = Private(require('components/agg_response/point_series/_fake_x_aspect'));
-    }));
-
-    it('creates an object that looks like an aspect', function () {
-      var vis = new Vis(indexPattern, { type: 'histogram' });
-      var aspect = makeFakeXAspect(vis);
-
-      expect(aspect)
-        .to.have.property('i', -1)
-        .and.have.property('agg')
-        .and.have.property('col');
-
-      expect(aspect.agg)
-        .to.be.an(AggConfig)
-        .and.to.have.property('type');
-
-      expect(aspect.agg.type)
-        .to.be.an(AggType)
-        .and.to.have.property('name', 'all')
-        .and.to.have.property('title', 'All docs')
-        .and.to.have.property('hasNoDsl', true);
-
-      expect(aspect.col)
-        .to.be.an('object')
-        .and.to.have.property('aggConfig', aspect.agg)
-        .and.to.have.property('label', aspect.agg.makeLabel());
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_response/point_series/_get_aspects.js b/test/unit/specs/components/agg_response/point_series/_get_aspects.js
deleted file mode 100644
index fd87309e5cb8b..0000000000000
--- a/test/unit/specs/components/agg_response/point_series/_get_aspects.js
+++ /dev/null
@@ -1,151 +0,0 @@
-define(function (require) {
-  return ['getAspects', function () {
-    var _ = require('lodash');
-    var moment = require('moment');
-
-    var Vis;
-    var Table;
-    var AggConfig;
-    var indexPattern;
-    var getAspects;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      Vis = Private(require('components/vis/vis'));
-      Table = Private(require('components/agg_response/point_series/_add_to_siri'));
-      AggConfig = Private(require('components/vis/AggConfig'));
-      getAspects = Private(require('components/agg_response/point_series/_get_aspects'));
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-    }));
-
-    var vis;
-    var table;
-
-    var date = _.memoize(function (n) {
-      return moment().startOf('day').add(n, 'hour').valueOf();
-    });
-
-    function filterByIndex(map) {
-      return function (arr) {
-        return arr.filter(function (val, i) {
-          return map[i];
-        });
-      };
-    }
-
-    function validate(aspect, i) {
-      expect(i).to.be.a('number');
-      expect(aspect)
-        .to.be.an('object')
-        .and.have.property('i', i)
-        .and.have.property('agg', vis.aggs[i])
-        .and.have.property('col', table.columns[i]);
-    }
-
-    function init(group, x, y) {
-      // map args to indicies that should be removed
-      var filter = filterByIndex([
-        x > 0,
-        x > 1,
-        group > 0,
-        group > 1,
-        y > 0,
-        y > 1
-      ]);
-
-      vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [
-          { type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
-          { type: 'date_histogram', schema: 'segment', params: { field: 'utc_time' } },
-          { type: 'terms', schema: 'group', params: { field: 'extension' } },
-          { type: 'terms', schema: 'group', params: { field: 'geo.src' } },
-          { type: 'count', schema: 'metric' },
-          { type: 'avg', schema: 'metric', params: { field: 'bytes' } }
-        ]
-      });
-
-      table = {
-        columns: filter([
-          { aggConfig: vis.aggs[0] }, // date
-          { aggConfig: vis.aggs[1] }, // date
-          { aggConfig: vis.aggs[2] }, // extension
-          { aggConfig: vis.aggs[3] }, // extension
-          { aggConfig: vis.aggs[4] }, // count
-          { aggConfig: vis.aggs[5] }  // avg
-        ]),
-        rows: [
-          [ date(0), date(6), 'html', 'CN', 50, 50 ],
-          [ date(0), date(7), 'css', 'CN', 100, 25 ],
-          [ date(1), date(8), 'html', 'CN', 60, 50 ],
-          [ date(1), date(9), 'css', 'CN', 120, 25 ],
-          [ date(2), date(10), 'html', 'CN', 70, 50 ],
-          [ date(2), date(11), 'css', 'CN', 140, 25 ],
-          [ date(3), date(12), 'html', 'CN', 80, 50 ],
-          [ date(3), date(13), 'css', 'CN', 160, 25 ]
-        ].map(filter)
-      };
-
-      var aggs = vis.aggs.splice(0, vis.aggs.length);
-      filter(aggs).forEach(function (filter) {
-        vis.aggs.push(filter);
-      });
-    }
-
-    it('produces an aspect object for each of the aspect types found in the columns', function () {
-      init(1, 1, 1);
-
-      var aspects = getAspects(vis, table);
-      validate(aspects.x, 0);
-      validate(aspects.series, 1);
-      validate(aspects.y, 2);
-    });
-
-    it('uses arrays only when there are more than one aspect of a specific type', function () {
-      init(0, 1, 2);
-
-      var aspects = getAspects(vis, table);
-
-      validate(aspects.x, 0);
-      expect(aspects.series == null).to.be(true);
-
-      expect(aspects.y).to.be.an('array').and.have.length(2);
-      expect(aspects.y[0], 1);
-      expect(aspects.y[1], 2);
-    });
-
-    it('throws an error if there are multiple x aspects', function () {
-      init(0, 2, 1);
-
-      expect(function () {
-        getAspects(vis, table);
-      }).to.throwError(TypeError);
-    });
-
-    it('throws an error if there are multiple series aspects', function () {
-      init(2, 1, 1);
-
-      expect(function () {
-        getAspects(vis, table);
-      }).to.throwError(TypeError);
-    });
-
-    it('creates a fake x aspect if the column does not exist', function () {
-      init(0, 0, 1);
-
-      var aspects = getAspects(vis, table);
-
-      expect(aspects.x)
-        .to.be.an('object')
-        .and.have.property('i', -1)
-        .and.have.property('agg')
-        .and.have.property('col');
-
-      expect(aspects.x.agg).to.be.an(AggConfig);
-      expect(aspects.x.col)
-        .to.be.an('object')
-        .and.to.have.property('aggConfig', aspects.x.agg);
-
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_response/point_series/_get_point.js b/test/unit/specs/components/agg_response/point_series/_get_point.js
deleted file mode 100644
index 02eef4d2f0f6b..0000000000000
--- a/test/unit/specs/components/agg_response/point_series/_get_point.js
+++ /dev/null
@@ -1,72 +0,0 @@
-define(function (require) {
-  return ['getPoint', function () {
-    var _ = require('lodash');
-    var getPoint;
-
-    var truthFormatted = { fieldFormatter: _.constant(_.constant(true)) };
-    var identFormatted = { fieldFormatter: _.constant(_.identity) };
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      getPoint = Private(require('components/agg_response/point_series/_get_point'));
-    }));
-
-    it('properly unwraps and scales values without a series', function () {
-      var row = [ { value: 1 }, { value: 2 }, { value: 3 } ];
-      var xAspect = { i: 0 };
-      var seriesAspect = null;
-      var yScale = 5;
-      var yAspect = { i: 1 };
-      var zAspect = { i: 2 };
-      var point = getPoint(xAspect, seriesAspect, yScale, row, yAspect, zAspect);
-
-      expect(point)
-        .to.have.property('x', 1)
-        .and.have.property('y', 10)
-        .and.have.property('z', 3)
-        .and.have.property('aggConfigResult', row[1])
-        .and.not.have.property('series');
-    });
-
-    it('properly unwraps and scales values with a series', function () {
-      var row = [ { value: 1 }, { value: 2 }, { value: 3 }];
-      var xAspect = { i: 0 };
-      var seriesAspect = { i: 1, agg: identFormatted };
-      var yScale = null;
-      var yAspect = { i: 2 };
-      var point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
-
-      expect(point)
-        .to.have.property('x', 1)
-        .and.have.property('series', 2)
-        .and.have.property('y', 3)
-        .and.have.property('aggConfigResult', row[2]);
-    });
-
-    it('properly formats series values', function () {
-      var row = [ { value: 1 }, { value: 2 }, { value: 3 } ];
-      var xAspect = { i: 0 };
-      var seriesAspect = { i: 1, agg: truthFormatted };
-      var yScale = null;
-      var yAspect = { i: 2 };
-      var point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
-
-      expect(point)
-        .to.have.property('x', 1)
-        .and.have.property('series', true)
-        .and.have.property('y', 3)
-        .and.have.property('aggConfigResult', row[2]);
-    });
-
-    it('ignores points with a y value of NaN', function () {
-      var row = [ { value: 1 }, { value: 'NaN' }];
-      var xAspect = { i: 0 };
-      var seriesAspect = null;
-      var yScale = 5;
-      var yAspect = { i: 1 };
-      var point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
-      expect(point).to.be(void 0);
-    });
-
-  }];
-});
diff --git a/test/unit/specs/components/agg_response/point_series/_get_series.js b/test/unit/specs/components/agg_response/point_series/_get_series.js
deleted file mode 100644
index 7e875ef2a4d59..0000000000000
--- a/test/unit/specs/components/agg_response/point_series/_get_series.js
+++ /dev/null
@@ -1,238 +0,0 @@
-define(function (require) {
-  return ['getSeries', function () {
-    var _ = require('lodash');
-    var getSeries;
-
-    var agg = { fieldFormatter: _.constant(_.identity) };
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      getSeries = Private(require('components/agg_response/point_series/_get_series'));
-    }));
-
-    function wrapRows(row) {
-      return row.map(function (v) {
-        return { value: v };
-      });
-    }
-
-    it('produces a single series with points for each row', function () {
-      var rows = [
-        [1, 2, 3],
-        [1, 2, 3],
-        [1, 2, 3],
-        [1, 2, 3],
-        [1, 2, 3]
-      ].map(wrapRows);
-
-      var chart = {
-        aspects: {
-          x: { i: 0 },
-          y: { i: 1 },
-          z: { i: 2 }
-        }
-      };
-
-      var series = getSeries(rows, chart);
-
-      expect(series)
-        .to.be.an('array')
-        .and.to.have.length(1);
-
-      var siri = series[0];
-      expect(siri)
-        .to.be.an('object')
-        .and.have.property('label', '')
-        .and.have.property('values');
-
-      expect(siri.values)
-        .to.be.an('array')
-        .and.have.length(5);
-
-      siri.values.forEach(function (point) {
-        expect(point)
-          .to.have.property('x', 1)
-          .and.property('y', 2)
-          .and.property('z', 3);
-      });
-    });
-
-    it('produces multiple series if there are multiple y aspects', function () {
-      var rows = [
-        [1, 2, 3],
-        [1, 2, 3],
-        [1, 2, 3],
-        [1, 2, 3],
-        [1, 2, 3]
-      ].map(wrapRows);
-
-      var chart = {
-        aspects: {
-          x: { i: 0 },
-          y: [
-            { i: 1, col: { title: '0' }, agg: { id: 1 } },
-            { i: 2, col: { title: '1' }, agg: { id: 2 } },
-          ]
-        }
-      };
-
-      var series = getSeries(rows, chart);
-
-      expect(series)
-        .to.be.an('array')
-        .and.to.have.length(2);
-
-      series.forEach(function (siri, i) {
-        expect(siri)
-          .to.be.an('object')
-          .and.have.property('label', '' + i)
-          .and.have.property('values');
-
-        expect(siri.values)
-          .to.be.an('array')
-          .and.have.length(5);
-
-        siri.values.forEach(function (point) {
-          expect(point)
-            .to.have.property('x', 1)
-            .and.property('y', i + 2);
-        });
-      });
-    });
-
-    it('produces multiple series if there is a series aspect', function () {
-      var rows = [
-        ['0', 3],
-        ['1', 3],
-        ['1', 'NaN'],
-        ['0', 3],
-        ['0', 'NaN'],
-        ['1', 3],
-        ['0', 3],
-        ['1', 3]
-      ].map(wrapRows);
-
-      var chart = {
-        aspects: {
-          x: { i: -1 },
-          series: { i: 0, agg: agg },
-          y: { i: 1, col: { title: '0' } }
-        }
-      };
-
-      var series = getSeries(rows, chart);
-
-      expect(series)
-        .to.be.an('array')
-        .and.to.have.length(2);
-
-      series.forEach(function (siri, i) {
-        expect(siri)
-          .to.be.an('object')
-          .and.have.property('label', '' + i)
-          .and.have.property('values');
-
-        expect(siri.values)
-          .to.be.an('array')
-          .and.have.length(3);
-
-        siri.values.forEach(function (point) {
-          expect(point)
-            .to.have.property('x', '_all')
-            .and.property('y', 3);
-        });
-      });
-    });
-
-    it('produces multiple series if there is a series aspect and multipl y aspects', function () {
-      var rows = [
-        ['0', 3, 4],
-        ['1', 3, 4],
-        ['0', 3, 4],
-        ['1', 3, 4],
-        ['0', 3, 4],
-        ['1', 3, 4]
-      ].map(wrapRows);
-
-      var chart = {
-        aspects: {
-          x: { i: -1 },
-          series: { i: 0, agg: agg },
-          y: [
-            { i: 1, col: { title: '0' }, agg: { id: 1 } },
-            { i: 2, col: { title: '1' }, agg: { id: 2 } }
-          ]
-        }
-      };
-
-      var series = getSeries(rows, chart);
-
-      expect(series)
-        .to.be.an('array')
-        .and.to.have.length(4); // two series * two metrics
-
-      checkSiri(series[0], '0: 0', 3);
-      checkSiri(series[1], '0: 1', 4);
-      checkSiri(series[2], '1: 0', 3);
-      checkSiri(series[3], '1: 1', 4);
-
-      function checkSiri(siri, label, y) {
-        expect(siri)
-          .to.be.an('object')
-          .and.have.property('label', label)
-          .and.have.property('values');
-
-        expect(siri.values)
-          .to.be.an('array')
-          .and.have.length(3);
-
-        siri.values.forEach(function (point) {
-          expect(point)
-            .to.have.property('x', '_all')
-            .and.property('y', y);
-        });
-      }
-    });
-
-    it('produces a series list in the same order as its corresponding metric column', function () {
-      var rows = [
-        ['0', 3, 4],
-        ['1', 3, 4],
-        ['0', 3, 4],
-        ['1', 3, 4],
-        ['0', 3, 4],
-        ['1', 3, 4]
-      ].map(wrapRows);
-
-      var chart = {
-        aspects: {
-          x: { i: -1 },
-          series: { i: 0, agg: agg },
-          y: [
-            { i: 1, col: { title: '0' }, agg: { id: 1 } },
-            { i: 2, col: { title: '1' }, agg: { id: 2 } }
-          ]
-        }
-      };
-
-      var series = getSeries(rows, chart);
-      expect(series[0]).to.have.property('label', '0: 0');
-      expect(series[1]).to.have.property('label', '0: 1');
-      expect(series[2]).to.have.property('label', '1: 0');
-      expect(series[3]).to.have.property('label', '1: 1');
-
-
-      // switch the order of the y columns
-      chart.aspects.y = chart.aspects.y.reverse();
-      chart.aspects.y.forEach(function (y, i) {
-        y.i = i;
-      });
-
-      var series2 = getSeries(rows, chart);
-      expect(series2[0]).to.have.property('label', '0: 1');
-      expect(series2[1]).to.have.property('label', '0: 0');
-      expect(series2[2]).to.have.property('label', '1: 1');
-      expect(series2[3]).to.have.property('label', '1: 0');
-    });
-  }];
-});
diff --git a/test/unit/specs/components/agg_response/point_series/_init_x_axis.js b/test/unit/specs/components/agg_response/point_series/_init_x_axis.js
deleted file mode 100644
index 7c75bb6d26d9d..0000000000000
--- a/test/unit/specs/components/agg_response/point_series/_init_x_axis.js
+++ /dev/null
@@ -1,66 +0,0 @@
-define(function (require) {
-  return ['initXAxis', function () {
-    var _ = require('lodash');
-
-    var initXAxis;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      initXAxis = Private(require('components/agg_response/point_series/_init_x_axis'));
-    }));
-
-    var baseChart = {
-      aspects: {
-        x: {
-          agg: {
-            fieldFormatter: _.constant({}),
-            write: _.constant({ params: {} }),
-            type: {}
-          },
-          col: {
-            title: 'label'
-          }
-        }
-      }
-    };
-
-    it('sets the xAxisFormatter if the agg is not ordered', function () {
-      var chart = _.cloneDeep(baseChart);
-      initXAxis(chart);
-      expect(chart)
-        .to.have.property('xAxisLabel', 'label')
-        .and.have.property('xAxisFormatter', chart.aspects.x.agg.fieldFormatter());
-    });
-
-    it('makes the chart ordered if the agg is ordered', function () {
-      var chart = _.cloneDeep(baseChart);
-      chart.aspects.x.agg.type.ordered = true;
-
-      initXAxis(chart);
-      expect(chart)
-        .to.have.property('xAxisLabel', 'label')
-        .and.have.property('xAxisFormatter', chart.aspects.x.agg.fieldFormatter())
-        .and.have.property('ordered');
-
-      expect(chart.ordered)
-        .to.be.an('object')
-        .and.not.have.property('interval');
-    });
-
-    it('reads the interval param from the x agg', function () {
-      var chart = _.cloneDeep(baseChart);
-      chart.aspects.x.agg.type.ordered = true;
-      chart.aspects.x.agg.write = _.constant({ params: { interval: 10 } });
-
-      initXAxis(chart);
-      expect(chart)
-        .to.have.property('xAxisLabel', 'label')
-        .and.have.property('xAxisFormatter', chart.aspects.x.agg.fieldFormatter())
-        .and.have.property('ordered');
-
-      expect(chart.ordered)
-        .to.be.an('object')
-        .and.have.property('interval', 10);
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_response/point_series/_init_y_axis.js b/test/unit/specs/components/agg_response/point_series/_init_y_axis.js
deleted file mode 100644
index 182956217b35c..0000000000000
--- a/test/unit/specs/components/agg_response/point_series/_init_y_axis.js
+++ /dev/null
@@ -1,68 +0,0 @@
-define(function (require) {
-  return ['initYAxis', function () {
-    var _ = require('lodash');
-
-    var initYAxis;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      initYAxis = Private(require('components/agg_response/point_series/_init_y_axis'));
-    }));
-
-    function agg() {
-      return {
-        fieldFormatter: _.constant({}),
-        write: _.constant({ params: {} }),
-        type: {}
-      };
-    }
-
-    var baseChart = {
-      aspects: {
-        y: [
-          { agg: agg(), col: { title: 'y1' } },
-          { agg: agg(), col: { title: 'y2' } },
-        ],
-        x: {
-          agg: agg(),
-          col: { title: 'x' }
-        }
-      }
-    };
-
-    describe('with a single y aspect', function () {
-      var singleYBaseChart = _.cloneDeep(baseChart);
-      singleYBaseChart.aspects.y = singleYBaseChart.aspects.y[0];
-
-      it('sets the yAxisFormatter the the field formats convert fn', function () {
-        var chart = _.cloneDeep(singleYBaseChart);
-        initYAxis(chart);
-        expect(chart).to.have.property('yAxisFormatter', chart.aspects.y.agg.fieldFormatter());
-      });
-
-      it('sets the yAxisLabel', function () {
-        var chart = _.cloneDeep(singleYBaseChart);
-        initYAxis(chart);
-        expect(chart).to.have.property('yAxisLabel', 'y1');
-      });
-    });
-
-    describe('with mutliple y aspects', function () {
-      it('sets the yAxisFormatter the the field formats convert fn for the first y aspect', function () {
-        var chart = _.cloneDeep(baseChart);
-        initYAxis(chart);
-
-        expect(chart).to.have.property('yAxisFormatter');
-        expect(chart.yAxisFormatter)
-          .to.be(chart.aspects.y[0].agg.fieldFormatter())
-          .and.not.be(chart.aspects.y[1].agg.fieldFormatter());
-      });
-
-      it('does not set the yAxisLabel, it does not make sense to put multiple labels on the same axis', function () {
-        var chart = _.cloneDeep(baseChart);
-        initYAxis(chart);
-        expect(chart).to.have.property('yAxisLabel', '');
-      });
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_response/point_series/_main.js b/test/unit/specs/components/agg_response/point_series/_main.js
deleted file mode 100644
index 7cfd70e017c07..0000000000000
--- a/test/unit/specs/components/agg_response/point_series/_main.js
+++ /dev/null
@@ -1,251 +0,0 @@
-define(function (require) {
-  return ['pointSeriesChartDataFromTable', function () {
-    this.slow(1000);
-
-    var _ = require('lodash');
-    var moment = require('moment');
-    var AggConfigResult = require('components/vis/AggConfigResult');
-
-    var pointSeriesChartDataFromTable;
-    var indexPattern;
-    var Table;
-    var Vis;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      Vis = Private(require('components/vis/vis'));
-      Table = Private(require('components/agg_response/tabify/_table'));
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-      pointSeriesChartDataFromTable = Private(require('components/agg_response/point_series/point_series'));
-    }));
-
-    it('handles a table with just a count', function () {
-      var vis = new Vis(indexPattern, { type: 'histogram' });
-      var agg = vis.aggs[0];
-      var result = new AggConfigResult(vis.aggs[0], void 0, 100, 100);
-
-      var table = new Table();
-      table.columns = [ { aggConfig: agg } ];
-      table.rows.push([ result ]);
-
-      var chartData = pointSeriesChartDataFromTable(vis, table);
-
-      expect(chartData).to.be.an('object');
-      expect(chartData.series).to.be.an('array');
-      expect(chartData.series).to.have.length(1);
-      var series = chartData.series[0];
-      expect(series.values).to.have.length(1);
-      expect(series.values[0])
-        .to.have.property('x', '_all')
-        .and.have.property('y', 100)
-        .and.have.property('aggConfigResult', result);
-    });
-
-    it('handles a table with x and y column', function () {
-      var vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [
-          { type: 'count', schema: 'metric' },
-          { type: 'date_histogram', params: { field: '@timestamp', interval: 'hour' }, schema: 'segment' }
-        ]
-      });
-
-      var y = {
-        agg: vis.aggs[0],
-        col: { aggConfig: vis.aggs[0] },
-        at: function (i) { return 100 * i; }
-      };
-
-      var x = {
-        agg: vis.aggs[1],
-        col: { aggConfig: vis.aggs[1] },
-        at: function (i) { return moment().startOf('day').add(i, 'day').valueOf(); }
-      };
-
-      var rowCount = 3;
-      var table = new Table();
-      table.columns = [ x.col, y.col ];
-      _.times(rowCount, function (i) {
-        var date = new AggConfigResult(x.agg, void 0, x.at(i));
-        table.rows.push([date, new AggConfigResult(y.agg, date, y.at(i))]);
-      });
-
-      var chartData = pointSeriesChartDataFromTable(vis, table);
-
-      expect(chartData).to.be.an('object');
-      expect(chartData.series).to.be.an('array');
-      expect(chartData.series).to.have.length(1);
-      var series = chartData.series[0];
-      expect(series.values).to.have.length(rowCount);
-      series.values.forEach(function (point, i) {
-        expect(point)
-          .to.have.property('x', x.at(i))
-          .and.property('y', y.at(i))
-          .and.property('aggConfigResult');
-
-        expect(point.aggConfigResult)
-          .to.be.an(AggConfigResult)
-          .and.property('value', y.at(i))
-          .and.property('$parent');
-
-        expect(point.aggConfigResult.$parent)
-          .to.have.property('value', x.at(i))
-          .and.property('$parent', undefined);
-      });
-    });
-
-    it('handles a table with an x and two y aspects', function () {
-      var vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [
-          { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-          { type: 'date_histogram', params: { field: '@timestamp', interval: 'hour' }, schema: 'segment' },
-          { type: 'max', schema: 'metric', params: { field: 'bytes' } }
-        ]
-      });
-
-      var avg = {
-        agg: vis.aggs[0],
-        col: { title: 'average', aggConfig: vis.aggs[0] },
-        at: function (i) { return 75.444 * (i + 1); }
-      };
-
-      var date = {
-        agg: vis.aggs[1],
-        col: { title: 'date', aggConfig: vis.aggs[1] },
-        at: function (i) { return moment().startOf('day').add(i, 'day').valueOf(); }
-      };
-
-      var max = {
-        agg: vis.aggs[2],
-        col: { title: 'maximum', aggConfig: vis.aggs[2] },
-        at: function (i) { return 100 * (i + 1); }
-      };
-
-      var rowCount = 3;
-      var table = new Table();
-      table.columns = [ date.col, avg.col, max.col ];
-      _.times(rowCount, function (i) {
-        var dateResult = new AggConfigResult(date.agg, void 0, date.at(i));
-        var avgResult = new AggConfigResult(avg.agg, dateResult, avg.at(i));
-        var maxResult = new AggConfigResult(max.agg, dateResult, max.at(i));
-        table.rows.push([dateResult, avgResult, maxResult]);
-      });
-
-      var chartData = pointSeriesChartDataFromTable(vis, table);
-      expect(chartData).to.be.an('object');
-      expect(chartData.series).to.be.an('array');
-      expect(chartData.series).to.have.length(2);
-      chartData.series.forEach(function (siri, i) {
-        var metric = i === 0 ? avg : max;
-
-        expect(siri).to.have.property('label', metric.col.label);
-        expect(siri.values).to.have.length(rowCount);
-        siri.values.forEach(function (point, i) {
-          expect(point).to.have.property('x');
-          expect(point.x).to.be.a('number');
-
-          expect(point).to.have.property('y');
-          expect(point.y).to.be.a('number');
-
-          expect(point).to.not.have.property('series');
-
-          expect(point).to.have.property('aggConfigResult');
-          expect(point.aggConfigResult)
-            .to.be.a(AggConfigResult)
-            .and.have.property('aggConfig', metric.agg)
-            .and.have.property('value', point.y)
-            .and.to.have.property('$parent');
-
-          expect(point.aggConfigResult.$parent)
-            .to.be.an(AggConfigResult)
-            .and.have.property('aggConfig', date.agg);
-        });
-      });
-    });
-
-    it('handles a table with an x, a series, and two y aspects', function () {
-      var vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [
-          { type: 'terms', schema: 'group', params: { field: 'extension' } },
-          { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-          { type: 'date_histogram', params: { field: '@timestamp', interval: 'hour' }, schema: 'segment' },
-          { type: 'max', schema: 'metric', params: { field: 'bytes' } }
-        ]
-      });
-
-      var extensions = ['php', 'jpg', 'gif', 'css'];
-      var term = {
-        agg: vis.aggs[0],
-        col: { title: 'extensions', aggConfig: vis.aggs[0] },
-        at: function (i) { return extensions[i % extensions.length]; }
-      };
-
-      var avg = {
-        agg: vis.aggs[1],
-        col: { title: 'average', aggConfig: vis.aggs[1] },
-        at: function (i) { return 75.444 * (i + 1); }
-      };
-
-      var date = {
-        agg: vis.aggs[2],
-        col: { title: 'date', aggConfig: vis.aggs[2] },
-        at: function (i) { return moment().startOf('day').add(i, 'day').valueOf(); }
-      };
-
-      var max = {
-        agg: vis.aggs[3],
-        col: { title: 'maximum', aggConfig: vis.aggs[3] },
-        at: function (i) { return 100 * (i + 1); }
-      };
-
-      var metricCount = 2;
-      var rowsPerSegment = 2;
-      var rowCount = extensions.length * rowsPerSegment;
-      var table = new Table();
-      table.columns = [ date.col, term.col, avg.col, max.col ];
-      _.times(rowCount, function (i) {
-        var dateResult = new AggConfigResult(date.agg, void 0, date.at(i));
-        var termResult = new AggConfigResult(term.agg, dateResult, term.at(i));
-        var avgResult = new AggConfigResult(avg.agg, termResult, avg.at(i));
-        var maxResult = new AggConfigResult(max.agg, termResult, max.at(i));
-        table.rows.push([dateResult, termResult, avgResult, maxResult]);
-      });
-
-      var chartData = pointSeriesChartDataFromTable(vis, table);
-      expect(chartData).to.be.an('object');
-      expect(chartData.series).to.be.an('array');
-      // one series for each extension, and then one for each metric inside
-      expect(chartData.series).to.have.length(extensions.length * metricCount);
-      chartData.series.forEach(function (siri, i) {
-        // figure out the metric used to create this series
-        var metricAgg = siri.values[0].aggConfigResult.aggConfig;
-        var metric = avg.agg === metricAgg ? avg : max;
-
-        expect(siri.values).to.have.length(rowsPerSegment);
-        siri.values.forEach(function (point) {
-          expect(point).to.have.property('x');
-          expect(point.x).to.be.a('number');
-
-          expect(point).to.have.property('y');
-          expect(point.y).to.be.a('number');
-
-          expect(point).to.have.property('series');
-          expect(_.contains(extensions, point.series)).to.be.ok();
-
-          expect(point).to.have.property('aggConfigResult');
-          expect(point.aggConfigResult)
-            .to.be.a(AggConfigResult)
-            .and.have.property('aggConfig', metric.agg)
-            .and.have.property('value', point.y)
-            .and.to.have.property('$parent');
-
-          expect(point.aggConfigResult.$parent)
-            .to.be.an(AggConfigResult)
-            .and.have.property('aggConfig', term.agg);
-        });
-      });
-    });
-  }];
-});
diff --git a/test/unit/specs/components/agg_response/point_series/_ordered_date_axis.js b/test/unit/specs/components/agg_response/point_series/_ordered_date_axis.js
deleted file mode 100644
index af62f16bda38b..0000000000000
--- a/test/unit/specs/components/agg_response/point_series/_ordered_date_axis.js
+++ /dev/null
@@ -1,90 +0,0 @@
-define(function (require) {
-  return ['orderedDateAxis', function () {
-    var moment = require('moment');
-    var _ = require('lodash');
-    var sinon = require('test_utils/auto_release_sinon');
-
-    var baseArgs = {
-      vis: {
-        indexPattern: {
-          timeFieldName: '@timestamp'
-        }
-      },
-      chart: {
-        aspects: {
-          x: {
-            agg: {
-              fieldIsTimeField: _.constant(true),
-              buckets: {
-                getScaledDateFormat: _.constant('hh:mm:ss'),
-                getInterval: _.constant(moment.duration(15, 'm')),
-                getBounds: _.constant({ min: moment().subtract(15, 'm'), max: moment() })
-              }
-            }
-          }
-        }
-      }
-    };
-
-    var orderedDateAxis;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      orderedDateAxis = Private(require('components/agg_response/point_series/_ordered_date_axis'));
-    }));
-
-    describe('xAxisFormatter', function () {
-      it('sets the xAxisFormatter', function () {
-        var args = _.cloneDeep(baseArgs);
-        orderedDateAxis(args.vis, args.chart);
-
-        expect(args.chart).to.have.property('xAxisFormatter');
-        expect(args.chart.xAxisFormatter).to.be.a('function');
-      });
-
-      it('formats values using moment, and returns strings', function () {
-        var args = _.cloneDeep(baseArgs);
-        orderedDateAxis(args.vis, args.chart);
-
-        var val = '2014-08-06T12:34:01';
-        expect(args.chart.xAxisFormatter(val))
-          .to.be(moment(val).format('hh:mm:ss'));
-      });
-    });
-
-    describe('ordered object', function () {
-      it('sets date: true', function () {
-        var args = _.cloneDeep(baseArgs);
-        orderedDateAxis(args.vis, args.chart);
-
-        expect(args.chart)
-          .to.have.property('ordered');
-
-        expect(args.chart.ordered)
-          .to.have.property('date', true);
-      });
-
-      it('relies on agg.buckets for the interval', function () {
-        var args = _.cloneDeep(baseArgs);
-        var spy = sinon.spy(args.chart.aspects.x.agg.buckets, 'getInterval');
-        orderedDateAxis(args.vis, args.chart);
-        expect(spy).to.have.property('callCount', 1);
-      });
-
-      it('sets the min/max when the buckets are bounded', function () {
-        var args = _.cloneDeep(baseArgs);
-        orderedDateAxis(args.vis, args.chart);
-        expect(moment.isMoment(args.chart.ordered.min)).to.be(true);
-        expect(moment.isMoment(args.chart.ordered.max)).to.be(true);
-      });
-
-      it('does not set the min/max when the buckets are unbounded', function () {
-        var args = _.cloneDeep(baseArgs);
-        args.chart.aspects.x.agg.buckets.getBounds = _.constant();
-        orderedDateAxis(args.vis, args.chart);
-        expect(args.chart.ordered).to.not.have.property('min');
-        expect(args.chart.ordered).to.not.have.property('max');
-      });
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_response/point_series/_tooltip_formatter.js b/test/unit/specs/components/agg_response/point_series/_tooltip_formatter.js
deleted file mode 100644
index 72b00bf3de083..0000000000000
--- a/test/unit/specs/components/agg_response/point_series/_tooltip_formatter.js
+++ /dev/null
@@ -1,61 +0,0 @@
-define(function (require) {
-  return ['tooltipFormatter', function () {
-    var _ = require('lodash');
-    var $ = require('jquery');
-
-    var tooltipFormatter;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      tooltipFormatter = Private(require('components/agg_response/point_series/_tooltip_formatter'));
-    }));
-
-    function agg(name) {
-      return {
-        fieldFormatter: _.constant(function (v) { return '(' + v + ')'; }),
-        makeLabel: _.constant(name)
-      };
-    }
-
-    function cell($row, i) {
-      return $row.eq(i).text().trim();
-    }
-
-    var baseEvent = {
-      datum: {
-        aggConfigResult: {
-          aggConfig: agg('inner'),
-          value: 3,
-          $parent: {
-            aggConfig: agg('middle'),
-            value: 2,
-            $parent: {
-              aggConfig: agg('top'),
-              value: 1
-            }
-          }
-        },
-        extraMetrics: []
-      }
-    };
-
-    it('returns html based on the mouse event', function () {
-      var event = _.cloneDeep(baseEvent);
-      var $el = $(tooltipFormatter(event));
-      var $rows = $el.find('tr');
-      expect($rows.size()).to.be(3);
-
-      var $row1 = $rows.eq(0).find('td');
-      expect(cell($row1, 0)).to.be('inner');
-      expect(cell($row1, 1)).to.be('(3)');
-
-      var $row2 = $rows.eq(1).find('td');
-      expect(cell($row2, 0)).to.be('middle');
-      expect(cell($row2, 1)).to.be('(2)');
-
-      var $row3 = $rows.eq(2).find('td');
-      expect(cell($row3, 0)).to.be('top');
-      expect(cell($row3, 1)).to.be('(1)');
-    });
-  }];
-});
diff --git a/test/unit/specs/components/agg_response/point_series/point_series.js b/test/unit/specs/components/agg_response/point_series/point_series.js
deleted file mode 100644
index 05cf49f2831fd..0000000000000
--- a/test/unit/specs/components/agg_response/point_series/point_series.js
+++ /dev/null
@@ -1,14 +0,0 @@
-define(function (require) {
-  describe('Point Series Agg Response', function () {
-    describe(require('specs/components/agg_response/point_series/_main'));
-    describe(require('specs/components/agg_response/point_series/_add_to_siri'));
-    describe(require('specs/components/agg_response/point_series/_fake_x_aspect'));
-    describe(require('specs/components/agg_response/point_series/_get_aspects'));
-    describe(require('specs/components/agg_response/point_series/_get_point'));
-    describe(require('specs/components/agg_response/point_series/_get_series'));
-    describe(require('specs/components/agg_response/point_series/_init_x_axis'));
-    describe(require('specs/components/agg_response/point_series/_init_y_axis'));
-    describe(require('specs/components/agg_response/point_series/_ordered_date_axis'));
-    describe(require('specs/components/agg_response/point_series/_tooltip_formatter'));
-  });
-});
diff --git a/test/unit/specs/components/agg_response/tabify/_buckets.js b/test/unit/specs/components/agg_response/tabify/_buckets.js
deleted file mode 100644
index 8ce32253ee4eb..0000000000000
--- a/test/unit/specs/components/agg_response/tabify/_buckets.js
+++ /dev/null
@@ -1,59 +0,0 @@
-define(function (require) {
-  return ['Buckets wrapper', function () {
-    var Buckets;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private, $injector) {
-      Buckets = Private(require('components/agg_response/tabify/_buckets'));
-    }));
-
-
-    function test(aggResp, count, keys) {
-      it('reads the length', function () {
-        var buckets = new Buckets(aggResp);
-        expect(buckets).to.have.length(count);
-      });
-
-      it('itterates properly, passing in the key', function () {
-        var buckets = new Buckets(aggResp);
-        var keysSent = [];
-        buckets.forEach(function (bucket, key) {
-          keysSent.push(key);
-        });
-
-        expect(keysSent).to.have.length(count);
-        expect(keysSent).to.eql(keys);
-      });
-    }
-
-    describe('with object style buckets', function () {
-      var aggResp = {
-        buckets: {
-          '0-100': {},
-          '100-200': {},
-          '200-300': {}
-        }
-      };
-
-      var count = 3;
-      var keys = ['0-100', '100-200', '200-300'];
-
-      test(aggResp, count, keys);
-    });
-
-    describe('with array style buckets', function () {
-      var aggResp = {
-        buckets: [
-          { key: '0-100', value: {} },
-          { key: '100-200', value: {} },
-          { key: '200-300', value: {} }
-        ]
-      };
-
-      var count = 3;
-      var keys = ['0-100', '100-200', '200-300'];
-
-      test(aggResp, count, keys);
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_response/tabify/_get_columns.js b/test/unit/specs/components/agg_response/tabify/_get_columns.js
deleted file mode 100644
index 9e92765b10586..0000000000000
--- a/test/unit/specs/components/agg_response/tabify/_get_columns.js
+++ /dev/null
@@ -1,124 +0,0 @@
-define(function (require) {
-  return ['get columns', function () {
-    var getColumns;
-    var Vis;
-    var indexPattern;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private, $injector) {
-      getColumns = Private(require('components/agg_response/tabify/_get_columns'));
-      Vis = Private(require('components/vis/vis'));
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-    }));
-
-    it('should inject a count metric if no aggs exist', function () {
-      var vis = new Vis(indexPattern, {
-        type: 'pie'
-      });
-      while (vis.aggs.length) vis.aggs.pop();
-      var columns = getColumns(vis);
-
-      expect(columns).to.have.length(1);
-      expect(columns[0]).to.have.property('aggConfig');
-      expect(columns[0].aggConfig.type).to.have.property('name', 'count');
-    });
-
-    it('should inject a count metric if only buckets exist', function () {
-      var vis = new Vis(indexPattern, {
-        type: 'pie',
-        aggs: [
-          { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } }
-        ]
-      });
-
-      var columns = getColumns(vis);
-
-      expect(columns).to.have.length(2);
-      expect(columns[1]).to.have.property('aggConfig');
-      expect(columns[1].aggConfig.type).to.have.property('name', 'count');
-    });
-
-    it('should inject the metric after each bucket if the vis is hierarchical', function () {
-      var vis = new Vis(indexPattern, {
-        type: 'pie',
-        aggs: [
-          { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
-          { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
-          { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
-          { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } }
-        ]
-      });
-
-      var columns = getColumns(vis);
-
-      expect(columns).to.have.length(8);
-      columns.forEach(function (column, i) {
-        expect(column).to.have.property('aggConfig');
-        expect(column.aggConfig.type).to.have.property('name', i % 2 ? 'count' : 'date_histogram');
-      });
-    });
-
-    it('should inject the multiple metrics after each bucket if the vis is hierarchical', function () {
-      var vis = new Vis(indexPattern, {
-        type: 'pie',
-        aggs: [
-          { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
-          { type: 'avg',            schema: 'metric',   params: { field: 'bytes' } },
-          { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
-          { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
-          { type: 'sum',            schema: 'metric',   params: { field: 'bytes' } },
-          { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } }
-        ]
-      });
-
-      var columns = getColumns(vis);
-
-      function checkColumns(column, i) {
-        expect(column).to.have.property('aggConfig');
-        switch (i) {
-        case 0:
-          expect(column.aggConfig.type).to.have.property('name', 'date_histogram');
-          break;
-        case 1:
-          expect(column.aggConfig.type).to.have.property('name', 'avg');
-          break;
-        case 2:
-          expect(column.aggConfig.type).to.have.property('name', 'sum');
-          break;
-        }
-      }
-
-      expect(columns).to.have.length(12);
-      for (var i = 0; i < columns.length; i += 3) {
-        var counts = { buckets: 0, metrics: 0 };
-        columns.slice(i, i + 3).forEach(checkColumns);
-      }
-    });
-
-    it('should put all metrics at the end of the columns if the vis is not hierarchical', function () {
-      var vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [
-          { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
-          { type: 'avg',            schema: 'metric',   params: { field: 'bytes' } },
-          { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
-          { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
-          { type: 'sum',            schema: 'metric',   params: { field: 'bytes' } },
-          { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } }
-        ]
-      });
-
-      var columns = getColumns(vis);
-      expect(columns).to.have.length(6);
-
-      // sum should be last
-      expect(columns.pop().aggConfig.type).to.have.property('name', 'sum');
-      // avg should be before that
-      expect(columns.pop().aggConfig.type).to.have.property('name', 'avg');
-      // the rest are date_histograms
-      while (columns.length) {
-        expect(columns.pop().aggConfig.type).to.have.property('name', 'date_histogram');
-      }
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_response/tabify/_integration.js b/test/unit/specs/components/agg_response/tabify/_integration.js
deleted file mode 100644
index 48f38c5fda0c4..0000000000000
--- a/test/unit/specs/components/agg_response/tabify/_integration.js
+++ /dev/null
@@ -1,264 +0,0 @@
-define(function (require) {
-  return ['tabifyAggResponse Integration', function () {
-    var _ = require('lodash');
-    var fixtures = require('fixtures/fake_hierarchical_data');
-
-    var Vis;
-    var Buckets;
-    var indexPattern;
-    var tabifyAggResponse;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private, $injector) {
-      tabifyAggResponse = Private(require('components/agg_response/tabify/tabify'));
-      Vis = Private(require('components/vis/vis'));
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-    }));
-
-    function normalizeIds(vis) {
-      vis.aggs.forEach(function (agg, i) {
-        agg.id = 'agg_' + (i + 1);
-      });
-    }
-
-    it('transforms a simple response properly', function () {
-      var vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: []
-      });
-      normalizeIds(vis);
-
-      var resp = tabifyAggResponse(vis, fixtures.metricOnly, { canSplit: false });
-
-      expect(resp).to.not.have.property('tables');
-      expect(resp).to.have.property('rows').and.property('columns');
-      expect(resp.rows).to.have.length(1);
-      expect(resp.columns).to.have.length(1);
-
-      expect(resp.rows[0]).to.eql([1000]);
-      expect(resp.columns[0]).to.have.property('aggConfig', vis.aggs[0]);
-    });
-
-    describe('transforms a complex response', function () {
-      this.slow(1000);
-
-      var vis;
-      var avg;
-      var ext;
-      var src;
-      var os;
-      var esResp;
-
-      beforeEach(function () {
-        vis = new Vis(indexPattern, {
-          type: 'pie',
-          aggs: [
-            { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-            { type: 'terms', schema: 'split', params: { field: 'extension' } },
-            { type: 'terms', schema: 'segment', params: { field: 'geo.src' } },
-            { type: 'terms', schema: 'segment', params: { field: 'machine.os' } }
-          ]
-        });
-        normalizeIds(vis);
-
-        avg = vis.aggs[0];
-        ext = vis.aggs[1];
-        src = vis.aggs[2];
-        os = vis.aggs[3];
-
-        esResp = _.cloneDeep(fixtures.threeTermBuckets);
-        // remove the buckets for css              in MX
-        esResp.aggregations.agg_2.buckets[1].agg_3.buckets[0].agg_4.buckets = [];
-      });
-
-      // check that the root table group is formed properly, then pass
-      // each table to expectExtensionSplit, along with the expectInnerTables()
-      // function.
-      function expectRootGroup(rootTableGroup, expectInnerTables) {
-        expect(rootTableGroup).to.have.property('tables');
-
-        var tables = rootTableGroup.tables;
-        expect(tables).to.be.an('array').and.have.length(3);
-        expectExtensionSplit(tables[0], 'png', expectInnerTables);
-        expectExtensionSplit(tables[1], 'css', expectInnerTables);
-        expectExtensionSplit(tables[2], 'html', expectInnerTables);
-      }
-
-      // check that the tableGroup for the extension agg was formed properly
-      // then call expectTable() on each table inside. it should validate that
-      // each table is formed properly
-      function expectExtensionSplit(tableGroup, key, expectTable) {
-        expect(tableGroup).to.have.property('tables');
-        expect(tableGroup).to.have.property('aggConfig', ext);
-        expect(tableGroup).to.have.property('key', key);
-        expect(tableGroup.tables).to.be.an('array').and.have.length(1);
-
-        tableGroup.tables.forEach(function (table) {
-          expectTable(table, key);
-        });
-      }
-
-      // check that the columns of a table are formed properly
-      function expectColumns(table, aggs) {
-        expect(table.columns).to.be.an('array').and.have.length(aggs.length);
-        aggs.forEach(function (agg, i) {
-          expect(table.columns[i]).to.have.property('aggConfig', agg);
-        });
-      }
-
-      // check that a row has expected values
-      function expectRow(row, asserts) {
-        expect(row).to.be.an('array');
-        expect(row).to.have.length(asserts.length);
-        asserts.forEach(function (assert, i) {
-          assert(row[i]);
-        });
-      }
-
-      // check for two character country code
-      function expectCountry(val) {
-        expect(val).to.be.a('string');
-        expect(val).to.have.length(2);
-      }
-
-      // check for an empty cell
-      function expectEmpty(val) {
-        expect(val)
-        .to.be('');
-      }
-
-      // check for an OS term
-      function expectOS(val) {
-        expect(val)
-        .to.match(/^(win|mac|linux)$/);
-      }
-
-      // check for something like an average bytes result
-      function expectAvgBytes(val) {
-        expect(val).to.be.a('number');
-        expect(val === 0 || val > 1000).to.be.ok();
-      }
-
-      // create an assert that checks for an expected value
-      function expectVal(expected) {
-        return function (val) {
-          expect(val).to.be(expected);
-        };
-      }
-
-      it('for non-hierarchical vis', function () {
-        // the default for a non-hierarchical vis is to display
-        // only complete rows, and only put the metrics at the end.
-
-        vis.isHierarchical = _.constant(false);
-        var tabbed = tabifyAggResponse(vis, esResp);
-
-        expectRootGroup(tabbed, function expectTable(table, splitKey) {
-          expectColumns(table, [src, os, avg]);
-
-          table.rows.forEach(function (row) {
-            if (splitKey === 'css' && row[0] === 'MX') {
-              throw new Error('expected the MX row in the css table to be removed');
-            } else {
-              expectRow(row, [
-                expectCountry,
-                expectOS,
-                expectAvgBytes
-              ]);
-            }
-          });
-        });
-      });
-
-      it('for hierarchical vis, with partial rows', function () {
-        // since we have partialRows we expect that one row will have some empty
-        // values, and since the vis is hierarchical and we are NOT using
-        // minimalColumns we should expect the partial row to be completely after
-        // the existing bucket and it's metric
-
-        vis.isHierarchical = _.constant(true);
-        var tabbed = tabifyAggResponse(vis, esResp, {
-          partialRows: true
-        });
-
-        expectRootGroup(tabbed, function expectTable(table, splitKey) {
-          expectColumns(table, [src, avg, os, avg]);
-
-          table.rows.forEach(function (row) {
-            if (splitKey === 'css' && row[0] === 'MX') {
-              expectRow(row, [
-                expectCountry,
-                expectAvgBytes,
-                expectEmpty,
-                expectEmpty
-              ]);
-            } else {
-              expectRow(row, [
-                expectCountry,
-                expectAvgBytes,
-                expectOS,
-                expectAvgBytes
-              ]);
-            }
-          });
-        });
-      });
-
-      it('for hierarchical vis, with partial rows, and minimal columns', function () {
-        // since we have partialRows we expect that one row has some empty
-        // values, and since the vis is hierarchical and we are displaying using
-        // minimalColumns, we should expect the partial row to have a metric at
-        // the end
-
-        vis.isHierarchical = _.constant(true);
-        var tabbed = tabifyAggResponse(vis, esResp, {
-          partialRows: true,
-          minimalColumns: true
-        });
-
-        expectRootGroup(tabbed, function expectTable(table, splitKey) {
-          expectColumns(table, [src, os, avg]);
-
-          table.rows.forEach(function (row) {
-            if (splitKey === 'css' && row[0] === 'MX') {
-              expectRow(row, [
-                expectCountry,
-                expectEmpty,
-                expectVal(9299)
-              ]);
-            } else {
-              expectRow(row, [
-                expectCountry,
-                expectOS,
-                expectAvgBytes
-              ]);
-            }
-          });
-        });
-      });
-
-      it('for non-hierarchical vis, minimal columns set to false', function () {
-        // the reason for this test is mainly to check that setting
-        // minimalColumns = false on a non-hierarchical vis doesn't
-        // create metric columns after each bucket
-
-        vis.isHierarchical = _.constant(false);
-        var tabbed = tabifyAggResponse(vis, esResp, {
-          minimalColumns: false
-        });
-
-        expectRootGroup(tabbed, function expectTable(table, splitKey) {
-          expectColumns(table, [src, os, avg]);
-
-          table.rows.forEach(function (row) {
-            expectRow(row, [
-              expectCountry,
-              expectOS,
-              expectAvgBytes
-            ]);
-          });
-        });
-      });
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_response/tabify/_response_writer.js b/test/unit/specs/components/agg_response/tabify/_response_writer.js
deleted file mode 100644
index 8d159a5786e31..0000000000000
--- a/test/unit/specs/components/agg_response/tabify/_response_writer.js
+++ /dev/null
@@ -1,381 +0,0 @@
-define(function (require) {
-  return ['ResponseWriter class', function () {
-    var _ = require('lodash');
-    var sinon = require('test_utils/auto_release_sinon');
-
-    var Vis;
-    var Table;
-    var Buckets;
-    var Private;
-    var TableGroup;
-    var getColumns;
-    var indexPattern;
-    var ResponseWriter;
-
-    function defineSetup(stubGetColumns) {
-      beforeEach(module('kibana'));
-      beforeEach(inject(function ($injector) {
-        Private = $injector.get('Private');
-
-        if (stubGetColumns) {
-          getColumns = sinon.stub();
-          Private.stub(require('components/agg_response/tabify/_get_columns'), getColumns);
-        }
-
-        ResponseWriter = Private(require('components/agg_response/tabify/_response_writer'));
-        TableGroup = Private(require('components/agg_response/tabify/_table_group'));
-        Buckets = Private(require('components/agg_response/tabify/_buckets'));
-        Table = Private(require('components/agg_response/tabify/_table'));
-        Vis = Private(require('components/vis/vis'));
-        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-      }));
-    }
-
-    describe('Constructor', function () {
-      defineSetup(true);
-
-      it('gets the columns for the vis', function () {
-        var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-        var writer = new ResponseWriter(vis);
-
-        expect(getColumns).to.have.property('callCount', 1);
-        expect(getColumns.firstCall.args[0]).to.be(vis);
-      });
-
-      it('collects the aggConfigs from each column in aggStack', function () {
-        var aggs = [
-          { type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
-          { type: 'terms', schema: 'segment', params: { field: 'extension' } },
-          { type: 'avg', schema: 'metric', params: { field: '@timestamp' } }
-        ];
-
-        getColumns.returns(aggs.map(function (agg) {
-          return { aggConfig: agg };
-        }));
-
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: aggs
-        });
-
-        var writer = new ResponseWriter(vis);
-        expect(writer.aggStack).to.be.an('array');
-        expect(writer.aggStack).to.have.length(aggs.length);
-        writer.aggStack.forEach(function (agg, i) {
-          expect(agg).to.be(aggs[i]);
-        });
-      });
-
-      it('sets canSplit=true by default', function () {
-        var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-        var writer = new ResponseWriter(vis);
-        expect(writer).to.have.property('canSplit', true);
-      });
-
-      it('sets canSplit=false when config says to', function () {
-        var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-        var writer = new ResponseWriter(vis, { canSplit: false });
-        expect(writer).to.have.property('canSplit', false);
-      });
-
-      describe('sets partialRows', function () {
-        it('to the value of the config if set', function () {
-          var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-          var partial = Boolean(Math.round(Math.random()));
-
-          var writer = new ResponseWriter(vis, { partialRows: partial });
-          expect(writer).to.have.property('partialRows', partial);
-        });
-
-        it('to the value of vis.isHierarchical if no config', function () {
-          var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-          var hierarchical = Boolean(Math.round(Math.random()));
-          sinon.stub(vis, 'isHierarchical').returns(hierarchical);
-
-          var writer = new ResponseWriter(vis, {});
-          expect(writer).to.have.property('partialRows', hierarchical);
-        });
-      });
-
-      it('starts off with a root TableGroup', function () {
-        var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-
-        var writer = new ResponseWriter(vis);
-        expect(writer.root).to.be.a(TableGroup);
-        expect(writer.splitStack).to.be.an('array');
-        expect(writer.splitStack).to.have.length(1);
-        expect(writer.splitStack[0]).to.be(writer.root);
-      });
-    });
-
-    describe('', function () {
-      defineSetup();
-
-      describe('#response()', function () {
-        it('returns the root TableGroup if splitting', function () {
-          var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-          var writer = new ResponseWriter(vis);
-          expect(writer.response()).to.be(writer.root);
-        });
-
-        it('returns the first table if not splitting', function () {
-          var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-          var writer = new ResponseWriter(vis, { canSplit: false });
-          var table = writer._table();
-          expect(writer.response()).to.be(table);
-        });
-
-        it('adds columns to all of the tables', function () {
-          var vis = new Vis(indexPattern, {
-            type: 'histogram',
-            aggs: [
-              { type: 'terms', params: { field: '_type' }, schema: 'split' },
-              { type: 'count', schema: 'metric' }
-            ]
-          });
-          var buckets = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
-          var writer = new ResponseWriter(vis);
-          var tables = [];
-
-          writer.split(vis.aggs[0], buckets, function () {
-            writer.cell(vis.aggs[1], 100, function () {
-              tables.push(writer.row());
-            });
-          });
-
-          tables.forEach(function (table) {
-            expect(table.columns == null).to.be(true);
-          });
-
-          var resp = writer.response();
-          expect(resp).to.be.a(TableGroup);
-          expect(resp.tables).to.have.length(2);
-
-          var nginx = resp.tables.shift();
-          expect(nginx).to.have.property('aggConfig', vis.aggs[0]);
-          expect(nginx).to.have.property('key', 'nginx');
-          expect(nginx.tables).to.have.length(1);
-          nginx.tables.forEach(function (table) {
-            expect(_.contains(tables, table)).to.be(true);
-          });
-
-          var apache = resp.tables.shift();
-          expect(apache).to.have.property('aggConfig', vis.aggs[0]);
-          expect(apache).to.have.property('key', 'apache');
-          expect(apache.tables).to.have.length(1);
-          apache.tables.forEach(function (table) {
-            expect(_.contains(tables, table)).to.be(true);
-          });
-
-          tables.forEach(function (table) {
-            expect(table.columns).to.be.an('array');
-            expect(table.columns).to.have.length(1);
-            expect(table.columns[0].aggConfig.type.name).to.be('count');
-          });
-        });
-      });
-
-      describe('#split()', function () {
-        it('with break if the user has specified that splitting is to be disabled', function () {
-          var vis = new Vis(indexPattern, {
-            type: 'histogram',
-            aggs: [
-              { type: 'terms', schema: 'split', params: { field: '_type' } },
-              { type: 'count', schema: 'metric' }
-            ]
-          });
-          var agg = vis.aggs.bySchemaName.split[0];
-          var buckets = new Buckets({ buckets: [ { key: 'apache' } ]});
-          var writer = new ResponseWriter(vis, { canSplit: false });
-
-          expect(function () {
-            writer.split(agg, buckets, _.noop);
-          }).to.throwException(/splitting is disabled/);
-        });
-
-        it('forks the acrStack and rewrites the parents', function () {
-          var vis = new Vis(indexPattern, {
-            type: 'histogram',
-            aggs: [
-              { type: 'terms', params: { field: 'extension' }, schema: 'segment' },
-              { type: 'terms', params: { field: '_type' }, schema: 'split' },
-              { type: 'terms', params: { field: 'machine.os' }, schema: 'segment' },
-              { type: 'count', schema: 'metric' }
-            ]
-          });
-
-          var writer = new ResponseWriter(vis, { asAggConfigResults: true });
-          var extensions = new Buckets({ buckets: [ { key: 'jpg' }, { key: 'png' } ] });
-          var types = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
-          var os = new Buckets({ buckets: [ { key: 'window' }, { key: 'osx' } ] });
-
-          extensions.forEach(function (b, extension) {
-            writer.cell(vis.aggs[0], extension, function () {
-              writer.split(vis.aggs[1], types, function () {
-                os.forEach(function (b, os) {
-                  writer.cell(vis.aggs[2], os, function () {
-                    writer.cell(vis.aggs[3], 200, function () {
-                      writer.row();
-                    });
-                  });
-                });
-              });
-            });
-          });
-
-          var tables = _.flattenDeep(_.pluck(writer.response().tables, 'tables'));
-          expect(tables.length).to.be(types.length);
-
-          // collect the far left acr from each table
-          var leftAcrs = _.pluck(tables, 'rows[0][0]');
-
-          leftAcrs.forEach(function (acr, i, acrs) {
-            expect(acr.aggConfig).to.be(vis.aggs[0]);
-            expect(acr.$parent.aggConfig).to.be(vis.aggs[1]);
-            expect(acr.$parent.$parent).to.be(void 0);
-
-            // for all but the last acr, compare to the next
-            if (i + 1 >= acrs.length) return;
-            var acr2 = leftAcrs[i + 1];
-
-            expect(acr.key).to.be(acr2.key);
-            expect(acr.value).to.be(acr2.value);
-            expect(acr.aggConfig).to.be(acr2.aggConfig);
-            expect(acr.$parent).to.not.be(acr2.$parent);
-          });
-        });
-
-
-      });
-
-      describe('#cell()', function () {
-        it('logs a cell in the ResponseWriters row buffer, calls the block arg, then removes the value from the buffer',
-        function () {
-          var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-          var writer = new ResponseWriter(vis);
-
-          expect(writer.rowBuffer).to.have.length(0);
-          writer.cell({}, 500, function () {
-            expect(writer.rowBuffer).to.have.length(1);
-            expect(writer.rowBuffer[0]).to.be(500);
-          });
-          expect(writer.rowBuffer).to.have.length(0);
-        });
-      });
-
-      describe('#row()', function () {
-        it('writes the ResponseWriters internal rowBuffer into a table', function () {
-          var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-          var writer = new ResponseWriter(vis);
-
-          var table = writer._table();
-          writer.cell({}, 1, function () {
-            writer.cell({}, 2, function () {
-              writer.cell({}, 3, function () {
-                writer.row();
-              });
-            });
-          });
-
-          expect(table.rows).to.have.length(1);
-          expect(table.rows[0]).to.eql([1, 2, 3]);
-        });
-
-        it('always writes to the table group at the top of the split stack', function () {
-          var vis = new Vis(indexPattern, {
-            type: 'histogram',
-            aggs: [
-              { type: 'terms', schema: 'split', params: { field: '_type' } },
-              { type: 'terms', schema: 'split', params: { field: 'extension' } },
-              { type: 'terms', schema: 'split', params: { field: 'machine.os' } },
-              { type: 'count', schema: 'metric' }
-            ]
-          });
-          var splits = vis.aggs.bySchemaName.split;
-
-          var type = splits[0];
-          var typeBuckets = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
-
-          var ext = splits[1];
-          var extBuckets = new Buckets({ buckets: [ { key: 'jpg' }, { key: 'png' } ] });
-
-          var os = splits[2];
-          var osBuckets = new Buckets({ buckets: [ { key: 'windows' }, { key: 'mac' } ] });
-
-          var count = vis.aggs[3];
-
-          var writer = new ResponseWriter(vis);
-          writer.split(type, typeBuckets, function () {
-            writer.split(ext, extBuckets, function () {
-              writer.split(os, osBuckets, function (bucket, key) {
-                writer.cell(count, key === 'windows' ? 1 : 2, function () {
-                  writer.row();
-                });
-              });
-            });
-          });
-
-          var resp = writer.response();
-          var sum = 0;
-          var tables = 0;
-          (function recurse(t) {
-            if (t.tables) {
-              // table group
-              t.tables.forEach(function (tt) {
-                recurse(tt);
-              });
-            } else {
-              tables += 1;
-              // table
-              t.rows.forEach(function (row) {
-                row.forEach(function (cell) {
-                  sum += cell;
-                });
-              });
-            }
-          }(resp));
-
-          expect(tables).to.be(8);
-          expect(sum).to.be(12);
-        });
-
-        it('writes partial rows for hierarchical vis', function () {
-          var vis = new Vis(indexPattern, {
-            type: 'pie',
-            aggs: [
-              { type: 'terms', schema: 'segment', params: { field: '_type' }},
-              { type: 'count', schema: 'metric' }
-            ]
-          });
-
-          var writer = new ResponseWriter(vis);
-          var table = writer._table();
-          writer.cell(vis.aggs[0], 'apache', function () {
-            writer.row();
-          });
-
-          expect(table.rows).to.have.length(1);
-          expect(table.rows[0]).to.eql(['apache', '']);
-        });
-
-        it('skips partial rows for non-hierarchical vis', function () {
-          var vis = new Vis(indexPattern, {
-            type: 'histogram',
-            aggs: [
-              { type: 'terms', schema: 'segment', params: { field: '_type' }},
-              { type: 'count', schema: 'metric' }
-            ]
-          });
-
-          var writer = new ResponseWriter(vis);
-          var table = writer._table();
-          writer.cell(vis.aggs[0], 'apache', function () {
-            writer.row();
-          });
-
-          expect(table.rows).to.have.length(0);
-        });
-      });
-    });
-  }];
-});
diff --git a/test/unit/specs/components/agg_response/tabify/_table.js b/test/unit/specs/components/agg_response/tabify/_table.js
deleted file mode 100644
index c63a780c75164..0000000000000
--- a/test/unit/specs/components/agg_response/tabify/_table.js
+++ /dev/null
@@ -1,82 +0,0 @@
-define(function (require) {
-  return ['Table class', function () {
-    var _ = require('lodash');
-
-    var Table;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private, $injector) {
-      Table = Private(require('components/agg_response/tabify/_table'));
-    }));
-
-    it('exposes rows array, but not the columns', function () {
-      var table = new Table();
-      expect(table.rows).to.be.an('array');
-      expect(table.columns == null).to.be.ok();
-    });
-
-    describe('#aggConfig', function () {
-      it('accepts a column from the table and returns its agg config', function () {
-        var table = new Table();
-        var football = {};
-        var column = {
-          aggConfig: football
-        };
-
-        expect(table.aggConfig(column)).to.be(football);
-      });
-
-      it('throws a TypeError if the column is malformed', function () {
-        expect(function () {
-          var notAColumn = {};
-          (new Table()).aggConfig(notAColumn);
-        }).to.throwException(TypeError);
-      });
-    });
-
-    describe('#title', function () {
-      it('returns nothing if the table is not part of a table group', function () {
-        var table = new Table();
-        expect(table.title()).to.be('');
-      });
-
-      it('returns the title of the TableGroup if the table is part of one', function () {
-        var table = new Table();
-        table.$parent = {
-          title: 'TableGroup Title',
-          tables: [table]
-        };
-
-        expect(table.title()).to.be('TableGroup Title');
-      });
-    });
-
-    describe('#field', function () {
-      it('calls the columns aggConfig#field() method', function () {
-        var table = new Table();
-        var football = {};
-        var column = {
-          aggConfig: {
-            field: _.constant(football)
-          }
-        };
-
-        expect(table.field(column)).to.be(football);
-      });
-    });
-
-    describe('#fieldFormatter', function () {
-      it('calls the columns aggConfig#fieldFormatter() method', function () {
-        var table = new Table();
-        var football = {};
-        var column = {
-          aggConfig: {
-            fieldFormatter: _.constant(football)
-          }
-        };
-
-        expect(table.fieldFormatter(column)).to.be(football);
-      });
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_response/tabify/_table_group.js b/test/unit/specs/components/agg_response/tabify/_table_group.js
deleted file mode 100644
index 7a1c2e9ded7e6..0000000000000
--- a/test/unit/specs/components/agg_response/tabify/_table_group.js
+++ /dev/null
@@ -1,18 +0,0 @@
-define(function (require) {
-  return ['Table Group class', function () {
-    var TableGroup;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private, $injector) {
-      TableGroup = Private(require('components/agg_response/tabify/_table_group'));
-    }));
-
-    it('exposes tables array and empty aggConfig, key and title', function () {
-      var tableGroup = new TableGroup();
-      expect(tableGroup.tables).to.be.an('array');
-      expect(tableGroup.aggConfig).to.be(null);
-      expect(tableGroup.key).to.be(null);
-      expect(tableGroup.title).to.be(null);
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_response/tabify/tabify.js b/test/unit/specs/components/agg_response/tabify/tabify.js
deleted file mode 100644
index 98b4968066761..0000000000000
--- a/test/unit/specs/components/agg_response/tabify/tabify.js
+++ /dev/null
@@ -1,10 +0,0 @@
-define(function (require) {
-  describe('Tabify Agg Response', function () {
-    describe(require('specs/components/agg_response/tabify/_get_columns'));
-    describe(require('specs/components/agg_response/tabify/_buckets'));
-    describe(require('specs/components/agg_response/tabify/_table'));
-    describe(require('specs/components/agg_response/tabify/_table_group'));
-    describe(require('specs/components/agg_response/tabify/_response_writer'));
-    describe(require('specs/components/agg_response/tabify/_integration'));
-  });
-});
diff --git a/test/unit/specs/components/agg_table/_group.js b/test/unit/specs/components/agg_table/_group.js
deleted file mode 100644
index bb4b573605882..0000000000000
--- a/test/unit/specs/components/agg_table/_group.js
+++ /dev/null
@@ -1,88 +0,0 @@
-define(function (require) {
-  return ['AggTableGroup Directive', function () {
-    var _ = require('lodash');
-    var $ = require('jquery');
-    var fixtures = require('fixtures/fake_hierarchical_data');
-
-    var $rootScope;
-    var $compile;
-    var tabifyAggResponse;
-    var Vis;
-    var indexPattern;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function ($injector, Private) {
-      tabifyAggResponse = Private(require('components/agg_response/tabify/tabify'));
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-      Vis = Private(require('components/vis/vis'));
-
-      $rootScope = $injector.get('$rootScope');
-      $compile = $injector.get('$compile');
-    }));
-
-    var $scope;
-    beforeEach(function () {
-      $scope = $rootScope.$new();
-    });
-    afterEach(function () {
-      $scope.$destroy();
-    });
-
-
-    it('renders a simple split response properly', function () {
-      var vis = new Vis(indexPattern, 'table');
-      $scope.group = tabifyAggResponse(vis, fixtures.metricOnly);
-      var $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
-
-      $compile($el)($scope);
-      $scope.$digest();
-
-      // should create one sub-tbale
-      expect($el.find('kbn-agg-table').size()).to.be(1);
-    });
-
-    it('renders nothing if the table list is empty', function () {
-      var $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
-
-      $scope.group = {
-        tables: []
-      };
-
-      $compile($el)($scope);
-      $scope.$digest();
-
-      var $subTables = $el.find('kbn-agg-table');
-      expect($subTables.size()).to.be(0);
-    });
-
-    it('renders a complex response properly', function () {
-      var vis = new Vis(indexPattern, {
-        type: 'pie',
-        aggs: [
-          { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-          { type: 'terms', schema: 'split', params: { field: 'extension' } },
-          { type: 'terms', schema: 'segment', params: { field: 'geo.src' } },
-          { type: 'terms', schema: 'segment', params: { field: 'machine.os' } }
-        ]
-      });
-      vis.aggs.forEach(function (agg, i) {
-        agg.id = 'agg_' + (i + 1);
-      });
-
-      var group = $scope.group = tabifyAggResponse(vis, fixtures.threeTermBuckets);
-      var $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
-      $compile($el)($scope);
-      $scope.$digest();
-
-      var $subTables = $el.find('kbn-agg-table');
-      expect($subTables.size()).to.be(3);
-
-      var $subTableHeaders = $el.find('.agg-table-group-header');
-      expect($subTableHeaders.size()).to.be(3);
-
-      $subTableHeaders.each(function (i) {
-        expect($(this).text()).to.be(group.tables[i].title);
-      });
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_table/_table.js b/test/unit/specs/components/agg_table/_table.js
deleted file mode 100644
index 5b1d7dfd49c1c..0000000000000
--- a/test/unit/specs/components/agg_table/_table.js
+++ /dev/null
@@ -1,184 +0,0 @@
-define(function (require) {
-  return ['AggTable Directive', function () {
-    var _ = require('lodash');
-    var $ = require('jquery');
-    var fixtures = require('fixtures/fake_hierarchical_data');
-    var sinon = require('test_utils/auto_release_sinon');
-
-    var $rootScope;
-    var $compile;
-    var tabifyAggResponse;
-    var Vis;
-    var indexPattern;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function ($injector, Private) {
-      tabifyAggResponse = Private(require('components/agg_response/tabify/tabify'));
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-      Vis = Private(require('components/vis/vis'));
-
-      $rootScope = $injector.get('$rootScope');
-      $compile = $injector.get('$compile');
-    }));
-
-    var $scope;
-    beforeEach(function () {
-      $scope = $rootScope.$new();
-    });
-    afterEach(function () {
-      $scope.$destroy();
-    });
-
-
-    it('renders a simple response properly', function () {
-      var vis = new Vis(indexPattern, 'table');
-      $scope.table = tabifyAggResponse(vis, fixtures.metricOnly, { canSplit: false });
-
-      var $el = $compile('<kbn-agg-table table="table"></kbn-agg-table>')($scope);
-      $scope.$digest();
-
-      expect($el.find('tbody').size()).to.be(1);
-      expect($el.find('td').size()).to.be(1);
-      expect($el.find('td').text()).to.eql(1000);
-    });
-
-    it('renders nothing if the table is empty', function () {
-      $scope.table = null;
-      var $el = $compile('<kbn-agg-table table="table"></kbn-agg-table>')($scope);
-      $scope.$digest();
-
-      expect($el.find('tbody').size()).to.be(0);
-    });
-
-    it('renders a complex response properly', function () {
-      var vis = new Vis(indexPattern, {
-        type: 'pie',
-        aggs: [
-          { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-          { type: 'terms', schema: 'split', params: { field: 'extension' } },
-          { type: 'terms', schema: 'segment', params: { field: 'geo.src' } },
-          { type: 'terms', schema: 'segment', params: { field: 'machine.os' } }
-        ]
-      });
-      vis.aggs.forEach(function (agg, i) {
-        agg.id = 'agg_' + (i + 1);
-      });
-
-      $scope.table = tabifyAggResponse(vis, fixtures.threeTermBuckets, { canSplit: false });
-      var $el = $('<kbn-agg-table table="table"></kbn-agg-table>');
-      $compile($el)($scope);
-      $scope.$digest();
-
-      expect($el.find('tbody').size()).to.be(1);
-
-      var $rows = $el.find('tbody tr');
-      expect($rows.size()).to.be.greaterThan(0);
-
-      function validBytes(str) {
-        expect(str).to.match(/^\d+$/);
-        var bytesAsNum = _.parseInt(str);
-        expect(bytesAsNum === 0 || bytesAsNum > 1000).to.be.ok();
-      }
-
-      $rows.each(function (i) {
-        // 6 cells in every row
-        var $cells = $(this).find('td');
-        expect($cells.size()).to.be(6);
-
-        var txts = $cells.map(function () {
-          return $(this).text().trim();
-        });
-
-        // two character country code
-        expect(txts[0]).to.match(/^(png|jpg|gif|html|css)$/);
-        validBytes(txts[1]);
-
-        // country
-        expect(txts[2]).to.match(/^\w\w$/);
-        validBytes(txts[3]);
-
-        // os
-        expect(txts[4]).to.match(/^(win|mac|linux)$/);
-        validBytes(txts[5]);
-      });
-    });
-
-    describe('aggTable.toCsv()', function () {
-      it('escapes and formats the rows and columns properly', function () {
-        var $el = $compile('<kbn-agg-table table="table">')($scope);
-        $scope.$digest();
-
-        var $tableScope = $el.isolateScope();
-        var aggTable = $tableScope.aggTable;
-
-        $tableScope.table = {
-          columns: [
-            { title: 'one' },
-            { title: 'two' },
-            { title: 'with double-quotes(")' }
-          ],
-          rows: [
-            [1, 2, '"foobar"']
-          ]
-        };
-
-        expect(aggTable.toCsv()).to.be(
-          'one,two,"with double-quotes("")"' + '\r\n' +
-          '1,2,"""foobar"""' + '\r\n'
-        );
-      });
-    });
-
-    describe('aggTable.exportAsCsv()', function () {
-      var origBlob;
-      function FakeBlob(slices, opts) {
-        this.slices = slices;
-        this.opts = opts;
-      }
-
-      beforeEach(function () {
-        origBlob = window.Blob;
-        window.Blob = FakeBlob;
-      });
-
-      afterEach(function () {
-        window.Blob = origBlob;
-      });
-
-      it('calls _saveAs properly', function () {
-        var $el = $compile('<kbn-agg-table table="table">')($scope);
-        $scope.$digest();
-
-        var $tableScope = $el.isolateScope();
-        var aggTable = $tableScope.aggTable;
-
-        var saveAs = sinon.stub(aggTable, '_saveAs');
-        $tableScope.table = {
-          columns: [
-            { title: 'one' },
-            { title: 'two' },
-            { title: 'with double-quotes(")' }
-          ],
-          rows: [
-            [1, 2, '"foobar"']
-          ]
-        };
-
-        aggTable.csv.filename = 'somefilename.csv';
-        aggTable.exportAsCsv();
-
-        expect(saveAs.callCount).to.be(1);
-        var call = saveAs.getCall(0);
-        expect(call.args[0]).to.be.a(FakeBlob);
-        expect(call.args[0].slices).to.eql([
-          'one,two,"with double-quotes("")"' + '\r\n' +
-          '1,2,"""foobar"""' + '\r\n'
-        ]);
-        expect(call.args[0].opts).to.eql({
-          type: 'text/plain'
-        });
-        expect(call.args[1]).to.be('somefilename.csv');
-      });
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_table/index.js b/test/unit/specs/components/agg_table/index.js
deleted file mode 100644
index 0a88a5014eedb..0000000000000
--- a/test/unit/specs/components/agg_table/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-define(function (require) {
-  describe('AggTable Component', function () {
-    describe(require('specs/components/agg_table/_group'));
-    describe(require('specs/components/agg_table/_table'));
-  });
-});
diff --git a/test/unit/specs/components/agg_types/_agg_params.js b/test/unit/specs/components/agg_types/_agg_params.js
deleted file mode 100644
index d95af68866855..0000000000000
--- a/test/unit/specs/components/agg_types/_agg_params.js
+++ /dev/null
@@ -1,102 +0,0 @@
-define(function (require) {
-  return ['AggParams class', function () {
-    var _ = require('lodash');
-
-    var AggParams;
-    var BaseAggParam;
-    var FieldAggParam;
-    var OptionedAggParam;
-    var RegexAggParam;
-
-    beforeEach(module('kibana'));
-    // stub out the param classes before we get the AggParams
-    beforeEach(inject(require('specs/components/agg_types/utils/_stub_agg_params')));
-    // fetch out deps
-    beforeEach(inject(function (Private) {
-      AggParams = Private(require('components/agg_types/_agg_params'));
-      BaseAggParam = Private(require('components/agg_types/param_types/base'));
-      FieldAggParam = Private(require('components/agg_types/param_types/field'));
-      OptionedAggParam = Private(require('components/agg_types/param_types/optioned'));
-      RegexAggParam = Private(require('components/agg_types/param_types/regex'));
-    }));
-
-    describe('constructor args', function () {
-      it('accepts an array of param defs', function () {
-        var params = [
-          { name: 'one' },
-          { name: 'two' }
-        ];
-        var aggParams = new AggParams(params);
-
-        expect(aggParams).to.have.length(params.length);
-        expect(aggParams).to.be.an(Array);
-        expect(aggParams.byName).to.have.keys(['one', 'two']);
-      });
-    });
-
-    describe('AggParam creation', function () {
-      it('Uses the FieldAggParam class for params with the name "field"', function () {
-        var params = [
-          { name: 'field' }
-        ];
-        var aggParams = new AggParams(params);
-
-        expect(aggParams).to.have.length(params.length);
-        expect(aggParams[0]).to.be.a(FieldAggParam);
-      });
-
-      it('Uses the OptionedAggParam class for params of type "optioned"', function () {
-        var params = [
-          {
-            name: 'interval',
-            type: 'optioned'
-          }
-        ];
-        var aggParams = new AggParams(params);
-
-        expect(aggParams).to.have.length(params.length);
-        expect(aggParams[0]).to.be.a(OptionedAggParam);
-      });
-
-      it('Uses the RegexAggParam class for params of type "regex"', function () {
-        var params = [
-          {
-            name: 'exclude',
-            type: 'regex'
-          }
-        ];
-        var aggParams = new AggParams(params);
-
-        expect(aggParams).to.have.length(params.length);
-        expect(aggParams[0]).to.be.a(RegexAggParam);
-      });
-
-      it('Always converts the params to a BaseAggParam', function () {
-        var params = [
-          {
-            name: 'height',
-            editor: '<blink>high</blink>'
-          },
-          {
-            name: 'weight',
-            editor: '<blink>big</blink>'
-          },
-          {
-            name: 'waist',
-            editor: '<blink>small</blink>'
-          }
-        ];
-        var aggParams = new AggParams(params);
-
-        expect(BaseAggParam).to.have.property('callCount', params.length);
-        expect(FieldAggParam).to.have.property('callCount', 0);
-        expect(OptionedAggParam).to.have.property('callCount', 0);
-
-        expect(aggParams).to.have.length(params.length);
-        aggParams.forEach(function (aggParam) {
-          expect(aggParam).to.be.a(BaseAggParam);
-        });
-      });
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_types/_agg_type.js b/test/unit/specs/components/agg_types/_agg_type.js
deleted file mode 100644
index 25a2db9c8bab4..0000000000000
--- a/test/unit/specs/components/agg_types/_agg_type.js
+++ /dev/null
@@ -1,174 +0,0 @@
-define(function (require) {
-  return ['AggType Class', function () {
-    var _ = require('lodash');
-    var sinon = require('test_utils/auto_release_sinon');
-    var AggType;
-    var AggParams;
-    var AggConfig;
-    var indexPattern;
-    var fieldFormat;
-    var Vis;
-
-    require('services/private');
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      var AggParamsPM = require('components/agg_types/_agg_params');
-      AggParams = sinon.spy(Private(AggParamsPM));
-      Private.stub(AggParamsPM, AggParams);
-
-      Vis = Private(require('components/vis/vis'));
-      fieldFormat = Private(require('registry/field_formats'));
-      AggType = Private(require('components/agg_types/_agg_type'));
-      AggConfig = Private(require('components/vis/AggConfig'));
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-    }));
-
-    describe('constructor', function () {
-
-      it('requires a config object as it\'s first param', function () {
-        expect(function () {
-          new AggType(null);
-        }).to.throwError();
-      });
-
-      describe('application of config properties', function () {
-        var copiedConfigProps = [
-          'name',
-          'title',
-          'makeLabel',
-          'ordered'
-        ];
-
-        describe('"' + copiedConfigProps.join('", "') + '"', function () {
-          it('assigns the config value to itself', function () {
-            var config = _.transform(copiedConfigProps, function (config, prop) {
-              config[prop] = {};
-            }, {});
-
-            var aggType = new AggType(config);
-
-            copiedConfigProps.forEach(function (prop) {
-              expect(aggType[prop]).to.be(config[prop]);
-            });
-          });
-        });
-
-        describe('makeLabel', function () {
-          it('makes a function when the makeLabel config is not specified', function () {
-            var someGetter = function () {};
-
-            var aggType = new AggType({
-              makeLabel: someGetter
-            });
-
-            expect(aggType.makeLabel).to.be(someGetter);
-
-            aggType = new AggType({
-              name: 'pizza'
-            });
-
-            expect(aggType.makeLabel).to.be.a('function');
-            expect(aggType.makeLabel()).to.be('pizza');
-          });
-        });
-
-        describe('getFormat', function () {
-          it('returns the formatter for the aggConfig', function () {
-            var aggType = new AggType({});
-
-            var vis = new Vis(indexPattern, {
-              type: 'histogram',
-              aggs: [
-                {
-                  type: 'date_histogram',
-                  schema: 'segment'
-                }
-              ]
-            });
-
-            var aggConfig = vis.aggs.byTypeName.date_histogram[0];
-
-            expect(aggType.getFormat(aggConfig)).to.be(fieldFormat.getDefaultInstance('date'));
-
-            vis = new Vis(indexPattern, {
-              type: 'metric',
-              aggs: [
-                {
-                  type: 'count',
-                  schema: 'metric'
-                }
-              ]
-            });
-            aggConfig = vis.aggs.byTypeName.count[0];
-
-            expect(aggType.getFormat(aggConfig)).to.be(fieldFormat.getDefaultInstance('string'));
-          });
-
-          it('can be overridden via config', function () {
-            var someGetter = function () {};
-
-            var aggType = new AggType({
-              getFormat: someGetter
-            });
-
-            expect(aggType.getFormat).to.be(someGetter);
-          });
-        });
-
-        describe('params', function () {
-          beforeEach(function () {
-            AggParams.reset();
-          });
-
-          it('defaults to AggParams object with JSON param', function () {
-            var aggType = new AggType({
-              name: 'smart agg'
-            });
-
-            expect(aggType.params).to.be.an(AggParams);
-            expect(aggType.params.length).to.be(1);
-            expect(aggType.params[0].name).to.be('json');
-          });
-
-          it('passes the params arg directly to the AggParams constructor', function () {
-            var params = [
-              {name: 'one'},
-              {name: 'two'}
-            ];
-            var paramLength = params.length + 1; // json is always appended
-
-            var aggType = new AggType({
-              name: 'bucketeer',
-              params: params
-            });
-
-            expect(aggType.params).to.be.an(AggParams);
-            expect(aggType.params.length).to.be(paramLength);
-            expect(AggParams.callCount).to.be(1);
-            expect(AggParams.firstCall.args[0]).to.be(params);
-          });
-        });
-
-        describe('getResponseAggs', function () {
-          it('copies the value', function () {
-            var football = {};
-            var aggType = new AggType({
-              getResponseAggs: football
-            });
-
-            expect(aggType.getResponseAggs).to.be(football);
-          });
-
-          it('defaults to _.noop', function () {
-            var aggType = new AggType({});
-
-            expect(aggType.getResponseAggs).to.be(_.noop);
-          });
-        });
-      });
-
-    });
-
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_types/_bucket_count_between.js b/test/unit/specs/components/agg_types/_bucket_count_between.js
deleted file mode 100644
index c99d99b8bd700..0000000000000
--- a/test/unit/specs/components/agg_types/_bucket_count_between.js
+++ /dev/null
@@ -1,205 +0,0 @@
-define(function (require) {
-  return ['bucketCountBetween util', function () {
-    var _ = require('lodash');
-    var indexPattern;
-    var Vis;
-    var visTypes;
-    var aggTypes;
-    var AggConfig;
-    var bucketCountBetween;
-
-    // http://cwestblog.com/2014/02/25/javascript-testing-for-negative-zero/
-    // works for -0 and +0
-    function isNegative(n) {
-      return ((n = +n) || 1 / n) < 0;
-    }
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-      Vis = Private(require('components/vis/vis'));
-      visTypes = Private(require('registry/vis_types'));
-      aggTypes = Private(require('components/agg_types/index'));
-      AggConfig = Private(require('components/vis/AggConfig'));
-      bucketCountBetween = Private(require('components/agg_types/buckets/_bucket_count_between'));
-    }));
-
-    it('returns a positive number when a is before b', function () {
-      var vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [
-          {
-            type: 'date_histogram',
-            schema: 'segment'
-          },
-          {
-            type: 'terms',
-            schema: 'segment'
-          }
-        ]
-      });
-
-      var a = vis.aggs.byTypeName.date_histogram[0];
-      var b = vis.aggs.byTypeName.terms[0];
-      var count = bucketCountBetween(a, b);
-      expect(isNegative(count)).to.be(false);
-    });
-
-    it('returns a negative number when a is after b', function () {
-      var vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [
-          {
-            type: 'date_histogram',
-            schema: 'segment'
-          },
-          {
-            type: 'terms',
-            schema: 'segment'
-          }
-        ]
-      });
-
-      var a = vis.aggs.byTypeName.terms[0];
-      var b = vis.aggs.byTypeName.date_histogram[0];
-      var count = bucketCountBetween(a, b);
-      expect(isNegative(count)).to.be(true);
-    });
-
-    it('returns 0 when there are no buckets between a and b', function () {
-      var vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [
-          {
-            type: 'date_histogram',
-            schema: 'segment'
-          },
-          {
-            type: 'terms',
-            schema: 'segment'
-          }
-        ]
-      });
-
-      var a = vis.aggs.byTypeName.date_histogram[0];
-      var b = vis.aggs.byTypeName.terms[0];
-      expect(bucketCountBetween(a, b)).to.be(0);
-    });
-
-    it('returns null when b is not in the aggs', function () {
-      var vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [
-          {
-            type: 'date_histogram',
-            schema: 'segment'
-          }
-        ]
-      });
-
-      var a = vis.aggs.byTypeName.date_histogram[0];
-      var b = new AggConfig(vis, {
-        type: 'terms',
-        schema: 'segment'
-      });
-
-      expect(bucketCountBetween(a, b)).to.be(null);
-    });
-
-    it('returns null when a is not in the aggs', function () {
-      var vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [
-          {
-            type: 'date_histogram',
-            schema: 'segment'
-          }
-        ]
-      });
-
-      var a = new AggConfig(vis, {
-        type: 'terms',
-        schema: 'segment'
-      });
-      var b = vis.aggs.byTypeName.date_histogram[0];
-
-      expect(bucketCountBetween(a, b)).to.be(null);
-    });
-
-    it('returns null when a and b are not in the aggs', function () {
-      var vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: []
-      });
-
-      var a = new AggConfig(vis, {
-        type: 'terms',
-        schema: 'segment'
-      });
-
-      var b = new AggConfig(vis, {
-        type: 'date_histogram',
-        schema: 'segment'
-      });
-
-      expect(bucketCountBetween(a, b)).to.be(null);
-    });
-
-    function countTest(pre, post) {
-      return function () {
-        var schemas = visTypes.byName.histogram.schemas.buckets;
-
-        // slow for this test is actually somewhere around 1/2 a sec
-        this.slow(500);
-
-        function randBucketAggForVis(vis) {
-          var schema = _.sample(schemas);
-          var aggType = _.sample(aggTypes.byType.buckets);
-
-          return new AggConfig(vis, {
-            schema: schema,
-            type: aggType
-          });
-        }
-
-        _.times(50, function (n) {
-          var vis = new Vis(indexPattern, {
-            type: 'histogram',
-            aggs: []
-          });
-
-          var randBucketAgg = _.partial(randBucketAggForVis, vis);
-
-          var a = randBucketAgg();
-          var b = randBucketAgg();
-
-          // create n aggs between a and b
-          var aggs = [];
-          aggs.fill = function (n) {
-            for (var i = 0; i < n; i++) {
-              aggs.push(randBucketAgg());
-            }
-          };
-
-          pre && aggs.fill(_.random(0, 10));
-          aggs.push(a);
-          aggs.fill(n);
-          aggs.push(b);
-          post && aggs.fill(_.random(0, 10));
-
-          vis.setState({
-            type: 'histogram',
-            aggs: aggs
-          });
-
-          expect(bucketCountBetween(a, b)).to.be(n);
-        });
-      };
-    }
-
-    it('can count', countTest());
-    it('can count with elements before', countTest(true));
-    it('can count with elements after', countTest(false, true));
-    it('can count with elements before and after', countTest(true, true));
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_types/buckets/_histogram.js b/test/unit/specs/components/agg_types/buckets/_histogram.js
deleted file mode 100644
index 8dd36fca93ffd..0000000000000
--- a/test/unit/specs/components/agg_types/buckets/_histogram.js
+++ /dev/null
@@ -1,113 +0,0 @@
-define(function (require) {
-  return ['Histogram Agg', function () {
-    var _ = require('lodash');
-
-    describe('ordered', function () {
-      var histogram;
-
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private) {
-        histogram = Private(require('components/agg_types/index')).byName.histogram;
-      }));
-
-      it('is ordered', function () {
-        expect(histogram.ordered).to.be.ok();
-      });
-
-      it('is not ordered by date', function () {
-        expect(histogram.ordered).to.not.have.property('date');
-      });
-    });
-
-
-    describe('params', function () {
-      var paramWriter;
-
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private) {
-        var AggParamWriter = Private(require('test_utils/agg_param_writer'));
-        paramWriter = new AggParamWriter({ aggType: 'histogram' });
-      }));
-
-      describe('interval', function () {
-        // reads aggConfig.params.interval, writes to dsl.interval
-
-        it('accepts a number', function () {
-          var output = paramWriter.write({ interval: 100 });
-          expect(output.params).to.have.property('interval', 100);
-        });
-
-        it('accepts a string', function () {
-          var output = paramWriter.write({ interval: '10' });
-          expect(output.params).to.have.property('interval', 10);
-        });
-
-        it('fails on non-numeric values', function () {
-          // template validation prevents this from users, not devs
-          var output = paramWriter.write({ interval: [] });
-          expect(isNaN(output.params.interval)).to.be.ok();
-        });
-      });
-
-      describe('min_doc_count', function () {
-        it('casts true values to 0', function () {
-          var output = paramWriter.write({ min_doc_count: true });
-          expect(output.params).to.have.property('min_doc_count', 0);
-
-          output = paramWriter.write({ min_doc_count: 'yes' });
-          expect(output.params).to.have.property('min_doc_count', 0);
-
-          output = paramWriter.write({ min_doc_count: 1 });
-          expect(output.params).to.have.property('min_doc_count', 0);
-
-          output = paramWriter.write({ min_doc_count: {} });
-          expect(output.params).to.have.property('min_doc_count', 0);
-        });
-
-        it('writes nothing for false values', function () {
-          var output = paramWriter.write({ min_doc_count: '' });
-          expect(output.params).to.not.have.property('min_doc_count');
-
-          output = paramWriter.write({ min_doc_count: null });
-          expect(output.params).to.not.have.property('min_doc_count');
-
-          output = paramWriter.write({ min_doc_count: undefined });
-          expect(output.params).to.not.have.property('min_doc_count');
-        });
-      });
-
-      describe('extended_bounds', function () {
-        it('writes when only eb.min is set', function () {
-          var output = paramWriter.write({
-            extended_bounds: { min: 0 }
-          });
-          expect(output.params.extended_bounds).to.have.property('min', 0);
-          expect(output.params.extended_bounds).to.have.property('max', undefined);
-        });
-
-        it('writes when only eb.max is set', function () {
-          var output = paramWriter.write({
-            extended_bounds: { max: 0 }
-          });
-          expect(output.params.extended_bounds).to.have.property('min', undefined);
-          expect(output.params.extended_bounds).to.have.property('max', 0);
-        });
-
-        it('writes when both eb.min and eb.max are set', function () {
-          var output = paramWriter.write({
-            extended_bounds: { min: 99, max: 100 }
-          });
-          expect(output.params.extended_bounds).to.have.property('min', 99);
-          expect(output.params.extended_bounds).to.have.property('max', 100);
-        });
-
-        it('does not write when nothing is set', function () {
-          var output = paramWriter.write({
-            extended_bounds: {}
-          });
-          expect(output.params).to.not.have.property('extended_bounds');
-        });
-      });
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_types/buckets/_terms.js b/test/unit/specs/components/agg_types/buckets/_terms.js
deleted file mode 100644
index 8d59ee7031bd4..0000000000000
--- a/test/unit/specs/components/agg_types/buckets/_terms.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(function (require) {
-  return ['Terms Agg', function () {
-    describe('order agg editor UI', function () {
-      it('defaults to the first metric agg');
-      it('adds "custom metric" option');
-      it('lists all metric agg responses');
-      it('lists individual values of a multi-value metric');
-      it('selects "custom metric" if there are no metric aggs');
-      it('is emptied if the selected metric is removed');
-      it('displays a metric editor if "custom metric" is selected');
-      it('saves the "custom metric" to state and refreshes from it');
-      it('invalidates the form if the metric agg form is not complete');
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_types/buckets/create_filter/date_histogram.js b/test/unit/specs/components/agg_types/buckets/create_filter/date_histogram.js
deleted file mode 100644
index f1853531eaae2..0000000000000
--- a/test/unit/specs/components/agg_types/buckets/create_filter/date_histogram.js
+++ /dev/null
@@ -1,101 +0,0 @@
-define(function (require) {
-  describe('AggConfig Filters', function () {
-    describe('date_histogram', function () {
-      var _ = require('lodash');
-      var moment = require('moment');
-      var sinon = require('test_utils/auto_release_sinon');
-      var aggResp = require('fixtures/agg_resp/date_histogram');
-
-      var vis;
-      var agg;
-      var field;
-      var filter;
-      var bucketKey;
-      var bucketStart;
-      var getIntervalStub;
-      var intervalOptions;
-
-      var init;
-
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private, $injector) {
-        var Vis = Private(require('components/vis/vis'));
-        var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-        var createFilter = Private(require('components/agg_types/buckets/create_filter/date_histogram'));
-        var TimeBuckets = Private(require('components/time_buckets/time_buckets'));
-        intervalOptions = Private(require('components/agg_types/buckets/_interval_options'));
-
-        init = function (interval, duration) {
-          interval = interval || 'auto';
-          if (interval === 'custom') interval = agg.params.customInterval;
-          duration = duration || moment.duration(15, 'minutes');
-          field = _.sample(indexPattern.fields.byType.date);
-          vis = new Vis(indexPattern, {
-            type: 'histogram',
-            aggs: [
-              {
-                type: 'date_histogram',
-                schema: 'segment',
-                params: { field: field.name, interval: interval, customInterval: '5d' }
-              }
-            ]
-          });
-
-          agg = vis.aggs[0];
-          bucketKey = _.sample(aggResp.aggregations['1'].buckets).key;
-          bucketStart = moment(bucketKey);
-
-          var timePad = moment.duration(duration / 2);
-          agg.buckets.setBounds({
-            min: bucketStart.clone().subtract(timePad),
-            max: bucketStart.clone().add(timePad),
-          });
-          agg.buckets.setInterval(interval);
-
-          filter = createFilter(agg, bucketKey);
-        };
-      }));
-
-      it('creates a valid range filter', function () {
-        init();
-
-        expect(filter).to.have.property('range');
-        expect(filter.range).to.have.property(field.name);
-
-        var fieldParams = filter.range[field.name];
-        expect(fieldParams).to.have.property('gte');
-        expect(fieldParams.gte).to.be.a('number');
-
-        expect(fieldParams).to.have.property('lte');
-        expect(fieldParams.lte).to.be.a('number');
-
-        expect(fieldParams.gte).to.be.lessThan(fieldParams.lte);
-
-        expect(filter).to.have.property('meta');
-        expect(filter.meta).to.have.property('index', vis.indexPattern.id);
-      });
-
-
-      it('extends the filter edge to 1ms before the next bucket for all interval options', function () {
-        intervalOptions.forEach(function (option) {
-          var duration;
-          if (option.val !== 'custom' && moment(1, option.val).isValid()) {
-            duration = moment.duration(10, option.val);
-
-            if (+duration < 10) {
-              throw new Error('unable to create interval for ' + option.val);
-            }
-          }
-
-          init(option.val, duration);
-
-          var interval = agg.buckets.getInterval();
-          var params = filter.range[field.name];
-
-          expect(params.gte).to.be(+bucketStart);
-          expect(params.lte).to.be(+bucketStart.clone().add(interval).subtract(1, 'ms'));
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/components/agg_types/buckets/create_filter/date_range.js b/test/unit/specs/components/agg_types/buckets/create_filter/date_range.js
deleted file mode 100644
index cd1f2abcb4b04..0000000000000
--- a/test/unit/specs/components/agg_types/buckets/create_filter/date_range.js
+++ /dev/null
@@ -1,45 +0,0 @@
-define(function (require) {
-  var moment = require('moment');
-  describe('AggConfig Filters', function () {
-    describe('Date range', function () {
-      var AggConfig;
-      var indexPattern;
-      var Vis;
-      var createFilter;
-
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private) {
-        Vis = Private(require('components/vis/vis'));
-        AggConfig = Private(require('components/vis/AggConfig'));
-        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-        createFilter = Private(require('components/agg_types/buckets/create_filter/date_range'));
-      }));
-
-      it('should return a range filter for date_range agg', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            {
-              type: 'date_range',
-              params: {
-                field: '@timestamp',
-                ranges: [
-                  { from: '2014-01-01', to: '2014-12-31' }
-                ]
-              }
-            }
-          ]
-        });
-
-        var aggConfig = vis.aggs.byTypeName.date_range[0];
-        var filter = createFilter(aggConfig, 'February 1st, 2015 to February 7th, 2015');
-        expect(filter).to.have.property('range');
-        expect(filter).to.have.property('meta');
-        expect(filter.meta).to.have.property('index', indexPattern.id);
-        expect(filter.range).to.have.property('@timestamp');
-        expect(filter.range['@timestamp']).to.have.property('gte', +new Date('1 Feb 2015'));
-        expect(filter.range['@timestamp']).to.have.property('lt', +new Date('7 Feb 2015'));
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/components/agg_types/buckets/create_filter/filters.js b/test/unit/specs/components/agg_types/buckets/create_filter/filters.js
deleted file mode 100644
index ad38524f91825..0000000000000
--- a/test/unit/specs/components/agg_types/buckets/create_filter/filters.js
+++ /dev/null
@@ -1,44 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  describe('AggConfig Filters', function () {
-    describe('filters', function () {
-      var AggConfig;
-      var indexPattern;
-      var Vis;
-      var createFilter;
-
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private) {
-        Vis = Private(require('components/vis/vis'));
-        AggConfig = Private(require('components/vis/AggConfig'));
-        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-        createFilter = Private(require('components/agg_types/buckets/create_filter/filters'));
-      }));
-
-      it('should return a filters filter', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            {
-              type: 'filters',
-              schema: 'segment',
-              params: {
-                filters: [
-                  { input: { query: { query_string: { query: '_type:apache' } } } },
-                  { input: { query: { query_string: { query: '_type:nginx' } } } }
-                ]
-              }
-            }
-          ]
-        });
-
-        var aggConfig = vis.aggs.byTypeName.filters[0];
-        var filter = createFilter(aggConfig, '_type:nginx');
-        expect(_.omit(filter, 'meta')).to.eql(aggConfig.params.filters[1].input);
-        expect(filter.meta).to.have.property('index', indexPattern.id);
-
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/agg_types/buckets/create_filter/histogram.js b/test/unit/specs/components/agg_types/buckets/create_filter/histogram.js
deleted file mode 100644
index b8b751f71a73e..0000000000000
--- a/test/unit/specs/components/agg_types/buckets/create_filter/histogram.js
+++ /dev/null
@@ -1,44 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  describe('AggConfig Filters', function () {
-    describe('histogram', function () {
-      var AggConfig;
-      var indexPattern;
-      var Vis;
-      var createFilter;
-
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private) {
-        Vis = Private(require('components/vis/vis'));
-        AggConfig = Private(require('components/vis/AggConfig'));
-        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-        createFilter = Private(require('components/agg_types/buckets/create_filter/histogram'));
-      }));
-
-      it('should return an range filter for histogram', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            {
-              type: 'histogram',
-              schema: 'segment',
-              params: { field: 'bytes', interval: 1024 }
-            }
-          ]
-        });
-
-        var aggConfig = vis.aggs.byTypeName.histogram[0];
-        var filter = createFilter(aggConfig, 2048);
-        expect(filter).to.have.property('meta');
-        expect(filter.meta).to.have.property('index', indexPattern.id);
-        expect(filter).to.have.property('range');
-        expect(filter.range).to.have.property('bytes');
-        expect(filter.range.bytes).to.have.property('gte', 2048);
-        expect(filter.range.bytes).to.have.property('lt', 3072);
-
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/agg_types/buckets/create_filter/ip_range.js b/test/unit/specs/components/agg_types/buckets/create_filter/ip_range.js
deleted file mode 100644
index bba44335bc496..0000000000000
--- a/test/unit/specs/components/agg_types/buckets/create_filter/ip_range.js
+++ /dev/null
@@ -1,78 +0,0 @@
-define(function (require) {
-  describe('AggConfig Filters', function () {
-    describe('IP range', function () {
-      var AggConfig;
-      var indexPattern;
-      var Vis;
-      var createFilter;
-
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private) {
-        Vis = Private(require('components/vis/vis'));
-        AggConfig = Private(require('components/vis/AggConfig'));
-        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-        createFilter = Private(require('components/agg_types/buckets/create_filter/ip_range'));
-      }));
-
-      it('should return a range filter for ip_range agg', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            {
-              type: 'ip_range',
-              schema: 'segment',
-              params: {
-                field: 'ip',
-                ipRangeType: 'fromTo',
-                ranges: {
-                  fromTo: [
-                    { from: '0.0.0.0', to: '1.1.1.1' }
-                  ]
-                }
-              }
-            }
-          ]
-        });
-
-        var aggConfig = vis.aggs.byTypeName.ip_range[0];
-        var filter = createFilter(aggConfig, '0.0.0.0-1.1.1.1');
-        expect(filter).to.have.property('range');
-        expect(filter).to.have.property('meta');
-        expect(filter.meta).to.have.property('index', indexPattern.id);
-        expect(filter.range).to.have.property('ip');
-        expect(filter.range.ip).to.have.property('gte', '0.0.0.0');
-        expect(filter.range.ip).to.have.property('lte', '1.1.1.1');
-      });
-
-      it('should return a range filter for ip_range agg using a CIDR mask', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            {
-              type: 'ip_range',
-              schema: 'segment',
-              params: {
-                field: 'ip',
-                ipRangeType: 'mask',
-                ranges: {
-                  mask: [
-                    { mask: '67.129.65.201/27' }
-                  ]
-                }
-              }
-            }
-          ]
-        });
-
-        var aggConfig = vis.aggs.byTypeName.ip_range[0];
-        var filter = createFilter(aggConfig, '67.129.65.201/27');
-        expect(filter).to.have.property('range');
-        expect(filter).to.have.property('meta');
-        expect(filter.meta).to.have.property('index', indexPattern.id);
-        expect(filter.range).to.have.property('ip');
-        expect(filter.range.ip).to.have.property('gte', '67.129.65.192');
-        expect(filter.range.ip).to.have.property('lte', '67.129.65.223');
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/components/agg_types/buckets/create_filter/range.js b/test/unit/specs/components/agg_types/buckets/create_filter/range.js
deleted file mode 100644
index dfd0e13bb28a9..0000000000000
--- a/test/unit/specs/components/agg_types/buckets/create_filter/range.js
+++ /dev/null
@@ -1,46 +0,0 @@
-define(function (require) {
-  describe('AggConfig Filters', function () {
-    describe('range', function () {
-      var AggConfig;
-      var indexPattern;
-      var Vis;
-      var createFilter;
-
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private) {
-        Vis = Private(require('components/vis/vis'));
-        AggConfig = Private(require('components/vis/AggConfig'));
-        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-        createFilter = Private(require('components/agg_types/buckets/create_filter/range'));
-      }));
-
-      it('should return a range filter for range agg', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            {
-              type: 'range',
-              schema: 'segment',
-              params: {
-                field: 'bytes',
-                ranges: [
-                  { from: 1024, to: 2048 }
-                ]
-              }
-            }
-          ]
-        });
-
-        var aggConfig = vis.aggs.byTypeName.range[0];
-        var filter = createFilter(aggConfig, '1024.0-2048.0');
-        expect(filter).to.have.property('range');
-        expect(filter).to.have.property('meta');
-        expect(filter.meta).to.have.property('index', indexPattern.id);
-        expect(filter.range).to.have.property('bytes');
-        expect(filter.range.bytes).to.have.property('gte', 1024.0);
-        expect(filter.range.bytes).to.have.property('lt', 2048.0);
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/agg_types/buckets/create_filter/terms.js b/test/unit/specs/components/agg_types/buckets/create_filter/terms.js
deleted file mode 100644
index 2522b667e2e26..0000000000000
--- a/test/unit/specs/components/agg_types/buckets/create_filter/terms.js
+++ /dev/null
@@ -1,36 +0,0 @@
-define(function (require) {
-  describe('AggConfig Filters', function () {
-    describe('terms', function () {
-      var AggConfig;
-      var indexPattern;
-      var Vis;
-      var createFilter;
-
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private) {
-        Vis = Private(require('components/vis/vis'));
-        AggConfig = Private(require('components/vis/AggConfig'));
-        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-        createFilter = Private(require('components/agg_types/buckets/create_filter/terms'));
-      }));
-
-      it('should return a match filter for terms', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [ { type: 'terms', schema: 'segment', params: { field: '_type' } } ]
-        });
-        var aggConfig = vis.aggs.byTypeName.terms[0];
-        var filter = createFilter(aggConfig, 'apache');
-        expect(filter).to.have.property('query');
-        expect(filter.query).to.have.property('match');
-        expect(filter.query.match).to.have.property('_type');
-        expect(filter.query.match._type).to.have.property('query', 'apache');
-        expect(filter.query.match._type).to.have.property('type', 'phrase');
-        expect(filter).to.have.property('meta');
-        expect(filter.meta).to.have.property('index', indexPattern.id);
-
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/agg_types/buckets/date_histogram/_date_histogram.js b/test/unit/specs/components/agg_types/buckets/date_histogram/_date_histogram.js
deleted file mode 100644
index 1c83059aa0003..0000000000000
--- a/test/unit/specs/components/agg_types/buckets/date_histogram/_date_histogram.js
+++ /dev/null
@@ -1,6 +0,0 @@
-define(function (require) {
-  return ['Date Histogram Agg', function () {
-    describe(require('specs/components/agg_types/buckets/date_histogram/_editor'));
-    describe(require('specs/components/agg_types/buckets/date_histogram/_params'));
-  }];
-});
diff --git a/test/unit/specs/components/agg_types/buckets/date_histogram/_editor.js b/test/unit/specs/components/agg_types/buckets/date_histogram/_editor.js
deleted file mode 100644
index eed4e8b32c303..0000000000000
--- a/test/unit/specs/components/agg_types/buckets/date_histogram/_editor.js
+++ /dev/null
@@ -1,123 +0,0 @@
-define(function (require) {
-  return ['editor', function () {
-    var _ = require('lodash');
-    var $ = require('jquery');
-
-    var indexPattern;
-    var vis;
-    var agg;
-    var render;
-    var $scope;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private, $injector, $compile) {
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-
-      var Vis = Private(require('components/vis/vis'));
-
-      /**
-       * Render the AggParams editor for the date histogram aggregation
-       *
-       * @param  {object} params - the agg params to give to the date_histogram
-       *                           by default
-       * @return {object} - object pointing to the different inputs, keys
-       *                    are the aggParam name and the value is an object
-       *                    with $el, $scope, and a few helpers for getting
-       *                    data from them.
-       */
-      render = function (params) {
-        vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs:[
-            { schema: 'metric', type: 'avg', params: { field: 'bytes' } },
-            { schema: 'segment', type: 'date_histogram', params: params || {} }
-          ]
-        });
-
-        var $el = $('<vis-editor-agg-params agg="agg" group-name="groupName"></vis-editor-agg-params>');
-        var $parentScope = $injector.get('$rootScope').$new();
-
-        agg = $parentScope.agg = vis.aggs.bySchemaName.segment[0];
-        $parentScope.groupName = 'buckets';
-
-        $compile($el)($parentScope);
-        $scope = $el.scope();
-        $scope.$digest();
-
-        var $inputs = $('vis-agg-param-editor', $el);
-        return _.transform($inputs.toArray(), function (inputs, e) {
-          var $el = $(e);
-          var $scope = $el.scope();
-
-          inputs[$scope.aggParam.name] = {
-            $el: $el,
-            $scope: $scope,
-            $input: function () {
-              return $el.find('[ng-model]').first();
-            },
-            modelValue: function () {
-              return this.$input().controller('ngModel').$modelValue;
-            }
-          };
-        }, {});
-      };
-
-    }));
-
-    describe('random field/interval', function () {
-      var params;
-      var field;
-      var interval;
-
-      beforeEach(inject(function (Private) {
-        field = _.sample(indexPattern.fields);
-        interval = _.sample(Private(require('components/agg_types/buckets/_interval_options')));
-        params = render({ field: field, interval: interval });
-      }));
-
-      it('renders the field editor', function () {
-        expect(agg.params.field).to.be(field);
-
-        expect(params).to.have.property('field');
-        expect(params.field).to.have.property('$el');
-        expect(params.field.modelValue()).to.be(field);
-      });
-
-      it('renders the interval editor', function () {
-        expect(agg.params.interval).to.be(interval);
-
-        expect(params).to.have.property('interval');
-        expect(params.interval).to.have.property('$el');
-        expect(params.interval.modelValue()).to.be(interval);
-      });
-    });
-
-    describe('interval "auto" and indexPattern timeField', function () {
-      var params;
-
-      beforeEach(function () {
-        params = render({ field: indexPattern.timeFieldName, interval: 'auto' });
-      });
-
-      it('clears the interval when the field is changed', function () {
-        expect(params.interval.modelValue().val).to.be('auto');
-        expect(params.field.modelValue().name).to.be(indexPattern.timeFieldName);
-
-        var field = _.find(indexPattern.fields, function (f) {
-          return f.type === 'date' && f.name !== indexPattern.timeFieldName;
-        });
-
-        params.field.$input()
-        .find('option')
-        .filter(function () {
-          return $(this).text().trim() === field.name;
-        })
-        .prop('selected', true);
-        params.field.$input().change();
-
-        expect(params.interval.modelValue()).to.be(undefined);
-      });
-    });
-
-  }];
-});
diff --git a/test/unit/specs/components/agg_types/buckets/date_histogram/_params.js b/test/unit/specs/components/agg_types/buckets/date_histogram/_params.js
deleted file mode 100644
index 7b1f5c0ac9ec1..0000000000000
--- a/test/unit/specs/components/agg_types/buckets/date_histogram/_params.js
+++ /dev/null
@@ -1,149 +0,0 @@
-define(function (require) {
-  return ['params', function () {
-    var _ = require('lodash');
-    var moment = require('moment');
-
-    var paramWriter;
-    var writeInterval;
-
-    var aggTypes;
-    var AggConfig;
-    var setTimeBounds;
-    var timeField;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private, $injector) {
-      var AggParamWriter = Private(require('test_utils/agg_param_writer'));
-      var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-      var timefilter = $injector.get('timefilter');
-
-      timeField = indexPattern.timeFieldName;
-      aggTypes = Private(require('components/agg_types/index'));
-      AggConfig = Private(require('components/vis/AggConfig'));
-
-      paramWriter = new AggParamWriter({ aggType: 'date_histogram' });
-      writeInterval = function (interval) {
-        return paramWriter.write({ interval: interval, field: timeField });
-      };
-
-      var now = moment();
-      setTimeBounds = function (n, units) {
-        timefilter.enabled = true;
-        timefilter.getBounds = _.constant({
-          min: now.clone().subtract(n, units),
-          max: now.clone()
-        });
-      };
-    }));
-
-    describe('interval', function () {
-      it('accepts a valid interval', function () {
-        var output = writeInterval('d');
-        expect(output.params).to.have.property('interval', '1d');
-      });
-
-      it('ignores invalid intervals', function () {
-        var output = writeInterval('foo');
-        expect(output.params).to.have.property('interval', '0ms');
-      });
-
-      it('automatically picks an interval', function () {
-        setTimeBounds(15, 'm');
-        var output = writeInterval('auto');
-        expect(output.params.interval).to.be('30s');
-      });
-
-      it('scales up the interval if it will make too many buckets', function () {
-        setTimeBounds(30, 'm');
-        var output = writeInterval('s');
-        expect(output.params.interval).to.be('10s');
-        expect(output.metricScaleText).to.be('second');
-        expect(output.metricScale).to.be(0.1);
-      });
-
-      it('does not scale down the interval', function () {
-        setTimeBounds(1, 'm');
-        var output = writeInterval('h');
-        expect(output.params.interval).to.be('1h');
-        expect(output.metricScaleText).to.be(undefined);
-        expect(output.metricScale).to.be(undefined);
-      });
-
-      describe('only scales when all metrics are sum or count', function () {
-        var tests = [
-          [ false, 'avg', 'count', 'sum' ],
-          [ true, 'count', 'sum' ],
-          [ false, 'count', 'cardinality' ]
-        ];
-
-        tests.forEach(function (test) {
-          var should = test.shift();
-          var typeNames = test.slice();
-
-          it(typeNames.join(', ') + ' should ' + (should ? '' : 'not') + ' scale', function () {
-            setTimeBounds(1, 'y');
-
-            var vis = paramWriter.vis;
-            vis.aggs.splice(0);
-
-            var histoConfig = new AggConfig(vis, {
-              type: aggTypes.byName.date_histogram,
-              schema: 'segment',
-              params: { interval: 's', field: timeField }
-            });
-
-            vis.aggs.push(histoConfig);
-
-            typeNames.forEach(function (type) {
-              vis.aggs.push(new AggConfig(vis, {
-                type: aggTypes.byName[type],
-                schema: 'metric'
-              }));
-            });
-
-            var output = histoConfig.write();
-            expect(_.has(output, 'metricScale')).to.be(should);
-          });
-        });
-      });
-    });
-
-    describe('extended_bounds', function () {
-      it('should write a long value if a moment passed in', function () {
-        var then = moment(0);
-        var now = moment(500);
-        var output = paramWriter.write({
-          extended_bounds: {
-            min: then,
-            max: now
-          }
-        });
-
-        expect(typeof output.params.extended_bounds.min).to.be('number');
-        expect(typeof output.params.extended_bounds.max).to.be('number');
-        expect(output.params.extended_bounds.min).to.be(then.valueOf());
-        expect(output.params.extended_bounds.max).to.be(now.valueOf());
-
-
-      });
-
-      it('should write a long if a long is passed', function () {
-        var then = 0;
-        var now = 500;
-        var output = paramWriter.write({
-          extended_bounds: {
-            min: then,
-            max: now
-          }
-        });
-
-        expect(typeof output.params.extended_bounds.min).to.be('number');
-        expect(typeof output.params.extended_bounds.max).to.be('number');
-        expect(output.params.extended_bounds.min).to.be(then.valueOf());
-        expect(output.params.extended_bounds.max).to.be(now.valueOf());
-
-
-      });
-    });
-  }];
-});
diff --git a/test/unit/specs/components/agg_types/controls/number_list.js b/test/unit/specs/components/agg_types/controls/number_list.js
deleted file mode 100644
index 90d406743bae8..0000000000000
--- a/test/unit/specs/components/agg_types/controls/number_list.js
+++ /dev/null
@@ -1,151 +0,0 @@
-define(function (require) {
-  describe('NumberList directive', function () {
-    var $ = require('jquery');
-    var _ = require('lodash');
-    var simulateKeys = require('test_utils/simulate_keys');
-
-    require('components/number_list/number_list');
-
-    var $el;
-    var $scope;
-    var compile;
-
-    function onlyValidValues() {
-      return $el.find('[ng-model]').toArray().map(function (el) {
-        var ngModel = $(el).controller('ngModel');
-        return ngModel.$valid ? ngModel.$modelValue : undefined;
-      });
-    }
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function ($injector) {
-      var $compile = $injector.get('$compile');
-      var $rootScope = $injector.get('$rootScope');
-
-      $scope = $rootScope.$new();
-      $el = $('<kbn-number-list ng-model="vals">');
-      compile = function (vals, range) {
-        $scope.vals = vals || [];
-        $el.attr('range', range);
-
-        $compile($el)($scope);
-        $scope.$apply();
-      };
-    }));
-
-    afterEach(function () {
-      $el.remove();
-      $scope.$destroy();
-    });
-
-    it('fails on invalid numbers', function () {
-      compile([1, 'foo']);
-      expect(onlyValidValues()).to.eql([1, undefined]);
-    });
-
-    it('supports decimals', function () {
-      compile(['1.2', '000001.6', '99.10']);
-      expect(onlyValidValues()).to.eql([1.2, 1.6, 99.1]);
-    });
-
-    it('ensures that the values are in order', function () {
-      compile([1, 2, 3, 10, 4, 5]);
-      expect(onlyValidValues()).to.eql([1, 2, 3, 10, undefined, 5]);
-    });
-
-    it('requires that values are within a range', function () {
-      compile([50, 100, 200, 250], '[100, 200)');
-      expect(onlyValidValues()).to.eql([undefined, 100, undefined, undefined]);
-    });
-
-    describe('listens for keyboard events', function () {
-      it('up arrow increases by 1', function () {
-        compile([1]);
-
-        return simulateKeys(
-          function () { return $el.find('input').first(); },
-          ['up', 'up', 'up']
-        )
-        .then(function () {
-          expect(onlyValidValues()).to.eql([4]);
-        });
-      });
-
-      it('shift-up increases by 0.1', function () {
-        compile([4.8]);
-
-        var seq = [
-          {
-            type: 'press',
-            key: 'shift',
-            events: [
-              'up',
-              'up',
-              'up'
-            ]
-          }
-        ];
-
-        return simulateKeys(
-          function () { return $el.find('input').first(); },
-          seq
-        )
-        .then(function () {
-          expect(onlyValidValues()).to.eql([5.1]);
-        });
-      });
-
-      it('down arrow decreases by 1', function () {
-        compile([5]);
-
-        return simulateKeys(
-          function () { return $el.find('input').first(); },
-          ['down', 'down', 'down']
-        )
-        .then(function () {
-          expect(onlyValidValues()).to.eql([2]);
-        });
-      });
-
-      it('shift-down decreases by 0.1', function () {
-        compile([5.1]);
-
-        var seq = [
-          {
-            type: 'press',
-            key: 'shift',
-            events: [
-              'down',
-              'down',
-              'down'
-            ]
-          }
-        ];
-
-        return simulateKeys(
-          function () { return $el.find('input').first(); },
-          seq
-        )
-        .then(function () {
-          expect(onlyValidValues()).to.eql([4.8]);
-        });
-      });
-
-      it('maintains valid number', function () {
-        compile([9, 11, 13]);
-
-        var seq = [
-          'down', // 10 (11 - 1)
-          'down'  // 10 (limited by 9)
-        ];
-
-        var getEl = function () { return $el.find('input').eq(1); };
-
-        return simulateKeys(getEl, seq)
-        .then(function () {
-          expect(onlyValidValues()).to.eql([9, 10, 13]);
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/components/agg_types/index.js b/test/unit/specs/components/agg_types/index.js
deleted file mode 100644
index bbf6ec9adebe9..0000000000000
--- a/test/unit/specs/components/agg_types/index.js
+++ /dev/null
@@ -1,42 +0,0 @@
-define(function (require) {
-  describe('AggTypesComponent', function () {
-    describe(require('specs/components/agg_types/_agg_type'));
-    describe(require('specs/components/agg_types/_agg_params'));
-    describe(require('specs/components/agg_types/_bucket_count_between'));
-    describe(require('specs/components/agg_types/buckets/_histogram'));
-
-    describe('bucket aggs', function () {
-      var bucketAggs;
-      var BucketAggType;
-
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private) {
-        bucketAggs = Private(require('components/agg_types/index')).byType.buckets;
-        BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
-      }));
-
-      it('all extend BucketAggType', function () {
-        bucketAggs.forEach(function (bucketAgg) {
-          expect(bucketAgg).to.be.a(BucketAggType);
-        });
-      });
-    });
-
-    describe('metric aggs', function () {
-      var metricAggs;
-      var MetricAggType;
-
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private) {
-        metricAggs = Private(require('components/agg_types/index')).byType.metrics;
-        MetricAggType = Private(require('components/agg_types/metrics/_metric_agg_type'));
-      }));
-
-      it('all extend MetricAggType', function () {
-        metricAggs.forEach(function (metricAgg) {
-          expect(metricAgg).to.be.a(MetricAggType);
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/components/agg_types/param_types/_calculate_interval.js b/test/unit/specs/components/agg_types/param_types/_calculate_interval.js
deleted file mode 100644
index 87dcfa010a07c..0000000000000
--- a/test/unit/specs/components/agg_types/param_types/_calculate_interval.js
+++ /dev/null
@@ -1,83 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  describe('calculateInterval()', function () {
-    var AggConfig;
-    var indexPattern;
-    var Vis;
-    var createFilter;
-    var calculateInterval;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      Vis = Private(require('components/vis/vis'));
-      AggConfig = Private(require('components/vis/AggConfig'));
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-      calculateInterval = Private(require('components/agg_types/param_types/_calculate_interval'));
-    }));
-
-    var testInterval = function (option, expected) {
-      var msg = 'should return ' + JSON.stringify(expected) + ' for ' + option;
-      it(msg, function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [ { type: 'date_histogram', schema: 'segment', params: { field: '@timestamp', interval: option } } ]
-        });
-        var aggConfig = vis.aggs.byTypeName.date_histogram[0];
-        var interval = calculateInterval(aggConfig);
-        _.each(expected, function (val, key) {
-          expect(interval).to.have.property(key, val);
-        });
-      });
-
-    };
-
-    testInterval('auto', {
-      interval: 30000,
-      metricScale: 1,
-      description: '30 sec'
-    });
-
-    testInterval('second', {
-      interval: 10000,
-      metricScale: 0.1,
-      description: 'second'
-    });
-
-    testInterval('minute', {
-      interval: 60000,
-      metricScale: 1,
-      description: 'minute'
-    });
-
-    testInterval('hour', {
-      interval: 3600000,
-      metricScale: 1,
-      description: 'hour'
-    });
-
-    testInterval('day', {
-      interval: 86400000,
-      metricScale: 1,
-      description: 'day'
-    });
-
-    testInterval('week', {
-      interval: 604800000,
-      metricScale: 1,
-      description: 'week'
-    });
-
-    testInterval('month', {
-      interval: 2592000000,
-      metricScale: 1,
-      description: 'month'
-    });
-
-    testInterval('year', {
-      interval: 31536000000,
-      metricScale: 1,
-      description: 'year'
-    });
-
-  });
-});
diff --git a/test/unit/specs/components/agg_types/param_types/_field.js b/test/unit/specs/components/agg_types/param_types/_field.js
deleted file mode 100644
index 55165464dd955..0000000000000
--- a/test/unit/specs/components/agg_types/param_types/_field.js
+++ /dev/null
@@ -1,25 +0,0 @@
-define(function (require) {
-  return ['Field', function () {
-    var _ = require('lodash');
-
-    var BaseAggParam;
-    var FieldAggParam;
-
-    beforeEach(module('kibana'));
-    // fetch out deps
-    beforeEach(inject(function (Private) {
-      BaseAggParam = Private(require('components/agg_types/param_types/base'));
-      FieldAggParam = Private(require('components/agg_types/param_types/field'));
-    }));
-
-    describe('constructor', function () {
-      it('it is an instance of BaseAggParam', function () {
-        var aggParam = new FieldAggParam({
-          name: 'field'
-        });
-
-        expect(aggParam).to.be.a(BaseAggParam);
-      });
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_types/param_types/_optioned.js b/test/unit/specs/components/agg_types/param_types/_optioned.js
deleted file mode 100644
index 8664719273806..0000000000000
--- a/test/unit/specs/components/agg_types/param_types/_optioned.js
+++ /dev/null
@@ -1,26 +0,0 @@
-define(function (require) {
-  return ['Optioned', function () {
-    var _ = require('lodash');
-
-    var BaseAggParam;
-    var OptionedAggParam;
-
-    beforeEach(module('kibana'));
-    // fetch out deps
-    beforeEach(inject(function (Private) {
-      BaseAggParam = Private(require('components/agg_types/param_types/base'));
-      OptionedAggParam = Private(require('components/agg_types/param_types/optioned'));
-    }));
-
-    describe('constructor', function () {
-      it('it is an instance of BaseAggParam', function () {
-        var aggParam = new OptionedAggParam({
-          name: 'some_param',
-          type: 'optioned'
-        });
-
-        expect(aggParam).to.be.a(BaseAggParam);
-      });
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_types/param_types/_raw_json.js b/test/unit/specs/components/agg_types/param_types/_raw_json.js
deleted file mode 100644
index 1826d54b90634..0000000000000
--- a/test/unit/specs/components/agg_types/param_types/_raw_json.js
+++ /dev/null
@@ -1,102 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-
-  return ['JSON', function () {
-    var paramName = 'json_test';
-    var BaseAggParam;
-    var JsonAggParam;
-    var aggParam;
-    var aggConfig;
-    var output;
-
-    function initAggParam(config) {
-      config = config || {};
-      var defaults = {
-        name: paramName,
-        type: 'json'
-      };
-
-      aggParam = new JsonAggParam(_.defaults(config, defaults));
-    }
-
-    beforeEach(module('kibana'));
-
-    // fetch out deps
-    beforeEach(inject(function (Private) {
-      aggConfig = { params: {} };
-      output = { params: {} };
-
-      BaseAggParam = Private(require('components/agg_types/param_types/base'));
-      JsonAggParam = Private(require('components/agg_types/param_types/raw_json'));
-
-      initAggParam();
-    }));
-
-    describe('constructor', function () {
-      it('it is an instance of BaseAggParam', function () {
-        expect(aggParam).to.be.a(BaseAggParam);
-      });
-    });
-
-    describe('write', function () {
-      it('should do nothing when param is not defined', function () {
-        expect(aggConfig.params).not.to.have.property(paramName);
-
-        aggParam.write(aggConfig, output);
-        expect(output).not.to.have.property(paramName);
-      });
-
-      it('should not append param when invalid JSON', function () {
-        aggConfig.params[paramName] = 'i am not json';
-
-        aggParam.write(aggConfig, output);
-        expect(aggConfig.params).to.have.property(paramName);
-        expect(output).not.to.have.property(paramName);
-      });
-
-      it('should append param when valid JSON', function () {
-        var jsonData = JSON.stringify({
-          new_param: 'should exist in output'
-        });
-
-        output.params.existing = 'true';
-        aggConfig.params[paramName] = jsonData;
-
-        aggParam.write(aggConfig, output);
-        expect(aggConfig.params).to.have.property(paramName);
-        expect(output.params).to.eql({
-          existing: 'true',
-          new_param: 'should exist in output'
-        });
-      });
-
-      it('should not overwrite existing params', function () {
-        var jsonData = JSON.stringify({
-          new_param: 'should exist in output',
-          existing: 'should be used'
-        });
-
-        output.params.existing = 'true';
-        aggConfig.params[paramName] = jsonData;
-
-        aggParam.write(aggConfig, output);
-        expect(output.params).to.eql(JSON.parse(jsonData));
-      });
-
-      it('should drop nulled params', function () {
-        var jsonData = JSON.stringify({
-          new_param: 'should exist in output',
-          field: null
-        });
-
-        output.params.field = 'extensions';
-        aggConfig.params[paramName] = jsonData;
-
-        aggParam.write(aggConfig, output);
-        expect(Object.keys(output.params)).to.contain('new_param');
-        expect(Object.keys(output.params)).to.not.contain('field');
-      });
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_types/param_types/_regex.js b/test/unit/specs/components/agg_types/param_types/_regex.js
deleted file mode 100644
index c0585187bdf93..0000000000000
--- a/test/unit/specs/components/agg_types/param_types/_regex.js
+++ /dev/null
@@ -1,88 +0,0 @@
-define(function (require) {
-  return ['Regex', function () {
-    var _ = require('lodash');
-
-    var BaseAggParam;
-    var RegexAggParam;
-    var Vis;
-    var indexPattern;
-
-    beforeEach(module('kibana'));
-    // fetch out deps
-    beforeEach(inject(function (Private) {
-      BaseAggParam = Private(require('components/agg_types/param_types/base'));
-      RegexAggParam = Private(require('components/agg_types/param_types/regex'));
-      Vis = Private(require('components/vis/vis'));
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-    }));
-
-    describe('constructor', function () {
-      it('should be an instance of BaseAggParam', function () {
-        var aggParam = new RegexAggParam({
-          name: 'some_param',
-          type: 'regex'
-        });
-
-        expect(aggParam).to.be.a(BaseAggParam);
-        expect(aggParam).to.have.property('write');
-      });
-    });
-
-    describe('write results', function () {
-      var aggParam;
-      var aggConfig;
-      var output = { params: {} };
-      var paramName = 'exclude';
-
-      beforeEach(function () {
-        var vis = new Vis(indexPattern, {
-          type: 'pie',
-          aggs: [
-            { type: 'terms', schema: 'split', params: { field: 'extension' }},
-          ]
-        });
-        aggConfig = vis.aggs[0];
-
-        aggParam = new RegexAggParam({
-          name: paramName,
-          type: 'regex'
-        });
-      });
-
-      it('should not include param in output', function () {
-        aggConfig.params[paramName] = {
-          pattern: ''
-        };
-
-        aggParam.write(aggConfig, output);
-        expect(output).to.be.an('object');
-        expect(output).to.have.property('params');
-        expect(output.params).not.to.have.property(paramName);
-      });
-
-      it('should include param in output', function () {
-        aggConfig.params[paramName] = {
-          pattern: 'testing'
-        };
-
-        aggParam.write(aggConfig, output);
-        expect(output.params).to.have.property(paramName);
-        expect(output.params[paramName]).to.eql({ pattern: 'testing' });
-        expect(output.params[paramName]).not.to.have.property('flags');
-      });
-
-      it('should include flags', function () {
-        aggConfig.params[paramName] = {
-          pattern: 'testing',
-          flags: [ 'TEST1', 'TEST2', 'TEST_RED', 'TEST_BLUE' ]
-        };
-
-        aggParam.write(aggConfig, output);
-        expect(output.params).to.have.property(paramName);
-        expect(output.params[paramName]).to.have.property('flags');
-        expect(typeof output.params[paramName].flags).to.be('string');
-        expect(output.params[paramName].flags).to.be('TEST1|TEST2|TEST_RED|TEST_BLUE');
-      });
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_types/param_types/_string.js b/test/unit/specs/components/agg_types/param_types/_string.js
deleted file mode 100644
index af2da68729e93..0000000000000
--- a/test/unit/specs/components/agg_types/param_types/_string.js
+++ /dev/null
@@ -1,68 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return ['String', function () {
-    var paramName = 'json_test';
-    var BaseAggParam;
-    var StringAggParam;
-    var aggParam;
-    var aggConfig;
-    var output;
-
-    function initAggParam(config) {
-      config = config || {};
-      var defaults = {
-        name: paramName,
-        type: 'string'
-      };
-
-      aggParam = new StringAggParam(_.defaults(config, defaults));
-    }
-
-    beforeEach(module('kibana'));
-
-    // fetch our deps
-    beforeEach(inject(function (Private) {
-      BaseAggParam = Private(require('components/agg_types/param_types/base'));
-      StringAggParam = Private(require('components/agg_types/param_types/string'));
-
-      aggConfig = { params: {} };
-      output = { params: {} };
-    }));
-
-    describe('constructor', function () {
-      it('it is an instance of BaseAggParam', function () {
-        initAggParam();
-        expect(aggParam).to.be.a(BaseAggParam);
-      });
-    });
-
-    describe('write', function () {
-      it('should append param by name', function () {
-        var paramName = 'testing';
-        var params = {};
-        params[paramName] = 'some input';
-
-        initAggParam({ name: paramName });
-
-        aggConfig.params = params;
-        aggParam.write(aggConfig, output);
-
-        expect(output.params).to.eql(params);
-      });
-
-      it('should not be in output with empty input', function () {
-        var paramName = 'more_testing';
-        var params = {};
-        params[paramName] = '';
-
-        initAggParam({ name: paramName });
-
-        aggConfig.params = params;
-        aggParam.write(aggConfig, output);
-
-        expect(output.params).to.eql({});
-      });
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/agg_types/param_types/index.js b/test/unit/specs/components/agg_types/param_types/index.js
deleted file mode 100644
index d261ffc8a1c32..0000000000000
--- a/test/unit/specs/components/agg_types/param_types/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-define(function (require) {
-  describe('ParamTypes', function () {
-    describe(require('specs/components/agg_types/param_types/_field'));
-    describe(require('specs/components/agg_types/param_types/_optioned'));
-    describe(require('specs/components/agg_types/param_types/_regex'));
-    describe(require('specs/components/agg_types/param_types/_string'));
-    describe(require('specs/components/agg_types/param_types/_raw_json'));
-  });
-});
diff --git a/test/unit/specs/components/agg_types/utils/_stub_agg_params.js b/test/unit/specs/components/agg_types/utils/_stub_agg_params.js
deleted file mode 100644
index b49524712d488..0000000000000
--- a/test/unit/specs/components/agg_types/utils/_stub_agg_params.js
+++ /dev/null
@@ -1,45 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var sinon = require('test_utils/auto_release_sinon');
-
-  function ParamClassStub(parent, body) {
-    var stub = sinon.spy(body || function () {
-      stub.Super && stub.Super.call(this);
-    });
-    if (parent) _.class(stub).inherits(parent);
-    return stub;
-  }
-
-  /**
-   * stub all of the param classes, but ensure that they still inherit properly.
-   * This method should be passed directly to inject();
-   *
-   * ```js
-   * var stubParamClasses = require('specs/components/agg_types/utils/_stub_agg_params');
-   * describe('something', function () {
-   *   beforeEach(inject(stubParamClasses));
-   * })
-   * ```
-   *
-   * @param  {PrivateLoader} Private - The private module loader, inject by passing this function to inject()
-   * @return {undefined}
-   */
-  return function stubParamClasses(Private) {
-    var BaseAggParam = Private.stub(
-      require('components/agg_types/param_types/base'),
-      ParamClassStub(null, function (config) {
-        _.assign(this, config);
-      })
-    );
-
-    Private.stub(
-      require('components/agg_types/param_types/field'),
-      ParamClassStub(BaseAggParam)
-    );
-
-    Private.stub(
-      require('components/agg_types/param_types/optioned'),
-      ParamClassStub(BaseAggParam)
-    );
-  };
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/bind.js b/test/unit/specs/components/bind.js
deleted file mode 100644
index f93e8814f6636..0000000000000
--- a/test/unit/specs/components/bind.js
+++ /dev/null
@@ -1,70 +0,0 @@
-define(function (require) {
-  describe('$scope.$bind', function () {
-    var sinon = require('test_utils/auto_release_sinon');
-
-    var $rootScope;
-    var $scope;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function ($injector) {
-      $rootScope = $injector.get('$rootScope');
-      $scope = $rootScope.$new();
-    }));
-
-    it('exposes $bind on all scopes', function () {
-      expect($rootScope.$bind).to.be.a('function');
-      expect($scope).to.have.property('$bind', $rootScope.$bind);
-
-      var $isoScope = $scope.$new(true);
-      expect($isoScope).to.have.property('$bind', $rootScope.$bind);
-    });
-
-    it('sets up binding from a parent scope to it\'s child', function () {
-      $rootScope.val = 'foo';
-      $scope.$bind('localVal', 'val');
-      expect($scope.localVal).to.be('foo');
-
-      $rootScope.val = 'bar';
-      expect($scope.localVal).to.be('foo'); // shouldn't have changed yet
-
-      $rootScope.$apply();
-      expect($scope.localVal).to.be('bar');
-    });
-
-    it('sets up a binding from the child to the parent scope', function () {
-      var stub = sinon.stub();
-
-      $rootScope.val = 'foo';
-      $scope.$bind('localVal', 'val');
-      expect($scope.localVal).to.be('foo');
-
-      $scope.localVal = 'bar';
-      expect($rootScope.val).to.be('foo'); // shouldn't have changed yet
-
-      $scope.$apply();
-      expect($rootScope.val).to.be('bar');
-    });
-
-    it('pulls from the scopes $parent by default', function () {
-      var $parent = $rootScope.$new();
-      var $self = $parent.$new();
-
-      $parent.val = 'foo';
-      $self.val = 'bar';
-
-      $self.$bind('localVal', 'val');
-      expect($self.localVal).to.be('foo');
-    });
-
-    it('accepts an alternate scope to read from', function () {
-      var $parent = $rootScope.$new();
-      var $self = $parent.$new();
-
-      $parent.val = 'foo';
-      $self.val = 'bar';
-
-      $self.$bind('localVal', 'val', $self);
-      expect($self.localVal).to.be('bar');
-    });
-  });
-});
diff --git a/test/unit/specs/components/clipboard.js b/test/unit/specs/components/clipboard.js
deleted file mode 100644
index 7b6490ebd9014..0000000000000
--- a/test/unit/specs/components/clipboard.js
+++ /dev/null
@@ -1,99 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-  var sinon = require('test_utils/auto_release_sinon');
-  var $ = require('jquery');
-
-  require('components/clipboard/clipboard');
-
-  describe('Clipboard directive', function () {
-    var $scope;
-    var $rootScope;
-    var $compile;
-    var $interpolate;
-    var el;
-    var tips;
-
-    function init() {
-      // load the application
-      module('kibana');
-
-      inject(function (_$rootScope_, _$compile_, _$interpolate_) {
-        $rootScope = _$rootScope_;
-        $compile = _$compile_;
-        $interpolate = _$interpolate_;
-        $rootScope.text = 'foo';
-
-        el = $compile('<kbn-clipboard copy="text"></kbn-clipboard>')($rootScope);
-
-        $scope = el.scope();
-        $scope.$digest();
-      });
-    }
-
-    describe('With flash disabled', function () {
-      beforeEach(function () {
-        sinon.stub(window.ZeroClipboard, 'isFlashUnusable', _.constant(true));
-        init();
-      });
-
-      it('should be an empty element', function () {
-        expect(el.children()).to.have.length(0);
-      });
-
-      it('should not show the tooltip', function () {
-        var clip = el.find('[tooltip]');
-        expect(clip).to.have.length(0);
-      });
-
-      it('should not show the clipboard button', function () {
-        var clip = el.find('[clip-copy]');
-        expect(clip).to.have.length(0);
-      });
-    });
-
-    describe('With flash enabled', function () {
-      beforeEach(function () {
-        sinon.stub(window.ZeroClipboard, 'isFlashUnusable', _.constant(false));
-        init();
-      });
-
-      it('should contain an element with clip-copy', function () {
-        var clip = el.find('[clip-copy]');
-        expect(clip).to.have.length(1);
-      });
-
-      it('should have a tooltip', function () {
-        var clip = el.find('[tooltip]');
-        expect(clip).to.have.length(1);
-
-        var clipText = $interpolate($(clip).attr('tooltip'))();
-        expect(clipText).to.be('Copy to clipboard');
-
-      });
-
-      it('should change the tooltip text when clicked, back when mouse leaves', function () {
-        el.mouseenter();
-        el.click();
-        $scope.$digest();
-
-        var clipText = $interpolate($('[tooltip]', el).attr('tooltip'))();
-        expect(clipText).to.be('Copied!');
-
-        el.mouseleave();
-        $scope.$digest();
-
-        clipText = $interpolate($('[tooltip]', el).attr('tooltip'))();
-        expect(clipText).to.be('Copy to clipboard');
-      });
-
-      it('should unbind all handlers on destroy', function () {
-        var handlers = $._data(el.get(0), 'events');
-        expect(Object.keys(handlers)).to.have.length(2);
-
-        $scope.$destroy();
-        expect(Object.keys(handlers)).to.have.length(0);
-      });
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/comma_list_filter.js b/test/unit/specs/components/comma_list_filter.js
deleted file mode 100644
index 4f59c24578baa..0000000000000
--- a/test/unit/specs/components/comma_list_filter.js
+++ /dev/null
@@ -1,32 +0,0 @@
-define(function (require) {
-  require('components/comma_list_filter');
-
-  describe('Comma-List filter', function () {
-
-    var commaList;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function ($injector) {
-      commaList = $injector.get('commaListFilter');
-    }));
-
-    it('converts a string to a pretty list', function () {
-      expect(commaList('john,jaine,jim', true)).to.be('john, jaine and jim');
-      expect(commaList('john,jaine,jim', false)).to.be('john, jaine or jim');
-    });
-
-    it('can accept an array too', function () {
-      expect(commaList(['john', 'jaine', 'jim'])).to.be('john, jaine or jim');
-    });
-
-    it('handles undefined ok', function () {
-      expect(commaList()).to.be('');
-    });
-
-    it('handls single values ok', function () {
-      expect(commaList(['john'])).to.be('john');
-    });
-
-  });
-
-});
diff --git a/test/unit/specs/components/config.js b/test/unit/specs/components/config.js
deleted file mode 100644
index f562a192dde59..0000000000000
--- a/test/unit/specs/components/config.js
+++ /dev/null
@@ -1,74 +0,0 @@
-define(function (require) {
-  describe('config component', function () {
-    var $scope;
-    var config;
-    var defaults;
-    var configFile;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function ($injector, Private) {
-      config = $injector.get('config');
-      $scope = $injector.get('$rootScope');
-      configFile = $injector.get('configFile');
-      defaults = Private(require('components/config/defaults'));
-    }));
-
-    it('exposes the configFile', function () {
-      expect(config.file).to.be(configFile);
-    });
-
-    describe('#get', function () {
-
-      it('gives access to config values', function () {
-        expect(config.get('dateFormat')).to.be.a('string');
-      });
-
-      it('reads from the defaults', function () {
-        var initial = config.get('dateFormat');
-        var newDefault = initial + '- new';
-        defaults.dateFormat.value = newDefault;
-        expect(config.get('dateFormat')).to.be(newDefault);
-      });
-
-    });
-
-    describe('#set', function () {
-
-      it('stores a value in the config val set', function () {
-        var initial = config.get('dateFormat');
-        config.set('dateFormat', 'notaformat');
-        expect(config.get('dateFormat')).to.be('notaformat');
-      });
-
-    });
-
-    describe('#$bind', function () {
-
-      it('binds a config key to a $scope property', function () {
-        var dateFormat = config.get('dateFormat');
-        config.$bind($scope, 'dateFormat');
-        expect($scope).to.have.property('dateFormat', dateFormat);
-      });
-
-      it('alows overriding the property name', function () {
-        var dateFormat = config.get('dateFormat');
-        config.$bind($scope, 'dateFormat', 'defaultDateFormat');
-        expect($scope).to.not.have.property('dateFormat');
-        expect($scope).to.have.property('defaultDateFormat', dateFormat);
-      });
-
-      it('keeps the property up to date', function () {
-        var dateFormat = config.get('dateFormat');
-        var newDateFormat = dateFormat + ' NEW NEW NEW!';
-        config.$bind($scope, 'dateFormat');
-
-        expect($scope).to.have.property('dateFormat', dateFormat);
-        config.set('dateFormat', newDateFormat);
-        expect($scope).to.have.property('dateFormat', newDateFormat);
-
-      });
-
-    });
-
-  });
-});
diff --git a/test/unit/specs/components/courier/search_source/normalize_sort_request.js b/test/unit/specs/components/courier/search_source/normalize_sort_request.js
deleted file mode 100644
index a46a3583d68e6..0000000000000
--- a/test/unit/specs/components/courier/search_source/normalize_sort_request.js
+++ /dev/null
@@ -1,89 +0,0 @@
-define(function (require) {
-  describe('SearchSource#normalizeSortRequest', function () {
-    require('services/private');
-    require('angular').module('normalizeSortRequest', ['kibana']);
-
-    var normalizeSortRequest;
-    var indexPattern;
-    var normalizedSort;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      normalizeSortRequest = Private(require('components/courier/data_source/_normalize_sort_request'));
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-
-      normalizedSort = [{
-        someField: {
-          order: 'desc',
-          unmapped_type: 'boolean'
-        }
-      }];
-    }));
-
-    it('should return an array', function () {
-      var sortable = { someField: 'desc'};
-      var result = normalizeSortRequest(sortable, indexPattern);
-      expect(result).to.be.an(Array);
-      expect(result).to.eql(normalizedSort);
-      // ensure object passed in is not mutated
-      expect(result[0]).to.not.be.equal(sortable);
-      expect(sortable).to.eql({ someField: 'desc'});
-    });
-
-    it('should make plain string sort into the more verbose format', function () {
-      var result = normalizeSortRequest([{ someField: 'desc'}], indexPattern);
-      expect(result).to.eql(normalizedSort);
-    });
-
-    it('should append default sort options', function () {
-      var sortState = [{
-        someField: {
-          order: 'desc',
-          unmapped_type: 'boolean'
-        }
-      }];
-      var result = normalizeSortRequest(sortState, indexPattern);
-      expect(result).to.eql(normalizedSort);
-    });
-
-    it('should enable script based sorting', function () {
-      var fieldName = 'script string';
-      var direction = 'desc';
-      var indexField = indexPattern.fields.byName[fieldName];
-
-      var sortState = {};
-      sortState[fieldName] = direction;
-      normalizedSort = {
-        _script: {
-          script: indexField.script,
-          type: indexField.type,
-          order: direction
-        }
-      };
-
-      var result = normalizeSortRequest(sortState, indexPattern);
-      expect(result).to.eql([normalizedSort]);
-
-      sortState[fieldName] = { order: direction };
-      result = normalizeSortRequest([sortState], indexPattern);
-      expect(result).to.eql([normalizedSort]);
-    });
-
-    it('should use script based sorting only on sortable types', function () {
-      var fieldName = 'script murmur3';
-      var direction = 'asc';
-      var indexField = indexPattern.fields.byName[fieldName];
-
-      var sortState = {};
-      sortState[fieldName] = direction;
-      normalizedSort = {};
-      normalizedSort[fieldName] = {
-        order: direction,
-        unmapped_type: 'boolean'
-      };
-      var result = normalizeSortRequest([sortState], indexPattern);
-
-      expect(result).to.eql([normalizedSort]);
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/doc_table/doc_table.js b/test/unit/specs/components/doc_table/doc_table.js
deleted file mode 100644
index 7714fe8a81080..0000000000000
--- a/test/unit/specs/components/doc_table/doc_table.js
+++ /dev/null
@@ -1,112 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var $ = require('jquery');
-  var _ = require('lodash');
-  var sinon = require('test_utils/auto_release_sinon');
-  var searchResponse = require('fixtures/search_response');
-
-  // Load the kibana app dependencies.
-  require('services/private');
-  require('components/doc_table/doc_table');
-
-
-  var $parentScope, $scope, $timeout, searchSource;
-
-  var init = function ($elem, props) {
-    inject(function ($rootScope, $compile, _$timeout_) {
-      $timeout = _$timeout_;
-      $parentScope = $rootScope;
-      _.assign($parentScope, props);
-
-      $compile($elem)($parentScope);
-
-      // I think the prereq requires this?
-      $timeout(function () {
-        $elem.scope().$digest();
-      }, 0);
-
-      $scope = $elem.isolateScope();
-
-    });
-  };
-
-  var destroy = function () {
-    $scope.$destroy();
-    $parentScope.$destroy();
-  };
-
-  describe('docTable', function () {
-    var $elem;
-
-    beforeEach(module('kibana'));
-    beforeEach(function () {
-      $elem = angular.element('<doc-table search-source="searchSource" columns="columns" sorting="sorting"></doc-table>');
-      inject(function (Private) {
-        searchSource = Private(require('fixtures/stubbed_search_source'));
-      });
-      init($elem, {
-        searchSource: searchSource,
-        columns: [],
-        sorting: ['@timestamp', 'desc']
-      });
-      $scope.$digest();
-
-    });
-
-    afterEach(function () {
-      destroy();
-    });
-
-    it('should compile', function () {
-      expect($elem.text()).to.not.be.empty();
-    });
-
-    it('should set the indexPattern to that of the searchSource', function () {
-      expect($scope.indexPattern).to.be(searchSource.get('index'));
-    });
-
-    it('should set size and sort on the searchSource', function () {
-      expect($scope.searchSource.sort.called).to.be(true);
-      expect($scope.searchSource.size.called).to.be(true);
-    });
-
-    it('should have an addRows function that increases the row count', function () {
-      expect($scope.addRows).to.be.a(Function);
-      searchSource.crankResults();
-      $scope.$digest();
-      expect($scope.limit).to.be(50);
-      $scope.addRows();
-      expect($scope.limit).to.be(100);
-    });
-
-    it('should reset the row limit when results are received', function () {
-      $scope.limit = 100;
-      expect($scope.limit).to.be(100);
-      searchSource.crankResults();
-      $scope.$digest();
-      expect($scope.limit).to.be(50);
-    });
-
-    it('should put the hits array on scope', function () {
-      expect($scope.hits).to.be(undefined);
-      searchSource.crankResults();
-      $scope.$digest();
-      expect($scope.hits).to.be.an(Array);
-    });
-
-    it('should destroy the searchSource when the scope is destroyed', function () {
-      expect(searchSource.destroy.called).to.be(false);
-      $scope.$destroy();
-      expect(searchSource.destroy.called).to.be(true);
-    });
-
-    it('should have a header and a table element', function () {
-      searchSource.crankResults();
-      $scope.$digest();
-
-      expect($elem.find('thead').length).to.be(1);
-      expect($elem.find('table').length).to.be(1);
-    });
-
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/doc_table/lib/get_sort.js b/test/unit/specs/components/doc_table/lib/get_sort.js
deleted file mode 100644
index e448153142405..0000000000000
--- a/test/unit/specs/components/doc_table/lib/get_sort.js
+++ /dev/null
@@ -1,58 +0,0 @@
-define(function (require) {
-  var getSort = require('components/doc_table/lib/get_sort');
-  var defaultSort = {time: 'desc'};
-  var indexPattern;
-
-  describe('docTable', function () {
-    beforeEach(module('kibana'));
-
-    beforeEach(inject(function (Private, _$rootScope_, Promise) {
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-    }));
-
-    describe('getSort function', function () {
-      it('should be a function', function () {
-        expect(getSort).to.be.a(Function);
-      });
-
-      it('should return an object if passed a 2 item array', function () {
-        expect(getSort(['bytes', 'desc'], indexPattern)).to.eql({bytes: 'desc'});
-
-        delete indexPattern.timeFieldName;
-        expect(getSort(['bytes', 'desc'], indexPattern)).to.eql({bytes: 'desc'});
-      });
-
-      it('should sort by the default when passed an unsortable field', function () {
-        expect(getSort(['_id', 'asc'], indexPattern)).to.eql(defaultSort);
-        expect(getSort(['lol_nope', 'asc'], indexPattern)).to.eql(defaultSort);
-
-        delete indexPattern.timeFieldName;
-        expect(getSort(['_id', 'asc'], indexPattern)).to.eql({_score: 'desc'});
-      });
-
-      it('should sort in reverse chrono order otherwise on time based patterns', function () {
-        expect(getSort([], indexPattern)).to.eql(defaultSort);
-        expect(getSort(['foo'], indexPattern)).to.eql(defaultSort);
-        expect(getSort({foo: 'bar'}, indexPattern)).to.eql(defaultSort);
-      });
-
-      it('should sort by score on non-time patterns', function () {
-        delete indexPattern.timeFieldName;
-
-        expect(getSort([], indexPattern)).to.eql({_score: 'desc'});
-        expect(getSort(['foo'], indexPattern)).to.eql({_score: 'desc'});
-        expect(getSort({foo: 'bar'}, indexPattern)).to.eql({_score: 'desc'});
-      });
-    });
-
-    describe('getSort.array function', function () {
-      it('should have an array method', function () {
-        expect(getSort.array).to.be.a(Function);
-      });
-
-      it('should return an array for sortable fields', function () {
-        expect(getSort.array(['bytes', 'desc'], indexPattern)).to.eql([ 'bytes', 'desc' ]);
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/components/doc_table/lib/rows_headers.js b/test/unit/specs/components/doc_table/lib/rows_headers.js
deleted file mode 100644
index f4bf34912f014..0000000000000
--- a/test/unit/specs/components/doc_table/lib/rows_headers.js
+++ /dev/null
@@ -1,512 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var $ = require('jquery');
-  var _ = require('lodash');
-  var sinon = require('test_utils/auto_release_sinon');
-  var getFakeRow = require('fixtures/fake_row');
-
-  describe('Doc Table', function () {
-
-    // Load the kibana app dependencies.
-    require('angular-route');
-
-    require('plugins/discover/index');
-
-    var $parentScope, $scope, config;
-
-    // Stub out a minimal mapping of 4 fields
-    var mapping;
-
-    beforeEach(module('kibana', 'apps/discover'));
-    beforeEach(inject(function (_config_, $rootScope, Private) {
-      config = _config_;
-      $parentScope = $rootScope;
-      $parentScope.indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-      mapping = $parentScope.indexPattern.fields.byName;
-    }));
-
-    // Sets up the directive, take an element, and a list of properties to attach to the parent scope.
-    var init = function ($elem, props) {
-      inject(function ($compile) {
-        _.assign($parentScope, props);
-        $compile($elem)($parentScope);
-        $elem.scope().$digest();
-        $scope = $elem.isolateScope();
-      });
-    };
-
-    var destroy = function () {
-      $scope.$destroy();
-      $parentScope.$destroy();
-    };
-
-    // For testing column removing/adding for the header and the rows
-    //
-    var columnTests = function (elemType, parentElem) {
-
-      it('should create a time column if the timefield is defined', function (done) {
-        var childElems = parentElem.find(elemType);
-        expect(childElems.length).to.be(2);
-        done();
-      });
-
-      it('should be able to add and remove columns', function (done) {
-        var childElems;
-        // Should include a column for toggling and the time column by default
-        $parentScope.columns = ['bytes'];
-        parentElem.scope().$digest();
-        childElems = parentElem.find(elemType);
-        expect(childElems.length).to.be(3);
-        expect($(childElems[2]).text()).to.contain('bytes');
-
-        $parentScope.columns = ['bytes', 'request_body'];
-        parentElem.scope().$digest();
-        childElems = parentElem.find(elemType);
-        expect(childElems.length).to.be(4);
-        expect($(childElems[3]).text()).to.contain('request_body');
-
-        $parentScope.columns = ['request_body'];
-        parentElem.scope().$digest();
-        childElems = parentElem.find(elemType);
-        expect(childElems.length).to.be(3);
-        expect($(childElems[2]).text()).to.contain('request_body');
-        done();
-      });
-
-      it('should create only the toggle column if there is no timeField', function (done) {
-        delete parentElem.scope().indexPattern.timeFieldName;
-        parentElem.scope().$digest();
-
-        var childElems = parentElem.find(elemType);
-        expect(childElems.length).to.be(1);
-        done();
-      });
-
-    };
-
-
-    describe('kbnTableHeader', function () {
-
-      var $elem = angular.element(
-        '<thead kbn-table-header columns="columns" index-pattern="indexPattern" sort="sort"></thead>'
-      );
-
-      beforeEach(function () {
-        init($elem, {
-          columns: [],
-          sorting: [],
-        });
-      });
-      afterEach(function () {
-        destroy();
-      });
-
-      describe('adding and removing columns', function () {
-        columnTests('th', $elem);
-      });
-
-
-      describe('sorting', function () {
-        it('should have a sort function that sets the elements of the sort array', function (done) {
-          expect($scope.sort).to.be.a(Function);
-          done();
-        });
-
-        it('should have a headClasser function that determines the css classes of the sort icons', function (done) {
-          expect($scope.headerClass).to.be.a(Function);
-          done();
-        });
-
-        it('should sort asc by default, then by desc if already sorting', function (done) {
-          var fields = ['bytes', '@timestamp'];
-
-          // Should not be sorted at first
-          expect($scope.sorting).to.eql(undefined);
-          expect($scope.headerClass(fields[0])).to.contain('fa-sort-up');
-
-          $scope.sort(fields[0]);
-          expect($scope.sorting).to.eql([fields[0], 'asc']);
-          expect($scope.headerClass(fields[0])).to.contain('fa-sort-up');
-
-          $scope.sort(fields[0]);
-          expect($scope.sorting).to.eql([fields[0], 'desc']);
-          expect($scope.headerClass(fields[0])).to.contain('fa-sort-down');
-
-          $scope.sort(fields[0]);
-          expect($scope.sorting).to.eql([fields[0], 'asc']);
-          expect($scope.headerClass(fields[0])).to.contain('fa-sort-up');
-
-          $scope.sort(fields[1]);
-          expect($scope.sorting).to.eql([fields[1], 'asc']);
-          expect($scope.headerClass(fields[1])).to.contain('fa-sort-up');
-
-          // Should show the default sort for any other fields[0]
-          expect($scope.headerClass(fields[0])).to.contain('fa-sort-up');
-
-          done();
-        });
-
-        it('should NOT sort unindexed fields', function (done) {
-          $scope.sort('request_body');
-          expect($scope.sorting).to.be(undefined);
-          done();
-        });
-
-        it('should NOT sort geo_point fields', function (done) {
-          $scope.sort('point');
-          expect($scope.sorting).to.be(undefined);
-          done();
-        });
-      });
-
-      describe('moving columns', function () {
-        beforeEach(function () {
-          $parentScope.columns = ['bytes', 'request_body', '@timestamp', 'point'];
-          $elem.scope().$digest();
-        });
-
-        it('should move columns to the right', function () {
-
-          $scope.moveRight('bytes');
-          expect($scope.columns[1]).to.be('bytes');
-
-          $scope.moveRight('bytes');
-          expect($scope.columns[2]).to.be('bytes');
-        });
-
-        it('shouldnt move the last column to the right', function () {
-          expect($scope.columns[3]).to.be('point');
-
-          $scope.moveRight('point');
-          expect($scope.columns[3]).to.be('point');
-        });
-
-        it('should move columns to the left', function () {
-          $scope.moveLeft('@timestamp');
-          expect($scope.columns[1]).to.be('@timestamp');
-
-          $scope.moveLeft('request_body');
-          expect($scope.columns[1]).to.be('request_body');
-        });
-
-        it('shouldnt move the first column to the left', function () {
-          expect($scope.columns[0]).to.be('bytes');
-
-          $scope.moveLeft('bytes');
-          expect($scope.columns[0]).to.be('bytes');
-        });
-      });
-    });
-
-    describe('kbnTableRow', function () {
-      var $elem = angular.element(
-        '<tr kbn-table-row="row" ' +
-        'columns="columns" ' +
-        'sorting="sorting"' +
-        'filter="filter"' +
-        'index-pattern="indexPattern"' +
-        '></tr>'
-      );
-
-      beforeEach(function () {
-
-        init($elem, {
-          row: getFakeRow(0, mapping),
-          columns: [],
-          sorting: [],
-          filter: sinon.spy(),
-          maxLength: 50,
-        });
-
-        // Ignore the metaFields (_id, _type, etc) since we don't have a mapping for them
-        sinon.stub(config, 'get').withArgs('metaFields').returns([]);
-
-      });
-      afterEach(function () {
-        destroy();
-      });
-
-      describe('adding and removing columns', function () {
-        columnTests('td', $elem);
-      });
-
-      describe('details row', function () {
-        it('should be an empty tr by default', function () {
-          expect($elem.next().is('tr')).to.be(true);
-          expect($elem.next().text()).to.be('');
-        });
-
-        it('should expand the detail row when the toggle arrow is clicked', function () {
-          $elem.children(':first-child').click();
-          $scope.$digest();
-          expect($elem.next().text()).to.not.be('');
-        });
-
-        describe('expanded', function () {
-          var $details;
-          beforeEach(function () {
-            // Open the row
-            $scope.toggleRow();
-            $scope.$digest();
-            $details = $elem.next();
-          });
-          afterEach(function () {
-            // Close the row
-            $scope.toggleRow();
-            $scope.$digest();
-          });
-
-          it('should be a tr with something in it', function () {
-            expect($details.is('tr')).to.be(true);
-            expect($details.text()).to.not.be.empty();
-          });
-
-        });
-
-      });
-    });
-
-    describe('kbnTableRow meta', function () {
-
-      var $elem = angular.element(
-          '<tr kbn-table-row="row" ' +
-          'columns="columns" ' +
-          'sorting="sorting"' +
-          'filtering="filtering"' +
-          'index-pattern="indexPattern"' +
-          '></tr>'
-      );
-      var $details;
-
-      beforeEach(function () {
-        var row = getFakeRow(0, mapping);
-        mapping._id = {indexed: true, type: 'string'};
-        row._source._id = 'foo';
-
-        init($elem, {
-          row: row,
-          columns: [],
-          sorting: [],
-          filtering: sinon.spy(),
-          maxLength: 50,
-        });
-
-        sinon.stub(config, 'get').withArgs('metaFields').returns(['_id']);
-
-        // Open the row
-        $scope.toggleRow();
-        $scope.$digest();
-        $details = $elem.next();
-      });
-
-      afterEach(function () {
-        delete mapping._id;
-        destroy();
-      });
-
-      it('should render even when the row source contains a field with the same name as a meta field', function () {
-        expect($details.find('tr').length).to.be(_.keys($parentScope.indexPattern.flattenHit($scope.row)).length);
-      });
-    });
-
-    describe('row diffing', function () {
-      var $row;
-      var $scope;
-      var $root;
-      var $before;
-
-      beforeEach(inject(function ($rootScope, $compile, Private) {
-        $root = $rootScope;
-        $root.row = getFakeRow(0, mapping);
-        $root.columns = ['_source'];
-        $root.sorting = [];
-        $root.filtering = sinon.spy();
-        $root.maxLength = 50;
-        $root.mapping = mapping;
-        $root.indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-
-        $row = $('<tr>')
-        .attr({
-          'kbn-table-row': 'row',
-          'columns': 'columns',
-          'sorting': 'sortin',
-          'filtering': 'filtering',
-          'index-pattern': 'indexPattern',
-        });
-
-        $scope = $root.$new();
-        $compile($row)($scope);
-        $root.$apply();
-
-        $before = $row.find('td');
-        expect($before).to.have.length(3);
-        expect($before.eq(0).text().trim()).to.be('');
-        expect($before.eq(1).text().trim()).to.match(/^time_formatted/);
-      }));
-
-      afterEach(function () {
-        $row.remove();
-      });
-
-      it('handles a new column', function () {
-        $root.columns.push('bytes');
-        $root.$apply();
-
-        var $after = $row.find('td');
-        expect($after).to.have.length(4);
-        expect($after[0]).to.be($before[0]);
-        expect($after[1]).to.be($before[1]);
-        expect($after[2]).to.be($before[2]);
-        expect($after.eq(3).text().trim()).to.match(/^bytes_formatted/);
-      });
-
-      it('handles two new columns at once', function () {
-        $root.columns.push('bytes');
-        $root.columns.push('request_body');
-        $root.$apply();
-
-        var $after = $row.find('td');
-        expect($after).to.have.length(5);
-        expect($after[0]).to.be($before[0]);
-        expect($after[1]).to.be($before[1]);
-        expect($after[2]).to.be($before[2]);
-        expect($after.eq(3).text().trim()).to.match(/^bytes_formatted/);
-        expect($after.eq(4).text().trim()).to.match(/^request_body_formatted/);
-      });
-
-      it('handles three new columns in odd places', function () {
-        $root.columns = [
-          '@timestamp',
-          'bytes',
-          '_source',
-          'request_body'
-        ];
-        $root.$apply();
-
-        var $after = $row.find('td');
-        expect($after).to.have.length(6);
-        expect($after[0]).to.be($before[0]);
-        expect($after[1]).to.be($before[1]);
-        expect($after.eq(2).text().trim()).to.match(/^@timestamp_formatted/);
-        expect($after.eq(3).text().trim()).to.match(/^bytes_formatted/);
-        expect($after[4]).to.be($before[2]);
-        expect($after.eq(5).text().trim()).to.match(/^request_body_formatted/);
-      });
-
-
-      it('handles a removed column', function () {
-        _.pull($root.columns, '_source');
-        $root.$apply();
-
-        var $after = $row.find('td');
-        expect($after).to.have.length(2);
-        expect($after[0]).to.be($before[0]);
-        expect($after[1]).to.be($before[1]);
-      });
-
-      it('handles two removed columns', function () {
-        // first add a column
-        $root.columns.push('@timestamp');
-        $root.$apply();
-
-        var $mid = $row.find('td');
-        expect($mid).to.have.length(4);
-
-        $root.columns.pop();
-        $root.columns.pop();
-        $root.$apply();
-
-        var $after = $row.find('td');
-        expect($after).to.have.length(2);
-        expect($after[0]).to.be($before[0]);
-        expect($after[1]).to.be($before[1]);
-      });
-
-      it('handles three removed random columns', function () {
-        // first add two column
-        $root.columns.push('@timestamp', 'bytes');
-        $root.$apply();
-
-        var $mid = $row.find('td');
-        expect($mid).to.have.length(5);
-
-        $root.columns[0] = false; // _source
-        $root.columns[2] = false; // bytes
-        $root.columns = $root.columns.filter(Boolean);
-        $root.$apply();
-
-        var $after = $row.find('td');
-        expect($after).to.have.length(3);
-        expect($after[0]).to.be($before[0]);
-        expect($after[1]).to.be($before[1]);
-        expect($after.eq(2).text().trim()).to.match(/^@timestamp_formatted/);
-      });
-
-      it('handles two columns with the same content', function () {
-        $root.row.$$_partialFormatted.request_body = $root.row.$$_partialFormatted.bytes;
-        $root.columns.length = 0;
-        $root.columns.push('bytes');
-        $root.columns.push('request_body');
-        $root.$apply();
-
-        var $after = $row.find('td');
-        expect($after).to.have.length(4);
-        expect($after.eq(2).text().trim()).to.match(/^bytes_formatted/);
-        expect($after.eq(3).text().trim()).to.match(/^bytes_formatted/);
-      });
-
-      it('handles two columns swapping position', function () {
-        $root.columns.push('bytes');
-        $root.$apply();
-
-        var $mid = $row.find('td');
-        expect($mid).to.have.length(4);
-
-        $root.columns.reverse();
-        $root.$apply();
-
-        var $after = $row.find('td');
-        expect($after).to.have.length(4);
-        expect($after[0]).to.be($before[0]);
-        expect($after[1]).to.be($before[1]);
-        expect($after[2]).to.be($mid[3]);
-        expect($after[3]).to.be($mid[2]);
-      });
-
-      it('handles four columns all reversing position', function () {
-        $root.columns.push('bytes', 'response', '@timestamp');
-        $root.$apply();
-
-        var $mid = $row.find('td');
-        expect($mid).to.have.length(6);
-
-        $root.columns.reverse();
-        $root.$apply();
-
-        var $after = $row.find('td');
-        expect($after).to.have.length(6);
-        expect($after[0]).to.be($before[0]);
-        expect($after[1]).to.be($before[1]);
-        expect($after[2]).to.be($mid[5]);
-        expect($after[3]).to.be($mid[4]);
-        expect($after[4]).to.be($mid[3]);
-        expect($after[5]).to.be($mid[2]);
-      });
-
-      it('handles multiple columns with the same name', function () {
-        $root.columns.push('bytes', 'bytes', 'bytes');
-        $root.$apply();
-
-        var $after = $row.find('td');
-        expect($after).to.have.length(6);
-        expect($after[0]).to.be($before[0]);
-        expect($after[1]).to.be($before[1]);
-        expect($after[2]).to.be($before[2]);
-        expect($after.eq(3).text().trim()).to.match(/^bytes_formatted/);
-        expect($after.eq(4).text().trim()).to.match(/^bytes_formatted/);
-        expect($after.eq(5).text().trim()).to.match(/^bytes_formatted/);
-      });
-    });
-  });
-
-});
diff --git a/test/unit/specs/components/doc_title/doc_title.js b/test/unit/specs/components/doc_title/doc_title.js
deleted file mode 100644
index 8777449a845d5..0000000000000
--- a/test/unit/specs/components/doc_title/doc_title.js
+++ /dev/null
@@ -1,83 +0,0 @@
-define(function (require) {
-  describe('docTitle Service', function () {
-    var _ = require('lodash');
-    var sinon = require('test_utils/auto_release_sinon');
-    var initialDocTitle;
-    var MAIN_TITLE = 'Kibana 4';
-    var fakeApp = { name: 'fancy pants' };
-
-    var docTitle;
-    var $rootScope;
-
-    beforeEach(function () {
-      initialDocTitle = document.title;
-      document.title = MAIN_TITLE;
-    });
-    afterEach(function () {
-      document.title = initialDocTitle;
-    });
-
-    beforeEach(module('kibana', function ($provide) {
-      $provide.decorator('docTitle', sinon.decorateWithSpy('update'));
-      $provide.decorator('$rootScope', sinon.decorateWithSpy('$on'));
-    }));
-
-    beforeEach(inject(function ($injector, Private) {
-      if (_.random(0, 1)) {
-        docTitle = $injector.get('docTitle');
-      } else {
-        docTitle = Private(require('components/doc_title/doc_title'));
-      }
-
-      $rootScope = $injector.get('$rootScope');
-    }));
-
-    describe('setup', function () {
-      it('resets the title when a route change begins', function () {
-        var spy = $rootScope.$on;
-
-        var found = spy.args.some(function (args) {
-          return args[0] === '$routeChangeStart' && args[1] === docTitle.reset;
-        });
-
-        if (!found) {
-          throw new Error('$rootScope.$on not called');
-        }
-      });
-    });
-
-    describe('#reset', function () {
-      it('clears the internal state, next update() will write the default', function () {
-        docTitle.change('some title');
-        docTitle.update();
-        expect(document.title).to.be('some title - ' + MAIN_TITLE);
-
-        docTitle.reset();
-        docTitle.update();
-        expect(document.title).to.be(MAIN_TITLE);
-      });
-    });
-
-    describe('#change', function () {
-      it('writes the first param to as the first part of the doc name', function () {
-        expect(document.title).to.be(MAIN_TITLE);
-        docTitle.change('some secondary title');
-        expect(document.title).to.be('some secondary title - ' + MAIN_TITLE);
-      });
-
-      it('includes the name of the active app if available', function () {
-        expect(document.title).to.be(MAIN_TITLE);
-        $rootScope.activeApp = fakeApp;
-        docTitle.change('some secondary title');
-        expect(document.title).to.be('some secondary title - ' + fakeApp.name + ' - ' + MAIN_TITLE);
-      });
-
-      it('will write just the first param if the second param is true', function () {
-        expect(document.title).to.be(MAIN_TITLE);
-        docTitle.change('entire name', true);
-        expect(document.title).to.be('entire name');
-      });
-    });
-
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/doc_viewer/doc_viewer.js b/test/unit/specs/components/doc_viewer/doc_viewer.js
deleted file mode 100644
index 6e826d3550c74..0000000000000
--- a/test/unit/specs/components/doc_viewer/doc_viewer.js
+++ /dev/null
@@ -1,151 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var $ = require('jquery');
-  var _ = require('lodash');
-  var sinon = require('test_utils/auto_release_sinon');
-  var hit = {
-    '_index': 'logstash-2014.09.09',
-    '_type': 'apache',
-    '_id': '61',
-    '_score': 1,
-    '_source': {
-      'extension': 'html',
-      'bytes': 100,
-      'area': [{lat: 7, lon: 7}],
-      'noMapping': 'hasNoMapping',
-      'objectArray': [{foo: true}, {bar: false}],
-      '_underscore': 1
-    }
-  };
-
-  // Load the kibana app dependencies.
-  require('services/private');
-  require('components/doc_viewer/doc_viewer');
-
-
-  var $parentScope, $scope, indexPattern, flattened;
-
-  var init = function ($elem, props) {
-    inject(function ($rootScope, $compile) {
-      $parentScope = $rootScope;
-      _.assign($parentScope, props);
-      $compile($elem)($parentScope);
-      $elem.scope().$digest();
-      $scope = $elem.isolateScope();
-    });
-  };
-
-  var destroy = function () {
-    $scope.$destroy();
-    $parentScope.$destroy();
-  };
-
-  describe('docViewer', function () {
-    var $elem;
-
-    beforeEach(module('kibana'));
-    beforeEach(function () {
-      $elem = angular.element('<doc-viewer index-pattern="indexPattern" hit="hit" filter="filter"></doc-viewer>');
-      inject(function (Private) {
-        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-        flattened = indexPattern.flattenHit(hit);
-      });
-      init($elem, {
-        indexPattern: indexPattern,
-        hit: hit,
-        filter: sinon.spy()
-      });
-    });
-
-    afterEach(function () {
-      destroy();
-    });
-
-    describe('Table mode', function () {
-      it('should have a row for each field', function () {
-        var rows = $elem.find('tr');
-        expect($elem.find('tr').length).to.be(_.keys(flattened).length);
-      });
-
-      it('should have the field name in the first column', function () {
-        _.each(_.keys(flattened), function (field) {
-          expect($elem.find('td[title="' + field + '"]').length).to.be(1);
-        });
-      });
-
-      it('should have the a value for each field', function () {
-        _.each(_.keys(flattened), function (field) {
-          var cellValue = $elem.find('td[title="' + field + '"]').siblings().find('.doc-viewer-value').text();
-
-          // This sucks, but testing the filter chain is too hairy ATM
-          expect(cellValue.length).to.be.greaterThan(0);
-        });
-      });
-
-
-      describe('filtering', function () {
-        it('should apply a filter when clicking filterable fields', function () {
-          var cell = $elem.find('td[title="bytes"]').next();
-
-          cell.find('.fa-search-plus').first().click();
-          expect($scope.filter.calledOnce).to.be(true);
-          cell.find('.fa-search-minus').first().click();
-          expect($scope.filter.calledTwice).to.be(true);
-        });
-
-        it('should NOT apply a filter when clicking non-filterable fields', function () {
-          var cell = $elem.find('td[title="area"]').next();
-
-          cell.find('.fa-search-plus').first().click();
-          expect($scope.filter.calledOnce).to.be(false);
-          cell.find('.fa-search-minus').first().click();
-          expect($scope.filter.calledTwice).to.be(false);
-        });
-      });
-
-      describe('warnings', function () {
-        it('displays a warning about field name starting with underscore', function () {
-          var cells = $elem.find('td[title="_underscore"]').siblings();
-          expect(cells.find('.doc-viewer-underscore').length).to.be(1);
-          expect(cells.find('.doc-viewer-no-mapping').length).to.be(0);
-          expect(cells.find('.doc-viewer-object-array').length).to.be(0);
-        });
-
-        it('displays a warning about missing mappings', function () {
-          var cells = $elem.find('td[title="noMapping"]').siblings();
-          expect(cells.find('.doc-viewer-underscore').length).to.be(0);
-          expect(cells.find('.doc-viewer-no-mapping').length).to.be(1);
-          expect(cells.find('.doc-viewer-object-array').length).to.be(0);
-        });
-
-        it('displays a warning about objects in arrays', function () {
-          var cells = $elem.find('td[title="objectArray"]').siblings();
-          expect(cells.find('.doc-viewer-underscore').length).to.be(0);
-          expect(cells.find('.doc-viewer-no-mapping').length).to.be(0);
-          expect(cells.find('.doc-viewer-object-array').length).to.be(1);
-        });
-      });
-
-    });
-
-    describe('JSON mode', function () {
-      it('has pretty JSON', function () {
-        expect($scope.hitJson).to.equal(angular.toJson(hit, true));
-      });
-
-      it('should have a global ACE object', function () {
-        expect(window.ace).to.be.a(Object);
-      });
-
-      it('should have one ACE div', function () {
-        expect($elem.find('div[id="json-ace"]').length).to.be(1);
-      });
-
-      it('should contain the same code as hitJson', function () {
-        var editor = window.ace.edit($elem.find('div[id="json-ace"]')[0]);
-        var code = editor.getSession().getValue();
-        expect(code).to.equal($scope.hitJson);
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/components/fancy_forms/fancy_forms.js b/test/unit/specs/components/fancy_forms/fancy_forms.js
deleted file mode 100644
index 7237d26893e39..0000000000000
--- a/test/unit/specs/components/fancy_forms/fancy_forms.js
+++ /dev/null
@@ -1,102 +0,0 @@
-define(function (require) {
-  var $ = require('jquery');
-
-  describe('fancy forms', function () {
-    var $el;
-    var $scope;
-    var $compile;
-    var $rootScope;
-    var ngForm;
-    var ngModel;
-
-    function generateEl() {
-      return $('<form>').html(
-        $('<input ng-model="val" required>')
-      );
-    }
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function ($injector) {
-      $rootScope = $injector.get('$rootScope');
-      $compile = $injector.get('$compile');
-
-      $scope = $rootScope.$new();
-      $el = generateEl();
-
-      $compile($el)($scope);
-      $scope.$apply();
-
-      ngForm = $el.controller('form');
-      ngModel = $el.find('input').controller('ngModel');
-    }));
-
-    describe('ngFormController', function () {
-      it('counts errors', function () {
-        expect(ngForm.errorCount()).to.be(1);
-      });
-
-      it('clears errors', function () {
-        $scope.val = 'someting';
-        $scope.$apply();
-        expect(ngForm.errorCount()).to.be(0);
-      });
-
-      it('describes 0 errors', function () {
-        $scope.val = 'someting';
-        $scope.$apply();
-        expect(ngForm.describeErrors()).to.be('0 Errors');
-      });
-
-      it('describes 0 error when the model is invalid but untouched', function () {
-        $scope.$apply();
-        expect(ngForm.describeErrors()).to.be('0 Errors');
-      });
-
-      it('describes 1 error when the model is touched', function () {
-        $el.find('input').blur();
-        $scope.$apply();
-        expect(ngForm.describeErrors()).to.be('1 Error');
-      });
-    });
-
-    describe('ngModelController', function () {
-      it('gives access to the ngFormController', function () {
-        expect(ngModel.$getForm()).to.be(ngForm);
-      });
-
-      it('allows setting the model dirty', function () {
-        expect($el.find('input.ng-dirty')).to.have.length(0);
-        ngModel.$setDirty();
-        expect($el.find('input.ng-dirty')).to.have.length(1);
-      });
-
-      it('sets the model dirty when it moves from valid to invalid', function () {
-        // clear out the old scope/el
-        $scope.$destroy();
-        $el = generateEl();
-        $scope = $rootScope.$new();
-
-        // start with a valid value
-        $scope.val = 'something';
-        $compile($el)($scope);
-        $rootScope.$apply();
-
-        // ensure that the field is valid and pristinve
-        var $valid = $el.find('input.ng-valid');
-        expect($valid).to.have.length(1);
-        expect($valid.hasClass('ng-pristine')).to.be(true);
-        expect($valid.hasClass('ng-dirty')).to.be(false);
-
-        // remove the value without actually setting the view model
-        $scope.val = null;
-        $rootScope.$apply();
-
-        // ensure that the field is now invalid and dirty
-        var $invalid = $el.find('input.ng-invalid');
-        expect($invalid).to.have.length(1);
-        expect($valid.hasClass('ng-pristine')).to.be(false);
-        expect($valid.hasClass('ng-dirty')).to.be(true);
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/components/field_editor/field_editor.js b/test/unit/specs/components/field_editor/field_editor.js
deleted file mode 100644
index d8ffc6542f1f9..0000000000000
--- a/test/unit/specs/components/field_editor/field_editor.js
+++ /dev/null
@@ -1,129 +0,0 @@
-define(function (require) {
-  describe('FieldEditor directive', function () {
-    var $ = require('jquery');
-
-    var Field;
-    var StringFormat;
-    var $rootScope;
-
-    var compile;
-    var $scope;
-    var $el;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function ($compile, $injector, Private) {
-      $rootScope = $injector.get('$rootScope');
-      Field = Private(require('components/index_patterns/_field'));
-      StringFormat = Private(require('registry/field_formats')).getType('string');
-
-      $rootScope.indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-      // set the field format for this field
-      $rootScope.indexPattern.fieldFormatMap.time = new StringFormat({ foo: 1, bar: 2 });
-      $rootScope.indexPattern._indexFields();
-      $rootScope.field = $rootScope.indexPattern.fields.byName.time;
-
-      compile = function () {
-        $el = $compile($('<field-editor field="field" index-pattern="indexPattern">'))($rootScope);
-        $scope = $el.data('$isolateScope');
-      };
-    }));
-
-    describe('$scope', function () {
-      it('is isolated', function () {
-        compile();
-        expect($scope.parent == null).to.be.ok();
-        expect($scope).to.not.be($rootScope);
-      });
-
-      it('exposes $scope.editor, a controller for the editor', function () {
-        compile();
-        var editor = $scope.editor;
-        expect(editor).to.be.an('object');
-      });
-    });
-
-    describe('$scope.editor', function () {
-      var editor;
-
-      beforeEach(function () {
-        compile();
-        editor = $scope.editor;
-      });
-
-      it('exposes editor.indexPattern', function () {
-        expect(editor.indexPattern).to.be($rootScope.indexPattern);
-      });
-
-      it('exposes editor.field', function () {
-        expect(editor.field).to.be.an('object');
-      });
-
-      describe('editor.field', function () {
-        var field;
-        var actual;
-
-        beforeEach(function () {
-          field = editor.field;
-          actual = $rootScope.field;
-        });
-
-        it('looks like the field from the index pattern, but isn\'t', function () {
-          expect(field).to.not.be(actual);
-          expect(field).to.not.be.a(Field);
-          expect(field.name).to.be(actual.name);
-          expect(field.type).to.be(actual.type);
-          expect(field.scripted).to.be(actual.scripted);
-          expect(field.script).to.be(actual.script);
-        });
-
-        it('reflects changes to the index patterns field', function () {
-          var a = {};
-          var b = {};
-
-          actual.script = a;
-          expect(field.script).to.be(a);
-
-          actual.script = b;
-          expect(field.script).to.be(b);
-        });
-
-        it('is fully mutable, unlike the index patterns field', function () {
-          var origName = actual.name;
-          actual.name = 'john';
-          expect(actual.name).to.not.be('john');
-          expect(actual.name).to.be(origName);
-
-          expect(field.name).to.be(origName);
-          field.name = 'john';
-          expect(field.name).to.be('john');
-          expect(actual.name).to.be(origName);
-        });
-      });
-
-      it('exposes editor.formatParams', function () {
-        expect(editor).to.have.property('formatParams');
-        expect(editor.field.format.params()).to.eql(editor.formatParams);
-      });
-
-      describe('editor.formatParams', function () {
-        it('initializes with all of the formats current params', function () {
-          // rebuild the editor
-          compile();
-          editor = $scope.editor;
-
-          expect(editor.formatParams).to.have.property('foo', 1);
-          expect(editor.formatParams).to.have.property('bar', 2);
-        });
-
-        it('updates the fields format when changed', function () {
-          $rootScope.$apply(); // initial apply in order to pick up change
-          editor.formatParams.foo = 200;
-          $rootScope.$apply();
-          expect(editor.field.format.param('foo')).to.be(200);
-        });
-
-      });
-    });
-
-  });
-});
diff --git a/test/unit/specs/components/filter_bar/_addFilters.js b/test/unit/specs/components/filter_bar/_addFilters.js
deleted file mode 100644
index 685634665fc6b..0000000000000
--- a/test/unit/specs/components/filter_bar/_addFilters.js
+++ /dev/null
@@ -1,155 +0,0 @@
-define(function (require) {
-  return ['add filters', function () {
-    var _ = require('lodash');
-    var sinon = require('test_utils/auto_release_sinon');
-    var MockState = require('fixtures/mock_state');
-    var storeNames = {
-      app: 'appState',
-      global: 'globalState'
-    };
-    var filters;
-    var queryFilter;
-    var $rootScope, appState, globalState;
-
-    beforeEach(module('kibana'));
-
-    beforeEach(function () {
-      appState = new MockState({ filters: [] });
-      globalState = new MockState({ filters: [] });
-
-      filters = [
-        {
-          query: { match: { extension: { query: 'jpg', type: 'phrase' } } },
-          meta: { index: 'logstash-*', negate: false, disabled: false }
-        },
-        {
-          query: { match: { '@tags': { query: 'info', type: 'phrase' } } },
-          meta: { index: 'logstash-*', negate: false, disabled: false }
-        },
-        {
-          query: { match: { '_type': { query: 'nginx', type: 'phrase' } } },
-          meta: { index: 'logstash-*', negate: false, disabled: false }
-        }
-      ];
-    });
-
-    beforeEach(function () {
-      module('kibana/courier', function ($provide) {
-        $provide.service('courier', require('fixtures/mock_courier'));
-      });
-
-      module('kibana/global_state', function ($provide) {
-        $provide.service('getAppState', function () {
-          return function () {
-            return appState;
-          };
-        });
-
-        $provide.service('globalState', function () {
-          return globalState;
-        });
-      });
-    });
-
-    beforeEach(function () {
-      inject(function (_$rootScope_, Private) {
-        $rootScope = _$rootScope_;
-        queryFilter = Private(require('components/filter_bar/query_filter'));
-      });
-    });
-
-    describe('adding filters', function () {
-      it('should add filters to appState', function () {
-        $rootScope.$digest();
-
-        queryFilter.addFilters(filters);
-        $rootScope.$digest();
-
-        expect(appState.filters.length).to.be(3);
-        expect(globalState.filters.length).to.be(0);
-      });
-
-      it('should add filters to globalState', function () {
-        $rootScope.$digest();
-
-        queryFilter.addFilters(filters, true);
-        $rootScope.$digest();
-
-        expect(appState.filters.length).to.be(0);
-        expect(globalState.filters.length).to.be(3);
-      });
-
-      it('should accept a single filter', function () {
-        $rootScope.$digest();
-
-        queryFilter.addFilters(filters[0]);
-        $rootScope.$digest();
-
-        expect(appState.filters.length).to.be(1);
-        expect(globalState.filters.length).to.be(0);
-      });
-
-      it('should fire the update and fetch events', function () {
-        var emitSpy = sinon.spy(queryFilter, 'emit');
-
-        // set up the watchers, add new filters, and crank the digest loop
-        $rootScope.$digest();
-        queryFilter.addFilters(filters);
-        $rootScope.$digest();
-
-        // updates should trigger state saves
-        expect(appState.save.callCount).to.be(1);
-        expect(globalState.save.callCount).to.be(1);
-
-        // this time, events should be emitted
-        expect(emitSpy.callCount).to.be(2);
-        expect(emitSpy.firstCall.args[0]).to.be('update');
-        expect(emitSpy.secondCall.args[0]).to.be('fetch');
-
-      });
-    });
-
-    describe('filter reconciliation', function () {
-      it('should de-dupe appState filters being added', function () {
-        var newFilter = _.cloneDeep(filters[1]);
-        appState.filters = filters;
-        $rootScope.$digest();
-        expect(appState.filters.length).to.be(3);
-
-        queryFilter.addFilters(newFilter);
-        $rootScope.$digest();
-        expect(appState.filters.length).to.be(3);
-      });
-
-      it('should de-dupe globalState filters being added', function () {
-        var newFilter = _.cloneDeep(filters[1]);
-        globalState.filters = filters;
-        $rootScope.$digest();
-        expect(globalState.filters.length).to.be(3);
-
-        queryFilter.addFilters(newFilter, true);
-        $rootScope.$digest();
-        expect(globalState.filters.length).to.be(3);
-      });
-
-      it('should mutate global filters on appState filter changes', function () {
-        var idx = 1;
-        globalState.filters = filters;
-        $rootScope.$digest();
-
-        var appFilter = _.cloneDeep(filters[idx]);
-        appFilter.meta.negate = true;
-        queryFilter.addFilters(appFilter);
-        $rootScope.$digest();
-
-        var res = queryFilter.getFilters();
-        expect(res).to.have.length(3);
-        _.each(res, function (filter, i) {
-          expect(filter.$state.store).to.be('globalState');
-          // make sure global filter actually mutated
-          expect(filter.meta.negate).to.be(i === idx);
-        });
-      });
-    });
-  }];
-});
diff --git a/test/unit/specs/components/filter_bar/_getFilters.js b/test/unit/specs/components/filter_bar/_getFilters.js
deleted file mode 100644
index 14892c64d66fd..0000000000000
--- a/test/unit/specs/components/filter_bar/_getFilters.js
+++ /dev/null
@@ -1,164 +0,0 @@
-define(function (require) {
-  return ['get filters', function () {
-    var _ = require('lodash');
-    var MockState = require('fixtures/mock_state');
-    var storeNames = {
-      app: 'appState',
-      global: 'globalState'
-    };
-    var queryFilter;
-    var $rootScope, appState, globalState;
-
-    beforeEach(module('kibana'));
-
-    beforeEach(function () {
-      appState = new MockState({ filters: [] });
-      globalState = new MockState({ filters: [] });
-    });
-
-    beforeEach(function () {
-      module('kibana/global_state', function ($provide) {
-        $provide.service('getAppState', function () {
-          return function () {
-            return appState;
-          };
-        });
-
-        $provide.service('globalState', function () {
-          return globalState;
-        });
-      });
-    });
-
-    beforeEach(function () {
-      inject(function (_$rootScope_, Private) {
-        $rootScope = _$rootScope_;
-        queryFilter = Private(require('components/filter_bar/query_filter'));
-
-      });
-    });
-
-    describe('getFilters method', function () {
-      var filters;
-
-      beforeEach(function () {
-        filters = [
-          { query: { match: { extension: { query: 'jpg', type: 'phrase' } } } },
-          { query: { match: { '@tags': { query: 'info', type: 'phrase' } } } }
-        ];
-      });
-
-      it('should return app and global filters', function () {
-        appState.filters = [filters[0]];
-        globalState.filters = [filters[1]];
-
-        // global filters should be listed first
-        var res = queryFilter.getFilters();
-        expect(res[0]).to.eql(filters[1]);
-        expect(res[1]).to.eql(filters[0]);
-
-        // should return updated version of filters
-        var newFilter = { query: { match: { '_type': { query: 'nginx', type: 'phrase' } } } };
-        appState.filters.push(newFilter);
-
-        res = queryFilter.getFilters();
-        expect(res).to.contain(newFilter);
-      });
-
-      it('should append the state store', function () {
-        appState.filters = [filters[0]];
-        globalState.filters = [filters[1]];
-
-        var res = queryFilter.getFilters();
-        expect(res[0].$state.store).to.be(storeNames.global);
-        expect(res[1].$state.store).to.be(storeNames.app);
-      });
-
-      it('should return filters from specific states', function () {
-        var states = [
-          [ globalState, queryFilter.getGlobalFilters ],
-          [ appState, queryFilter.getAppFilters ],
-        ];
-
-        _.each(states, function (state) {
-          state[0].filters = filters;
-          var res = state[1]();
-          expect(res.length).to.be(state[0].filters.length);
-        });
-      });
-    });
-
-    describe('filter reconciliation', function () {
-      var filters;
-
-      beforeEach(function () {
-        filters = [
-          {
-            query: { match: { extension: { query: 'jpg', type: 'phrase' } } },
-            meta: { negate: false, disabled: false }
-          },
-          {
-            query: { match: { '@tags': { query: 'info', type: 'phrase' } } },
-            meta: { negate: false, disabled: false }
-          },
-          {
-            query: { match: { '_type': { query: 'nginx', type: 'phrase' } } },
-            meta: { negate: false, disabled: false }
-          }
-        ];
-      });
-
-      it('should skip appState filters that match globalState filters', function () {
-        globalState.filters = filters;
-        var appFilter = _.cloneDeep(filters[1]);
-        appState.filters.push(appFilter);
-
-        // global filters should be listed first
-        var res = queryFilter.getFilters();
-        expect(res).to.have.length(3);
-        _.each(res, function (filter) {
-          expect(filter.$state.store).to.be('globalState');
-        });
-      });
-
-      it('should append conflicting appState filters', function () {
-        globalState.filters = filters;
-        var appFilter = _.cloneDeep(filters[1]);
-        appFilter.meta.negate = true;
-        appState.filters.push(appFilter);
-
-        // global filters should be listed first
-        var res = queryFilter.getFilters();
-        expect(res).to.have.length(4);
-        expect(res.filter(function (filter) {
-          return filter.$state.store === storeNames.global;
-        }).length).to.be(3);
-        expect(res.filter(function (filter) {
-          return filter.$state.store === storeNames.app;
-        }).length).to.be(1);
-      });
-
-      it('should not affect disabled filters', function () {
-        // test adding to globalState
-        globalState.filters = _.map(filters, function (filter) {
-          var f = _.cloneDeep(filter);
-          f.meta.disabled = true;
-          return f;
-        });
-        _.each(filters, function (filter) { globalState.filters.push(filter); });
-        var res = queryFilter.getFilters();
-        expect(res).to.have.length(6);
-
-        // test adding to appState
-        globalState.filters = _.map(filters, function (filter) {
-          var f = _.cloneDeep(filter);
-          f.meta.disabled = true;
-          return f;
-        });
-        _.each(filters, function (filter) { appState.filters.push(filter); });
-        res = queryFilter.getFilters();
-        expect(res).to.have.length(6);
-      });
-    });
-  }];
-});
diff --git a/test/unit/specs/components/filter_bar/_invertFilters.js b/test/unit/specs/components/filter_bar/_invertFilters.js
deleted file mode 100644
index 9835cae56a79f..0000000000000
--- a/test/unit/specs/components/filter_bar/_invertFilters.js
+++ /dev/null
@@ -1,128 +0,0 @@
-define(function (require) {
-  return ['invert filters', function () {
-    var _ = require('lodash');
-    var sinon = require('test_utils/auto_release_sinon');
-    var MockState = require('fixtures/mock_state');
-    var storeNames = {
-      app: 'appState',
-      global: 'globalState'
-    };
-    var filters;
-    var queryFilter;
-    var $rootScope, appState, globalState;
-
-    beforeEach(module('kibana'));
-
-    beforeEach(function () {
-      appState = new MockState({ filters: [] });
-      globalState = new MockState({ filters: [] });
-
-      filters = [
-        {
-          query: { match: { extension: { query: 'jpg', type: 'phrase' } } },
-          meta: { negate: false, disabled: false }
-        },
-        {
-          query: { match: { '@tags': { query: 'info', type: 'phrase' } } },
-          meta: { negate: false, disabled: false }
-        },
-        {
-          query: { match: { '_type': { query: 'nginx', type: 'phrase' } } },
-          meta: { negate: false, disabled: false }
-        }
-      ];
-    });
-
-    beforeEach(function () {
-      module('kibana/courier', function ($provide) {
-        $provide.service('courier', require('fixtures/mock_courier'));
-      });
-
-      module('kibana/global_state', function ($provide) {
-        $provide.service('getAppState', function () {
-          return function () {
-            return appState;
-          };
-        });
-
-        $provide.service('globalState', function () {
-          return globalState;
-        });
-      });
-    });
-
-    beforeEach(function () {
-      inject(function (_$rootScope_, Private) {
-        $rootScope = _$rootScope_;
-        queryFilter = Private(require('components/filter_bar/query_filter'));
-      });
-    });
-
-    describe('inverting a filter', function () {
-      it('should swap the negate property in appState', function () {
-        _.each(filters, function (filter) {
-          expect(filter.meta.negate).to.be(false);
-          appState.filters.push(filter);
-        });
-
-        queryFilter.invertFilter(filters[1]);
-        expect(appState.filters[1].meta.negate).to.be(true);
-      });
-
-      it('should toggle the negate property in globalState', function () {
-        _.each(filters, function (filter) {
-          expect(filter.meta.negate).to.be(false);
-          globalState.filters.push(filter);
-        });
-
-        queryFilter.invertFilter(filters[1]);
-        expect(globalState.filters[1].meta.negate).to.be(true);
-      });
-
-      it('should fire the update and fetch events', function () {
-        var emitSpy = sinon.spy(queryFilter, 'emit');
-        appState.filters = filters;
-
-        // set up the watchers
-        $rootScope.$digest();
-        queryFilter.invertFilter(filters[1]);
-        // trigger the digest loop to fire the watchers
-        $rootScope.$digest();
-
-        expect(emitSpy.callCount).to.be(2);
-        expect(emitSpy.firstCall.args[0]).to.be('update');
-        expect(emitSpy.secondCall.args[0]).to.be('fetch');
-      });
-    });
-
-    describe('bulk inverting', function () {
-      beforeEach(function () {
-        appState.filters = filters;
-        globalState.filters = _.map(_.cloneDeep(filters), function (filter) {
-          filter.meta.negate = true;
-          return filter;
-        });
-      });
-
-      it('should swap the negate state for all filters', function () {
-        queryFilter.invertAll();
-        _.each(appState.filters, function (filter) {
-          expect(filter.meta.negate).to.be(true);
-        });
-        _.each(globalState.filters, function (filter) {
-          expect(filter.meta.negate).to.be(false);
-        });
-      });
-
-      it('should work without global state filters', function () {
-        // remove global filters
-        delete globalState.filters;
-
-        queryFilter.invertAll();
-        _.each(appState.filters, function (filter) {
-          expect(filter.meta.negate).to.be(true);
-        });
-      });
-    });
-  }];
-});
diff --git a/test/unit/specs/components/filter_bar/_pinFilters.js b/test/unit/specs/components/filter_bar/_pinFilters.js
deleted file mode 100644
index 5d4fa207705ab..0000000000000
--- a/test/unit/specs/components/filter_bar/_pinFilters.js
+++ /dev/null
@@ -1,162 +0,0 @@
-define(function (require) {
-  return ['pin filters', function () {
-    var _ = require('lodash');
-    var sinon = require('test_utils/auto_release_sinon');
-    var MockState = require('fixtures/mock_state');
-    var storeNames = {
-      app: 'appState',
-      global: 'globalState'
-    };
-    var filters;
-    var queryFilter;
-    var $rootScope, appState, globalState;
-
-    beforeEach(module('kibana'));
-
-    beforeEach(function () {
-      appState = new MockState({ filters: [] });
-      globalState = new MockState({ filters: [] });
-
-      filters = [
-        {
-          query: { match: { extension: { query: 'gif', type: 'phrase' } } },
-          meta: { negate: false, disabled: false }
-        },
-        {
-          query: { match: { extension: { query: 'jpg', type: 'phrase' } } },
-          meta: { negate: true, disabled: false }
-        },
-        {
-          query: { match: { extension: { query: 'png', type: 'phrase' } } },
-          meta: { negate: true, disabled: true }
-        },
-        {
-          query: { match: { '@tags': { query: 'info', type: 'phrase' } } },
-          meta: { negate: false, disabled: false }
-        },
-        {
-          query: { match: { '@tags': { query: 'success', type: 'phrase' } } },
-          meta: { negate: false, disabled: false }
-        },
-        {
-          query: { match: { '@tags': { query: 'security', type: 'phrase' } } },
-          meta: { negate: true, disabled: false }
-        },
-        {
-          query: { match: { '_type': { query: 'nginx', type: 'phrase' } } },
-          meta: { negate: false, disabled: false }
-        },
-        {
-          query: { match: { '_type': { query: 'apache', type: 'phrase' } } },
-          meta: { negate: true, disabled: true }
-        }
-      ];
-    });
-
-    beforeEach(function () {
-      module('kibana/courier', function ($provide) {
-        $provide.service('courier', require('fixtures/mock_courier'));
-      });
-
-      module('kibana/global_state', function ($provide) {
-        $provide.service('getAppState', function () {
-          return function () {
-            return appState;
-          };
-        });
-
-        $provide.service('globalState', function () {
-          return globalState;
-        });
-      });
-    });
-
-    beforeEach(function () {
-      inject(function (_$rootScope_, Private) {
-        $rootScope = _$rootScope_;
-        queryFilter = Private(require('components/filter_bar/query_filter'));
-      });
-    });
-
-    describe('pin a filter', function () {
-      beforeEach(function () {
-        globalState.filters = _.filter(filters, function (filter) {
-          return !!filter.query.match._type;
-        });
-        appState.filters = _.filter(filters, function (filter) {
-          return !filter.query.match._type;
-        });
-        expect(globalState.filters).to.have.length(2);
-        expect(appState.filters).to.have.length(6);
-      });
-
-      it('should move filter from appState to globalState', function () {
-        var filter = appState.filters[1];
-
-        queryFilter.pinFilter(filter);
-        expect(globalState.filters).to.contain(filter);
-        expect(globalState.filters).to.have.length(3);
-        expect(appState.filters).to.have.length(5);
-      });
-
-      it('should move filter from globalState to appState', function () {
-        var filter = globalState.filters[1];
-
-        queryFilter.pinFilter(filter);
-        expect(appState.filters).to.contain(filter);
-        expect(globalState.filters).to.have.length(1);
-        expect(appState.filters).to.have.length(7);
-      });
-
-
-      it('should only fire the update event', function () {
-        var emitSpy = sinon.spy(queryFilter, 'emit');
-        var filter = appState.filters[1];
-        $rootScope.$digest();
-
-        queryFilter.pinFilter(filter);
-        $rootScope.$digest();
-
-        expect(emitSpy.callCount).to.be(1);
-        expect(emitSpy.firstCall.args[0]).to.be('update');
-      });
-    });
-
-    describe('bulk pinning', function () {
-      beforeEach(function () {
-        globalState.filters = _.filter(filters, function (filter) {
-          return !!filter.query.match.extension;
-        });
-        appState.filters = _.filter(filters, function (filter) {
-          return !filter.query.match.extension;
-        });
-        expect(globalState.filters).to.have.length(3);
-        expect(appState.filters).to.have.length(5);
-      });
-
-      it('should swap the filters in both states', function () {
-        var appSample = _.sample(appState.filters);
-        var globalSample = _.sample(globalState.filters);
-
-        queryFilter.pinAll();
-        expect(globalState.filters).to.have.length(5);
-        expect(appState.filters).to.have.length(3);
-
-        expect(globalState.filters).to.contain(appSample);
-        expect(appState.filters).to.contain(globalSample);
-      });
-
-      it('should move all filters to globalState', function () {
-        queryFilter.pinAll(true);
-        expect(globalState.filters).to.have.length(8);
-        expect(appState.filters).to.have.length(0);
-      });
-
-      it('should move all filters to appState', function () {
-        queryFilter.pinAll(false);
-        expect(globalState.filters).to.have.length(0);
-        expect(appState.filters).to.have.length(8);
-      });
-    });
-  }];
-});
diff --git a/test/unit/specs/components/filter_bar/_removeFilters.js b/test/unit/specs/components/filter_bar/_removeFilters.js
deleted file mode 100644
index 4e4be3f8918ff..0000000000000
--- a/test/unit/specs/components/filter_bar/_removeFilters.js
+++ /dev/null
@@ -1,150 +0,0 @@
-define(function (require) {
-  return ['remove filters', function () {
-    var _ = require('lodash');
-    var sinon = require('test_utils/auto_release_sinon');
-    var MockState = require('fixtures/mock_state');
-    var storeNames = {
-      app: 'appState',
-      global: 'globalState'
-    };
-    var filters;
-    var queryFilter;
-    var $rootScope, appState, globalState;
-
-    beforeEach(module('kibana'));
-
-    beforeEach(function () {
-      appState = new MockState({ filters: [] });
-      globalState = new MockState({ filters: [] });
-
-      filters = [
-        {
-          query: { match: { extension: { query: 'jpg', type: 'phrase' } } },
-          meta: { negate: false, disabled: false }
-        },
-        {
-          query: { match: { '@tags': { query: 'info', type: 'phrase' } } },
-          meta: { negate: false, disabled: false }
-        },
-        {
-          query: { match: { '_type': { query: 'nginx', type: 'phrase' } } },
-          meta: { negate: false, disabled: false }
-        }
-      ];
-    });
-
-    beforeEach(function () {
-      module('kibana/courier', function ($provide) {
-        $provide.service('courier', require('fixtures/mock_courier'));
-      });
-
-      module('kibana/global_state', function ($provide) {
-        $provide.service('getAppState', function () {
-          return function () {
-            return appState;
-          };
-        });
-
-        $provide.service('globalState', function () {
-          return globalState;
-        });
-      });
-    });
-
-    beforeEach(function () {
-      inject(function (_$rootScope_, Private) {
-        $rootScope = _$rootScope_;
-        queryFilter = Private(require('components/filter_bar/query_filter'));
-      });
-    });
-
-    describe('removing a filter', function () {
-      it('should remove the filter from appState', function () {
-        appState.filters = filters;
-        expect(appState.filters).to.have.length(3);
-        queryFilter.removeFilter(filters[0]);
-        expect(appState.filters).to.have.length(2);
-      });
-
-      it('should remove the filter from globalState', function () {
-        globalState.filters = filters;
-        expect(globalState.filters).to.have.length(3);
-        queryFilter.removeFilter(filters[0]);
-        expect(globalState.filters).to.have.length(2);
-      });
-
-      it('should fire the update and fetch events', function () {
-        var emitSpy = sinon.spy(queryFilter, 'emit');
-        appState.filters = filters;
-        $rootScope.$digest();
-
-        queryFilter.removeFilter(filters[0]);
-        $rootScope.$digest();
-
-        expect(emitSpy.callCount).to.be(2);
-        expect(emitSpy.firstCall.args[0]).to.be('update');
-        expect(emitSpy.secondCall.args[0]).to.be('fetch');
-      });
-
-      it('should remove matching filters', function () {
-        globalState.filters.push(filters[0]);
-        globalState.filters.push(filters[1]);
-        appState.filters.push(filters[2]);
-        $rootScope.$digest();
-
-        queryFilter.removeFilter(filters[0]);
-        $rootScope.$digest();
-        expect(globalState.filters).to.have.length(1);
-        expect(appState.filters).to.have.length(1);
-      });
-
-      it('should remove matching filters by comparison', function () {
-        globalState.filters.push(filters[0]);
-        globalState.filters.push(filters[1]);
-        appState.filters.push(filters[2]);
-        $rootScope.$digest();
-
-        queryFilter.removeFilter(_.cloneDeep(filters[0]));
-        $rootScope.$digest();
-        expect(globalState.filters).to.have.length(1);
-        expect(appState.filters).to.have.length(1);
-
-        queryFilter.removeFilter(_.cloneDeep(filters[2]));
-        $rootScope.$digest();
-        expect(globalState.filters).to.have.length(1);
-        expect(appState.filters).to.have.length(0);
-      });
-
-      it('should do nothing with a non-matching filter', function () {
-        globalState.filters.push(filters[0]);
-        globalState.filters.push(filters[1]);
-        appState.filters.push(filters[2]);
-        $rootScope.$digest();
-
-        var missedFilter = _.cloneDeep(filters[0]);
-        missedFilter.meta = {
-          negate: !filters[0].meta.negate
-        };
-
-        queryFilter.removeFilter(missedFilter);
-        $rootScope.$digest();
-        expect(globalState.filters).to.have.length(2);
-        expect(appState.filters).to.have.length(1);
-      });
-    });
-
-    describe('bulk removal', function () {
-      it('should remove all the filters from both states', function () {
-        globalState.filters.push(filters[0]);
-        globalState.filters.push(filters[1]);
-        appState.filters.push(filters[2]);
-        expect(globalState.filters).to.have.length(2);
-        expect(appState.filters).to.have.length(1);
-
-        queryFilter.removeAll();
-        expect(globalState.filters).to.have.length(0);
-        expect(appState.filters).to.have.length(0);
-      });
-    });
-  }];
-});
diff --git a/test/unit/specs/components/filter_bar/_toggleFilters.js b/test/unit/specs/components/filter_bar/_toggleFilters.js
deleted file mode 100644
index 1c6ae8f218453..0000000000000
--- a/test/unit/specs/components/filter_bar/_toggleFilters.js
+++ /dev/null
@@ -1,184 +0,0 @@
-define(function (require) {
-  return ['toggle filters', function () {
-    var _ = require('lodash');
-    var sinon = require('test_utils/auto_release_sinon');
-    var MockState = require('fixtures/mock_state');
-    var storeNames = {
-      app: 'appState',
-      global: 'globalState'
-    };
-    var filters;
-    var queryFilter;
-    var $rootScope, appState, globalState;
-
-    beforeEach(module('kibana'));
-
-    beforeEach(function () {
-      appState = new MockState({ filters: [] });
-      globalState = new MockState({ filters: [] });
-
-      filters = [
-        {
-          query: { match: { extension: { query: 'jpg', type: 'phrase' } } },
-          meta: { negate: false, disabled: false }
-        },
-        {
-          query: { match: { '@tags': { query: 'info', type: 'phrase' } } },
-          meta: { negate: false, disabled: false }
-        },
-        {
-          query: { match: { '_type': { query: 'nginx', type: 'phrase' } } },
-          meta: { negate: false, disabled: false }
-        }
-      ];
-    });
-
-    beforeEach(function () {
-      module('kibana/courier', function ($provide) {
-        $provide.service('courier', require('fixtures/mock_courier'));
-      });
-
-      module('kibana/global_state', function ($provide) {
-        $provide.service('getAppState', function () {
-          return function () {
-            return appState;
-          };
-        });
-
-        $provide.service('globalState', function () {
-          return globalState;
-        });
-      });
-    });
-
-    beforeEach(function () {
-      inject(function (_$rootScope_, Private) {
-        $rootScope = _$rootScope_;
-        queryFilter = Private(require('components/filter_bar/query_filter'));
-      });
-    });
-
-    describe('toggling a filter', function () {
-      it('should toggle the disabled property in appState', function () {
-        _.each(filters, function (filter) {
-          expect(filter.meta.disabled).to.be(false);
-          appState.filters.push(filter);
-        });
-
-        queryFilter.toggleFilter(filters[1]);
-        expect(appState.filters[1].meta.disabled).to.be(true);
-      });
-
-      it('should toggle the disabled property in globalState', function () {
-        _.each(filters, function (filter) {
-          expect(filter.meta.disabled).to.be(false);
-          globalState.filters.push(filter);
-        });
-
-        queryFilter.toggleFilter(filters[1]);
-        expect(globalState.filters[1].meta.disabled).to.be(true);
-      });
-
-      it('should fire the update and fetch events', function () {
-        var emitSpy = sinon.spy(queryFilter, 'emit');
-        appState.filters = filters;
-        $rootScope.$digest();
-
-        queryFilter.toggleFilter(filters[1]);
-        $rootScope.$digest();
-
-        expect(emitSpy.callCount).to.be(2);
-        expect(emitSpy.firstCall.args[0]).to.be('update');
-        expect(emitSpy.secondCall.args[0]).to.be('fetch');
-      });
-
-      it('should always enable the filter', function () {
-        appState.filters = filters.map(function (filter) {
-          filter.meta.disabled = true;
-          return filter;
-        });
-
-        expect(appState.filters[1].meta.disabled).to.be(true);
-        queryFilter.toggleFilter(filters[1], false);
-        expect(appState.filters[1].meta.disabled).to.be(false);
-        queryFilter.toggleFilter(filters[1], false);
-        expect(appState.filters[1].meta.disabled).to.be(false);
-      });
-
-      it('should always disable the filter', function () {
-        globalState.filters = filters;
-
-        expect(globalState.filters[1].meta.disabled).to.be(false);
-        queryFilter.toggleFilter(filters[1], true);
-        expect(globalState.filters[1].meta.disabled).to.be(true);
-        queryFilter.toggleFilter(filters[1], true);
-        expect(globalState.filters[1].meta.disabled).to.be(true);
-      });
-
-      it('should work without appState', function () {
-        appState = undefined;
-        globalState.filters = filters;
-
-        expect(globalState.filters[1].meta.disabled).to.be(false);
-        expect(queryFilter.getFilters()).to.have.length(3);
-        queryFilter.toggleFilter(filters[1]);
-        expect(globalState.filters[1].meta.disabled).to.be(true);
-      });
-    });
-
-    describe('bulk toggling', function () {
-      beforeEach(function () {
-        appState.filters = filters;
-        globalState.filters = _.map(_.cloneDeep(filters), function (filter) {
-          filter.meta.disabled = true;
-          return filter;
-        });
-      });
-
-      it('should swap the enabled state for all filters', function () {
-        queryFilter.toggleAll();
-        _.each(appState.filters, function (filter) {
-          expect(filter.meta.disabled).to.be(true);
-        });
-        _.each(globalState.filters, function (filter) {
-          expect(filter.meta.disabled).to.be(false);
-        });
-      });
-
-      it('should enable all filters', function () {
-        queryFilter.toggleAll(true);
-        _.each(appState.filters, function (filter) {
-          expect(filter.meta.disabled).to.be(true);
-        });
-        _.each(globalState.filters, function (filter) {
-          expect(filter.meta.disabled).to.be(true);
-        });
-      });
-
-      it('should disable all filters', function () {
-        queryFilter.toggleAll(false);
-        _.each(appState.filters, function (filter) {
-          expect(filter.meta.disabled).to.be(false);
-        });
-        _.each(globalState.filters, function (filter) {
-          expect(filter.meta.disabled).to.be(false);
-        });
-      });
-
-      it('should work without appState', function () {
-        appState = undefined;
-        globalState.filters = filters;
-
-        _.each(globalState.filters, function (filter) {
-          expect(filter.meta.disabled).to.be(false);
-        });
-
-        queryFilter.toggleAll();
-
-        _.each(globalState.filters, function (filter) {
-          expect(filter.meta.disabled).to.be(true);
-        });
-      });
-    });
-  }];
-});
diff --git a/test/unit/specs/components/filter_bar/changeTimeFilter.js b/test/unit/specs/components/filter_bar/changeTimeFilter.js
deleted file mode 100644
index 43261bf311fc2..0000000000000
--- a/test/unit/specs/components/filter_bar/changeTimeFilter.js
+++ /dev/null
@@ -1,38 +0,0 @@
-define(function (require) {
-  var moment = require('moment');
-  describe('Filter Bar Directive', function () {
-    describe('changeTimeFilter()', function () {
-
-      var changeTimeFilter, timefilter;
-
-      beforeEach(module('kibana'));
-
-      beforeEach(inject(function (Private, _timefilter_) {
-        changeTimeFilter = Private(require('components/filter_bar/lib/changeTimeFilter'));
-        timefilter = _timefilter_;
-      }));
-
-      it('should change the timefilter to match the range gt/lt', function () {
-        var filter = { range: { '@timestamp': { gt: 1388559600000, lt: 1388646000000 } } };
-        changeTimeFilter(filter);
-        expect(timefilter.time.mode).to.be('absolute');
-        expect(moment.isMoment(timefilter.time.to)).to.be(true);
-        expect(timefilter.time.to.isSame('2014-01-02'));
-        expect(moment.isMoment(timefilter.time.from)).to.be(true);
-        expect(timefilter.time.from.isSame('2014-01-01'));
-      });
-
-      it('should change the timefilter to match the range gte/lte', function () {
-        var filter = { range: { '@timestamp': { gte: 1388559600000, lte: 1388646000000 } } };
-        changeTimeFilter(filter);
-        expect(timefilter.time.mode).to.be('absolute');
-        expect(moment.isMoment(timefilter.time.to)).to.be(true);
-        expect(timefilter.time.to.isSame('2014-01-02'));
-        expect(moment.isMoment(timefilter.time.from)).to.be(true);
-        expect(timefilter.time.from.isSame('2014-01-01'));
-      });
-
-    });
-  });
-});
-
diff --git a/test/unit/specs/components/filter_bar/dedupFilters.js b/test/unit/specs/components/filter_bar/dedupFilters.js
deleted file mode 100644
index 248c960179544..0000000000000
--- a/test/unit/specs/components/filter_bar/dedupFilters.js
+++ /dev/null
@@ -1,49 +0,0 @@
-define(function (require) {
-  var dedupFilters = require('components/filter_bar/lib/dedupFilters');
-  describe('Filter Bar Directive', function () {
-    describe('dedupFilters(existing, filters)', function () {
-
-      it('should return only filters which are not in the existing', function () {
-        var existing = [
-          { range: { bytes: { from: 0, to: 1024 } } },
-          { query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
-        ];
-        var filters = [
-          { range: { bytes: { from: 1024, to: 2048 } } },
-          { query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
-        ];
-        var results = dedupFilters(existing, filters);
-        expect(results).to.contain(filters[0]);
-        expect(results).to.not.contain(filters[1]);
-      });
-
-      it('should ignore the disabed attribute when comparing ', function () {
-        var existing = [
-          { range: { bytes: { from: 0, to: 1024 } } },
-          { meta: { disabled: true }, query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
-        ];
-        var filters = [
-          { range: { bytes: { from: 1024, to: 2048 } } },
-          { query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
-        ];
-        var results = dedupFilters(existing, filters);
-        expect(results).to.contain(filters[0]);
-        expect(results).to.not.contain(filters[1]);
-      });
-
-      it('should ignore $state attribute', function () {
-        var existing = [
-          { range: { bytes: { from: 0, to: 1024 } } },
-          { $state: { store: 'appState' }, query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
-        ];
-        var filters = [
-          { range: { bytes: { from: 1024, to: 2048 } } },
-          { $state: { store: 'globalState' }, query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
-        ];
-        var results = dedupFilters(existing, filters);
-        expect(results).to.contain(filters[0]);
-        expect(results).to.not.contain(filters[1]);
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/components/filter_bar/extractTimeFilter.js b/test/unit/specs/components/filter_bar/extractTimeFilter.js
deleted file mode 100644
index 1178998718508..0000000000000
--- a/test/unit/specs/components/filter_bar/extractTimeFilter.js
+++ /dev/null
@@ -1,48 +0,0 @@
-define(function (require) {
-  describe('Filter Bar Directive', function () {
-    describe('extractTimeFilter()', function () {
-      var sinon = require('test_utils/auto_release_sinon');
-      var extractTimeFilter,
-          $rootScope;
-
-      beforeEach(module('kibana'));
-
-      beforeEach(function () {
-        module('kibana/courier', function ($provide) {
-          $provide.service('courier', require('fixtures/mock_courier'));
-        });
-      });
-
-      beforeEach(inject(function (Private, _$rootScope_, Promise) {
-        extractTimeFilter = Private(require('components/filter_bar/lib/extractTimeFilter'));
-        $rootScope = _$rootScope_;
-      }));
-
-      it('should return the matching filter for the defualt time field', function (done) {
-        var filters = [
-          { meta: { index: 'logstash-*' }, query: { match: { _type:  { query: 'apache', type: 'phrase' } } } },
-          { meta: { index: 'logstash-*' }, range: { 'time': { gt: 1388559600000, lt: 1388646000000 } } }
-        ];
-        extractTimeFilter(filters).then(function (filter) {
-          expect(filter).to.eql(filters[1]);
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-      it('should not return the non-matching filter for the defualt time field', function (done) {
-        var filters = [
-          { meta: { index: 'logstash-*' }, query: { match: { _type:  { query: 'apache', type: 'phrase' } } } },
-          { meta: { index: 'logstash-*' }, range: { '@timestamp': { gt: 1388559600000, lt: 1388646000000 } } }
-        ];
-        extractTimeFilter(filters).then(function (filter) {
-          expect(filter).to.be(undefined);
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-    });
-  });
-});
-
diff --git a/test/unit/specs/components/filter_bar/filterAppliedAndUnwrap.js b/test/unit/specs/components/filter_bar/filterAppliedAndUnwrap.js
deleted file mode 100644
index 0607770a6ecec..0000000000000
--- a/test/unit/specs/components/filter_bar/filterAppliedAndUnwrap.js
+++ /dev/null
@@ -1,19 +0,0 @@
-define(function (require) {
-  var filterAppliedAndUnwrap = require('components/filter_bar/lib/filterAppliedAndUnwrap');
-  describe('Filter Bar Directive', function () {
-    describe('filterAppliedAndUnwrap()', function () {
-
-      var filters = [
-        { meta: { apply: true }, exists: { field: '_type' } },
-        { meta: { apply: false }, query: { query_string: { query: 'foo:bar' } } }
-      ];
-
-      it('should filter the applied and unwrap the filter', function () {
-        var results = filterAppliedAndUnwrap(filters);
-        expect(results).to.have.length(1);
-        expect(results[0]).to.eql(filters[0]);
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/filter_bar/filterOutTimeBasedFilter.js b/test/unit/specs/components/filter_bar/filterOutTimeBasedFilter.js
deleted file mode 100644
index 7e6af682c4c5a..0000000000000
--- a/test/unit/specs/components/filter_bar/filterOutTimeBasedFilter.js
+++ /dev/null
@@ -1,37 +0,0 @@
-define(function (require) {
-  describe('Filter Bar Directive', function () {
-    describe('filterOutTimeBasedFilter()', function () {
-
-      var sinon = require('test_utils/auto_release_sinon');
-      var filterOutTimeBasedFilter,
-          $rootScope;
-
-      beforeEach(module('kibana'));
-
-      beforeEach(function () {
-        module('kibana/courier', function ($provide) {
-          $provide.service('courier', require('fixtures/mock_courier'));
-        });
-      });
-
-      beforeEach(inject(function (Private, _$rootScope_, Promise) {
-        filterOutTimeBasedFilter = Private(require('components/filter_bar/lib/filterOutTimeBasedFilter'));
-        $rootScope = _$rootScope_;
-      }));
-
-      it('should return the matching filter for the defualt time field', function (done) {
-        var filters = [
-          { meta: { index: 'logstash-*' }, query: { match: { _type:  { query: 'apache', type: 'phrase' } } } },
-          { meta: { index: 'logstash-*' }, range: { 'time': { gt: 1388559600000, lt: 1388646000000 } } }
-        ];
-        filterOutTimeBasedFilter(filters).then(function (results) {
-          expect(results).to.have.length(1);
-          expect(results).to.not.contain(filters[1]);
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/filter_bar/filter_bar.js b/test/unit/specs/components/filter_bar/filter_bar.js
deleted file mode 100644
index 3c4cd9fdaaf30..0000000000000
--- a/test/unit/specs/components/filter_bar/filter_bar.js
+++ /dev/null
@@ -1,86 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-  var $ = require('jquery');
-
-  require('components/filter_bar/filter_bar');
-  var MockState = require('fixtures/mock_state');
-
-  describe('Filter Bar Directive', function () {
-    var $rootScope, $compile, $timeout, Promise;
-    var appState, queryFilter, mapFilter, $el;
-    // require('test_utils/no_digest_promises').activateForSuite();
-
-    beforeEach(function () {
-      appState = new MockState({ filters: [] });
-
-      module('kibana/global_state', function ($provide) {
-        $provide.service('getAppState', function () {
-          return function () {
-            return appState;
-          };
-        });
-      });
-    });
-
-    beforeEach(function () {
-      // load the application
-      module('kibana');
-
-      module('kibana/courier', function ($provide) {
-        $provide.service('courier', require('fixtures/mock_courier'));
-      });
-
-      inject(function (Private, $injector, _$rootScope_, _$compile_, _$timeout_) {
-        $rootScope = _$rootScope_;
-        $compile = _$compile_;
-        $timeout = _$timeout_;
-        Promise = $injector.get('Promise');
-        mapFilter = Private(require('components/filter_bar/lib/mapFilter'));
-
-        var queryFilter = Private(require('components/filter_bar/query_filter'));
-        queryFilter.getFilters = function () {
-          return appState.filters;
-        };
-      });
-    });
-
-    describe('Element rendering', function () {
-      beforeEach(function (done) {
-        var filters = [
-          { meta: { index: 'logstash-*' }, query: { match: { '_type': { query: 'apache' } } } },
-          { meta: { index: 'logstash-*' }, query: { match: { '_type': { query: 'nginx' } } } },
-          { meta: { index: 'logstash-*' }, exists: { field: '@timestamp' } },
-          { meta: { index: 'logstash-*' }, missing: { field: 'host' }, disabled: true },
-        ];
-
-        Promise.map(filters, mapFilter).then(function (filters) {
-          appState.filters = filters;
-          $el = $compile('<filter-bar></filter-bar>')($rootScope);
-        });
-
-        var off = $rootScope.$on('filterbar:updated', function () {
-          off();
-          // force a nextTick so it continues *after* the $digest loop completes
-          setTimeout(done, 0);
-        });
-
-        // kick off the digest loop
-        $rootScope.$digest();
-      });
-
-      it('should render all the filters in state', function () {
-        var filters = $el.find('.filter');
-        expect(filters).to.have.length(4);
-        expect($(filters[0]).find('span')[0].innerHTML).to.equal('_type:');
-        expect($(filters[0]).find('span')[1].innerHTML).to.equal('"apache"');
-        expect($(filters[1]).find('span')[0].innerHTML).to.equal('_type:');
-        expect($(filters[1]).find('span')[1].innerHTML).to.equal('"nginx"');
-        expect($(filters[2]).find('span')[0].innerHTML).to.equal('exists:');
-        expect($(filters[2]).find('span')[1].innerHTML).to.equal('"@timestamp"');
-        expect($(filters[3]).find('span')[0].innerHTML).to.equal('missing:');
-        expect($(filters[3]).find('span')[1].innerHTML).to.equal('"host"');
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/components/filter_bar/generateMappingChain.js b/test/unit/specs/components/filter_bar/generateMappingChain.js
deleted file mode 100644
index 1d2e4d12f39da..0000000000000
--- a/test/unit/specs/components/filter_bar/generateMappingChain.js
+++ /dev/null
@@ -1,111 +0,0 @@
-define(function (require) {
-  var generateMappingChain = require('components/filter_bar/lib/generateMappingChain');
-  var sinon = require('test_utils/auto_release_sinon');
-
-  describe('Filter Bar Directive', function () {
-    describe('generateMappingChain()', function () {
-
-      var generateMappingChain, $rootScope, Promise;
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private, _$rootScope_, _Promise_) {
-        $rootScope = _$rootScope_;
-        Promise    = _Promise_;
-        generateMappingChain = Private(require('components/filter_bar/lib/generateMappingChain'));
-      }));
-
-
-      it('should create a chaning function which calls the next function if the promise is rejected', function (done) {
-        var filter = {};
-        var mapping = sinon.stub();
-        mapping.returns(Promise.reject(filter));
-        var mappingChainFn = generateMappingChain(mapping);
-        var next = sinon.stub();
-        next.returns(Promise.resolve('good'));
-        var chain = mappingChainFn(next);
-        chain(filter).then(function (result) {
-          expect(result).to.be('good');
-          sinon.assert.calledOnce(next);
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-      it('should create a chaning function which DOES NOT call the next function if the result is resolved', function (done) {
-        var mapping = sinon.stub();
-        mapping.returns(Promise.resolve('good'));
-        var mappingChainFn = generateMappingChain(mapping);
-        var next = sinon.stub();
-        next.returns(Promise.resolve('bad'));
-        var chain = mappingChainFn(next);
-        chain({}).then(function (result) {
-          expect(result).to.be('good');
-          sinon.assert.notCalled(next);
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-      it('should resolve result for the mapping function', function (done) {
-        var mapping = sinon.stub();
-        mapping.returns(Promise.resolve({ key: 'test', value: 'example' }));
-        var mappingChainFn = generateMappingChain(mapping);
-        var next = sinon.stub();
-        var chain = mappingChainFn(next);
-        chain({}).then(function (result) {
-          sinon.assert.notCalled(next);
-          expect(result).to.eql({ key: 'test', value: 'example' });
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-      it('should call the mapping function with the argument to the chain', function (done) {
-        var mapping = sinon.stub();
-        mapping.returns(Promise.resolve({ key: 'test', value: 'example' }));
-        var mappingChainFn = generateMappingChain(mapping);
-        var next = sinon.stub();
-        var chain = mappingChainFn(next);
-        chain({ test: 'example' }).then(function (result) {
-          sinon.assert.calledOnce(mapping);
-          expect(mapping.args[0][0]).to.eql({ test: 'example' });
-          sinon.assert.notCalled(next);
-          expect(result).to.eql({ key: 'test', value: 'example' });
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-      it('should resolve result for the next function', function (done) {
-        var filter = {};
-        var mapping = sinon.stub();
-        mapping.returns(Promise.reject(filter));
-        var mappingChainFn = generateMappingChain(mapping);
-        var next = sinon.stub();
-        next.returns(Promise.resolve({ key: 'test', value: 'example' }));
-        var chain = mappingChainFn(next);
-        chain(filter).then(function (result) {
-          sinon.assert.calledOnce(mapping);
-          sinon.assert.calledOnce(next);
-          expect(result).to.eql({ key: 'test', value: 'example' });
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-      it('should reject with an error if no functions match', function (done) {
-        var filter = {};
-        var mapping = sinon.stub();
-        mapping.returns(Promise.reject(filter));
-        var mappingChainFn = generateMappingChain(mapping);
-        var chain = mappingChainFn();
-        chain(filter).catch(function (err) {
-          expect(err).to.be.an(Error);
-          expect(err.message).to.be('No mappings have been found for filter.');
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/filter_bar/mapAndFlattenFilters.js b/test/unit/specs/components/filter_bar/mapAndFlattenFilters.js
deleted file mode 100644
index eaa3f34f083e5..0000000000000
--- a/test/unit/specs/components/filter_bar/mapAndFlattenFilters.js
+++ /dev/null
@@ -1,56 +0,0 @@
-define(function (require) {
-  describe('Filter Bar Directive', function () {
-    describe('mapAndFlattenFilters()', function () {
-      var sinon = require('test_utils/auto_release_sinon');
-      var mapAndFlattenFilters, $rootScope;
-
-      beforeEach(module('kibana'));
-
-      beforeEach(function () {
-        module('kibana/courier', function ($provide) {
-          $provide.service('courier', require('fixtures/mock_courier'));
-        });
-      });
-
-      beforeEach(inject(function (Private, _$rootScope_) {
-        mapAndFlattenFilters = Private(require('components/filter_bar/lib/mapAndFlattenFilters'));
-        $rootScope = _$rootScope_;
-      }));
-
-      var filters = [
-        null,
-        [
-          { meta: { index: 'logstash-*' }, exists: { field: '_type' } },
-          { meta: { index: 'logstash-*' }, missing: { field: '_type' } }
-        ],
-        { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } },
-        { meta: { index: 'logstash-*' }, range: { bytes: { lt: 2048, gt: 1024 } } },
-        { meta: { index: 'logstash-*' }, query: { match: { _type: { query: 'apache', type: 'phrase' } } } }
-      ];
-
-      it('should map and flatten the filters', function (done) {
-        mapAndFlattenFilters(filters).then(function (results) {
-          expect(results).to.have.length(5);
-          expect(results[0]).to.have.property('meta');
-          expect(results[1]).to.have.property('meta');
-          expect(results[2]).to.have.property('meta');
-          expect(results[3]).to.have.property('meta');
-          expect(results[4]).to.have.property('meta');
-          expect(results[0].meta).to.have.property('key', 'exists');
-          expect(results[0].meta).to.have.property('value', '_type');
-          expect(results[1].meta).to.have.property('key', 'missing');
-          expect(results[1].meta).to.have.property('value', '_type');
-          expect(results[2].meta).to.have.property('key', 'query');
-          expect(results[2].meta).to.have.property('value', 'foo:bar');
-          expect(results[3].meta).to.have.property('key', 'bytes');
-          expect(results[3].meta).to.have.property('value', '1,024 to 2,048');
-          expect(results[4].meta).to.have.property('key', '_type');
-          expect(results[4].meta).to.have.property('value', 'apache');
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/filter_bar/mapDefault.js b/test/unit/specs/components/filter_bar/mapDefault.js
deleted file mode 100644
index 6c22051fe4599..0000000000000
--- a/test/unit/specs/components/filter_bar/mapDefault.js
+++ /dev/null
@@ -1,34 +0,0 @@
-define(function (require) {
-  describe('Filter Bar Directive', function () {
-    describe('mapDefault()', function () {
-
-      var mapDefault, $rootScope;
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private, _$rootScope_) {
-        $rootScope = _$rootScope_;
-        mapDefault = Private(require('components/filter_bar/lib/mapDefault'));
-      }));
-
-      it('should return the key and value for matching filters', function (done) {
-        var filter = { query: { match_all: {} } };
-        mapDefault(filter).then(function (result) {
-          expect(result).to.have.property('key', 'query');
-          expect(result).to.have.property('value', '{"match_all":{}}');
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-      it('should return undefined for none matching', function (done) {
-        var filter = { range: { gt: 0, lt: 1024 } };
-        mapDefault(filter).catch(function (result) {
-          expect(result).to.be(filter);
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/filter_bar/mapExists.js b/test/unit/specs/components/filter_bar/mapExists.js
deleted file mode 100644
index 4922dc13be5f2..0000000000000
--- a/test/unit/specs/components/filter_bar/mapExists.js
+++ /dev/null
@@ -1,33 +0,0 @@
-define(function (require) {
-  describe('Filter Bar Directive', function () {
-    describe('mapExists()', function () {
-
-      var mapExists, $rootScope;
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private, _$rootScope_) {
-        $rootScope = _$rootScope_;
-        mapExists = Private(require('components/filter_bar/lib/mapExists'));
-      }));
-
-      it('should return the key and value for matching filters', function (done) {
-        var filter = { exists: { field: '_type' } };
-        mapExists(filter).then(function (result) {
-          expect(result).to.have.property('key', 'exists');
-          expect(result).to.have.property('value', '_type');
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-      it('should return undefined for none matching', function (done) {
-        var filter = { query: { match: { query: 'foo' } } };
-        mapExists(filter).catch(function (result) {
-          expect(result).to.be(filter);
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/filter_bar/mapFilter.js b/test/unit/specs/components/filter_bar/mapFilter.js
deleted file mode 100644
index d3ec940dc0377..0000000000000
--- a/test/unit/specs/components/filter_bar/mapFilter.js
+++ /dev/null
@@ -1,85 +0,0 @@
-define(function (require) {
-  describe('Filter Bar Directive', function () {
-    var sinon = require('test_utils/auto_release_sinon');
-    var mapFilter, $rootScope;
-
-    beforeEach(module('kibana'));
-
-    beforeEach(function () {
-      module('kibana/courier', function ($provide) {
-        $provide.service('courier', require('fixtures/mock_courier'));
-      });
-    });
-
-    beforeEach(inject(function (_$rootScope_, Private) {
-      mapFilter = Private(require('components/filter_bar/lib/mapFilter'));
-      $rootScope = _$rootScope_;
-    }));
-
-    describe('mapFilter()', function () {
-      it('should map query filters', function (done) {
-        var before = { meta: { index: 'logstash-*' }, query: { match: { '_type': { query: 'apache' } } } };
-        mapFilter(before).then(function (after) {
-          expect(after).to.have.property('meta');
-          expect(after.meta).to.have.property('key', '_type');
-          expect(after.meta).to.have.property('value', 'apache');
-          expect(after.meta).to.have.property('disabled', false);
-          expect(after.meta).to.have.property('negate', false);
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-      it('should map exists filters', function (done) {
-        var before = { meta: { index: 'logstash-*' }, exists: { field: '@timestamp' } };
-        mapFilter(before).then(function (after) {
-          expect(after).to.have.property('meta');
-          expect(after.meta).to.have.property('key', 'exists');
-          expect(after.meta).to.have.property('value', '@timestamp');
-          expect(after.meta).to.have.property('disabled', false);
-          expect(after.meta).to.have.property('negate', false);
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-      it('should map missing filters', function (done) {
-        var before = { meta: { index: 'logstash-*' }, missing: { field: '@timestamp' } };
-        mapFilter(before).then(function (after) {
-          expect(after).to.have.property('meta');
-          expect(after.meta).to.have.property('key', 'missing');
-          expect(after.meta).to.have.property('value', '@timestamp');
-          expect(after.meta).to.have.property('disabled', false);
-          expect(after.meta).to.have.property('negate', false);
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-      it('should map json filter', function (done) {
-        var before = { meta: { index: 'logstash-*' }, query: { match_all: {} } };
-        mapFilter(before).then(function (after) {
-          expect(after).to.have.property('meta');
-          expect(after.meta).to.have.property('key', 'query');
-          expect(after.meta).to.have.property('value', '{"match_all":{}}');
-          expect(after.meta).to.have.property('disabled', false);
-          expect(after.meta).to.have.property('negate', false);
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-      it('should finish with a catch', function (done) {
-        var before = { meta: { index: 'logstash-*' }, foo: '' };
-        mapFilter(before).catch(function (error) {
-          expect(error).to.be.an(Error);
-          expect(error.message).to.be('No mappings have been found for filter.');
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-    });
-
-  });
-});
diff --git a/test/unit/specs/components/filter_bar/mapFlattenAndWrapFilters.js b/test/unit/specs/components/filter_bar/mapFlattenAndWrapFilters.js
deleted file mode 100644
index f9c2c009a5475..0000000000000
--- a/test/unit/specs/components/filter_bar/mapFlattenAndWrapFilters.js
+++ /dev/null
@@ -1,46 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  describe('Filter Bar Directive', function () {
-    describe('mapFlattenAndWrapFilters()', function () {
-      var sinon = require('test_utils/auto_release_sinon');
-      var mapFlattenAndWrapFilters, $rootScope;
-      beforeEach(module('kibana'));
-
-      beforeEach(function () {
-        module('kibana/courier', function ($provide) {
-          $provide.service('courier', require('fixtures/mock_courier'));
-        });
-      });
-
-      beforeEach(inject(function (Private, _$rootScope_) {
-        mapFlattenAndWrapFilters = Private(require('components/filter_bar/lib/mapFlattenAndWrapFilters'));
-        $rootScope = _$rootScope_;
-      }));
-
-      var filters = [
-        null,
-        [
-          { meta: { index: 'logstash-*' }, exists: { field: '_type' } },
-          { meta: { index: 'logstash-*' }, missing: { field: '_type' } }
-        ],
-        { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } },
-        { meta: { index: 'logstash-*' }, range: { bytes: { lt: 2048, gt: 1024 } } },
-        { meta: { index: 'logstash-*' }, query: { match: { _type: { query: 'apache', type: 'phrase' } } } }
-      ];
-
-      it('should map, flatten and wrap filters', function (done) {
-        mapFlattenAndWrapFilters(filters).then(function (results) {
-          expect(results).to.have.length(5);
-          _.each(results, function (filter) {
-            expect(filter).to.have.property('meta');
-            expect(filter.meta).to.have.property('apply', true);
-          });
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-    });
-  });
-});
-
diff --git a/test/unit/specs/components/filter_bar/mapGeoBoundingBox.js b/test/unit/specs/components/filter_bar/mapGeoBoundingBox.js
deleted file mode 100644
index 4dd826e939bc2..0000000000000
--- a/test/unit/specs/components/filter_bar/mapGeoBoundingBox.js
+++ /dev/null
@@ -1,58 +0,0 @@
-define(function (require) {
-  describe('Filter Bar Directive', function () {
-    describe('mapGeoBoundingBox()', function () {
-      var sinon = require('test_utils/auto_release_sinon');
-      var mapGeoBoundingBox, $rootScope;
-      beforeEach(module('kibana'));
-
-      beforeEach(function () {
-        module('kibana/courier', function ($provide) {
-          $provide.service('courier', require('fixtures/mock_courier'));
-        });
-      });
-
-      beforeEach(inject(function (Private, _$rootScope_) {
-        mapGeoBoundingBox = Private(require('components/filter_bar/lib/mapGeoBoundingBox'));
-        $rootScope = _$rootScope_;
-      }));
-
-      it('should return the key and value for matching filters with bounds', function (done) {
-        var filter = {
-          meta: {
-            index: 'logstash-*'
-          },
-          geo_bounding_box: {
-            point: { // field name
-              top_left: {
-                lat: 5,
-                lon: 10
-              },
-              bottom_right: {
-                lat: 15,
-                lon: 20
-              }
-            }
-          }
-        };
-        mapGeoBoundingBox(filter).then(function (result) {
-          expect(result).to.have.property('key', 'point');
-          expect(result).to.have.property('value');
-          // remove html entities and non-alphanumerics to get the gist of the value
-          expect(result.value.replace(/&[a-z]+?;/g, '').replace(/[^a-z0-9]/g, '')).to.be('lat5lon10tolat15lon20');
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-      it('should return undefined for none matching', function (done) {
-        var filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
-        mapGeoBoundingBox(filter).catch(function (result) {
-          expect(result).to.be(filter);
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/filter_bar/mapMissing.js b/test/unit/specs/components/filter_bar/mapMissing.js
deleted file mode 100644
index 276006905d0d0..0000000000000
--- a/test/unit/specs/components/filter_bar/mapMissing.js
+++ /dev/null
@@ -1,34 +0,0 @@
-define(function (require) {
-  var mapMissing = require('components/filter_bar/lib/mapMissing');
-  describe('Filter Bar Directive', function () {
-    describe('mapMissing()', function () {
-
-      var mapMissing, $rootScope;
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private, _$rootScope_) {
-        $rootScope = _$rootScope_;
-        mapMissing = Private(require('components/filter_bar/lib/mapMissing'));
-      }));
-
-      it('should return the key and value for matching filters', function (done) {
-        var filter = { missing: { field: '_type' } };
-        mapMissing(filter).then(function (result) {
-          expect(result).to.have.property('key', 'missing');
-          expect(result).to.have.property('value', '_type');
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-      it('should return undefined for none matching', function (done) {
-        var filter = { query: { match: { query: 'foo' } } };
-        mapMissing(filter).catch(function (result) {
-          expect(result).to.be(filter);
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/filter_bar/mapQueryString.js b/test/unit/specs/components/filter_bar/mapQueryString.js
deleted file mode 100644
index b30492070822f..0000000000000
--- a/test/unit/specs/components/filter_bar/mapQueryString.js
+++ /dev/null
@@ -1,33 +0,0 @@
-define(function (require) {
-  describe('Filter Bar Directive', function () {
-    describe('mapQueryString()', function () {
-
-      var mapQueryString, $rootScope;
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private, _$rootScope_) {
-        $rootScope = _$rootScope_;
-        mapQueryString = Private(require('components/filter_bar/lib/mapQueryString'));
-      }));
-
-      it('should return the key and value for matching filters', function (done) {
-        var filter = { query: { query_string: { query: 'foo:bar' } } };
-        mapQueryString(filter).then(function (result) {
-          expect(result).to.have.property('key', 'query');
-          expect(result).to.have.property('value', 'foo:bar');
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-      it('should return undefined for none matching', function (done) {
-        var filter = { query: { match: { query: 'foo' } } };
-        mapQueryString(filter).catch(function (result) {
-          expect(result).to.be(filter);
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/filter_bar/mapRange.js b/test/unit/specs/components/filter_bar/mapRange.js
deleted file mode 100644
index c365acfe0e7cb..0000000000000
--- a/test/unit/specs/components/filter_bar/mapRange.js
+++ /dev/null
@@ -1,50 +0,0 @@
-define(function (require) {
-  describe('Filter Bar Directive', function () {
-    describe('mapRange()', function () {
-      var sinon = require('test_utils/auto_release_sinon');
-      var mapRange, $rootScope;
-      beforeEach(module('kibana'));
-
-      beforeEach(function () {
-        module('kibana/courier', function ($provide) {
-          $provide.service('courier', require('fixtures/mock_courier'));
-        });
-      });
-
-      beforeEach(inject(function (Private, _$rootScope_) {
-        mapRange = Private(require('components/filter_bar/lib/mapRange'));
-        $rootScope = _$rootScope_;
-      }));
-
-      it('should return the key and value for matching filters with gt/lt', function (done) {
-        var filter = { meta: { index: 'logstash-*' }, range: { bytes: { lt: 2048, gt: 1024 } } };
-        mapRange(filter).then(function (result) {
-          expect(result).to.have.property('key', 'bytes');
-          expect(result).to.have.property('value', '1,024 to 2,048');
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-      it('should return the key and value for matching filters with gte/lte', function (done) {
-        var filter = { meta: { index: 'logstash-*' }, range: { bytes: { lte: 2048, gte: 1024 } } };
-        mapRange(filter).then(function (result) {
-          expect(result).to.have.property('key', 'bytes');
-          expect(result).to.have.property('value', '1,024 to 2,048');
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-      it('should return undefined for none matching', function (done) {
-        var filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
-        mapRange(filter).catch(function (result) {
-          expect(result).to.be(filter);
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/filter_bar/mapScript.js b/test/unit/specs/components/filter_bar/mapScript.js
deleted file mode 100644
index 540690ecb7fdf..0000000000000
--- a/test/unit/specs/components/filter_bar/mapScript.js
+++ /dev/null
@@ -1,43 +0,0 @@
-define(function (require) {
-  describe('Filter Bar Directive', function () {
-    describe('mapScript()', function () {
-      var sinon = require('test_utils/auto_release_sinon');
-      var mapScript, $rootScope;
-      beforeEach(module('kibana'));
-
-      beforeEach(function () {
-        module('kibana/courier', function ($provide) {
-          $provide.service('courier', require('fixtures/mock_courier'));
-        });
-      });
-
-      beforeEach(inject(function (Private, _$rootScope_) {
-        $rootScope = _$rootScope_;
-        mapScript = Private(require('components/filter_bar/lib/mapScript'));
-      }));
-
-      it('should return the key and value for matching filters', function (done) {
-        var filter = {
-          meta: { index: 'logstash-*', field: 'script number' },
-          script: { script: 'doc["script number"].value * 5', params: { value: 35}}
-        };
-        mapScript(filter).then(function (result) {
-          expect(result).to.have.property('key', 'script number');
-          expect(result).to.have.property('value', '35');
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-      it('should return undefined for none matching', function (done) {
-        var filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
-        mapScript(filter).catch(function (result) {
-          expect(result).to.be(filter);
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/filter_bar/mapTerms.js b/test/unit/specs/components/filter_bar/mapTerms.js
deleted file mode 100644
index 3ba97bdcd33ed..0000000000000
--- a/test/unit/specs/components/filter_bar/mapTerms.js
+++ /dev/null
@@ -1,40 +0,0 @@
-define(function (require) {
-  describe('Filter Bar Directive', function () {
-    describe('mapTerms()', function () {
-      var sinon = require('test_utils/auto_release_sinon');
-      var mapTerms, $rootScope;
-      beforeEach(module('kibana'));
-
-      beforeEach(function () {
-        module('kibana/courier', function ($provide) {
-          $provide.service('courier', require('fixtures/mock_courier'));
-        });
-      });
-
-      beforeEach(inject(function (Private, _$rootScope_) {
-        $rootScope = _$rootScope_;
-        mapTerms = Private(require('components/filter_bar/lib/mapTerms'));
-      }));
-
-      it('should return the key and value for matching filters', function (done) {
-        var filter = { meta: { index: 'logstash-*' }, query: { match: { _type: { query: 'apache', type: 'phrase' } } } };
-        mapTerms(filter).then(function (result) {
-          expect(result).to.have.property('key', '_type');
-          expect(result).to.have.property('value', 'apache');
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-      it('should return undefined for none matching', function (done) {
-        var filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
-        mapTerms(filter).catch(function (result) {
-          expect(result).to.be(filter);
-          done();
-        });
-        $rootScope.$apply();
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/filter_bar/onlyDisabled.js b/test/unit/specs/components/filter_bar/onlyDisabled.js
deleted file mode 100644
index 579d28e3be3b7..0000000000000
--- a/test/unit/specs/components/filter_bar/onlyDisabled.js
+++ /dev/null
@@ -1,111 +0,0 @@
-define(function (require) {
-  var onlyDisabled = require('components/filter_bar/lib/onlyDisabled');
-  describe('Filter Bar Directive', function () {
-    describe('onlyDisabled()', function () {
-
-      it('should return true if all filters are disabled', function () {
-        var filters = [
-          { meta: { disabled: true } },
-          { meta: { disabled: true } },
-          { meta: { disabled: true } }
-        ];
-        var newFilters = [{ meta: { disabled: true } }];
-        expect(onlyDisabled(newFilters, filters)).to.be(true);
-      });
-
-      it('should return false if all filters are not disabled', function () {
-        var filters = [
-          { meta: { disabled: false } },
-          { meta: { disabled: false } },
-          { meta: { disabled: false } }
-        ];
-        var newFilters = [{ meta: { disabled: false } }];
-        expect(onlyDisabled(newFilters, filters)).to.be(false);
-      });
-
-      it('should return false if only old filters are disabled', function () {
-        var filters = [
-          { meta: { disabled: true } },
-          { meta: { disabled: true } },
-          { meta: { disabled: true } }
-        ];
-        var newFilters = [{ meta: { disabled: false } }];
-        expect(onlyDisabled(newFilters, filters)).to.be(false);
-      });
-
-      it('should return false if new filters are not disabled', function () {
-        var filters = [
-          { meta: { disabled: false } },
-          { meta: { disabled: false } },
-          { meta: { disabled: false } }
-        ];
-        var newFilters = [{ meta: { disabled: true } }];
-        expect(onlyDisabled(newFilters, filters)).to.be(false);
-      });
-
-      it('should return true when all removed filters were disabled', function () {
-        var filters = [
-          { meta: { disabled: true } },
-          { meta: { disabled: true } },
-          { meta: { disabled: true } }
-        ];
-        var newFilters = [];
-        expect(onlyDisabled(newFilters, filters)).to.be(true);
-      });
-
-      it('should return false when all removed filters were not disabled', function () {
-        var filters = [
-          { meta: { disabled: false } },
-          { meta: { disabled: false } },
-          { meta: { disabled: false } }
-        ];
-        var newFilters = [];
-        expect(onlyDisabled(newFilters, filters)).to.be(false);
-      });
-
-      it('should return true if all changed filters are disabled', function () {
-        var filters = [
-          { meta: { disabled: true, negate: false } },
-          { meta: { disabled: true, negate: false } }
-        ];
-        var newFilters = [
-          { meta: { disabled: true, negate: true } },
-          { meta: { disabled: true, negate: true } }
-        ];
-        expect(onlyDisabled(newFilters, filters)).to.be(true);
-      });
-
-      it('should return false if all filters remove were not disabled', function () {
-        var filters = [
-          { meta: { disabled: false } },
-          { meta: { disabled: false } },
-          { meta: { disabled: true } }
-        ];
-        var newFilters = [{ meta: { disabled: false } }];
-        expect(onlyDisabled(newFilters, filters)).to.be(false);
-      });
-
-      it('should return false when all removed filters are not disabled', function () {
-        var filters = [
-          { meta: { disabled: true } },
-          { meta: { disabled: false } },
-          { meta: { disabled: true } }
-        ];
-        var newFilters = [];
-        expect(onlyDisabled(newFilters, filters)).to.be(false);
-      });
-
-      it('should not throw with null filters', function () {
-        var filters = [
-          null,
-          { meta: { disabled: true } }
-        ];
-        var newFilters = [];
-        expect(function () {
-          onlyDisabled(newFilters, filters);
-        }).to.not.throwError();
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/filter_bar/push_filter.js b/test/unit/specs/components/filter_bar/push_filter.js
deleted file mode 100644
index 4702ec59d626a..0000000000000
--- a/test/unit/specs/components/filter_bar/push_filter.js
+++ /dev/null
@@ -1,68 +0,0 @@
-define(function (require) {
-  describe('Filter Bar pushFilter()', function () {
-    var _ = require('lodash');
-
-    var pushFilterFn;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private, $injector) {
-      pushFilterFn = Private(require('components/filter_bar/push_filter'));
-    }));
-
-    it('is a function that returns a function', function () {
-      expect(pushFilterFn).to.be.a(Function);
-      expect(pushFilterFn({})).to.be.a(Function);
-    });
-
-    it('throws an error if passed something besides an object', function () {
-      expect(pushFilterFn).withArgs(true).to.throwError();
-    });
-
-    describe('pushFilter($state)()', function () {
-      var $state;
-      var pushFilter;
-      var filter;
-
-      beforeEach(inject(function (Private, $injector) {
-        $state = {filters:[]};
-        pushFilter = pushFilterFn($state);
-        filter = {query: {query_string: {query: ''}}};
-      }));
-
-      it('should create the filters property it needed', function () {
-        var altState = {};
-        pushFilterFn(altState)(filter);
-        expect(altState.filters).to.be.an(Array);
-      });
-
-      it('should replace the filters property instead of modifying it', function () {
-        // If we push directly instead of using pushFilter a $watch('filters') does not trigger
-
-        var oldFilters;
-
-        oldFilters = $state.filters;
-        $state.filters.push(filter);
-        expect($state.filters).to.equal(oldFilters); // Same object
-
-        oldFilters = $state.filters;
-        pushFilter(filter);
-        expect($state.filters).to.not.equal(oldFilters); // New object!
-      });
-
-      it('should add meta data to the filter', function () {
-        pushFilter(filter, true, 'myIndex');
-        expect($state.filters[0].meta).to.be.an(Object);
-
-        expect($state.filters[0].meta.negate).to.be(true);
-        expect($state.filters[0].meta.index).to.be('myIndex');
-
-        pushFilter(filter, false, 'myIndex');
-        expect($state.filters[1].meta.negate).to.be(false);
-      });
-
-
-
-    });
-
-  });
-});
diff --git a/test/unit/specs/components/filter_bar/query_filter.js b/test/unit/specs/components/filter_bar/query_filter.js
deleted file mode 100644
index 529121ce46b3f..0000000000000
--- a/test/unit/specs/components/filter_bar/query_filter.js
+++ /dev/null
@@ -1,55 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var queryFilter;
-  var EventEmitter;
-  var $rootScope;
-
-  describe('Query Filter', function () {
-    describe('Module', function () {
-      beforeEach(module('kibana'));
-
-      beforeEach(function () {
-        inject(function (_$rootScope_, Private) {
-          $rootScope = _$rootScope_;
-          queryFilter = Private(require('components/filter_bar/query_filter'));
-          EventEmitter = Private(require('factories/events'));
-        });
-      });
-
-      describe('module instance', function () {
-        it('should be an event emitter', function () {
-          expect(queryFilter).to.be.an(EventEmitter);
-        });
-      });
-
-      describe('module methods', function () {
-        it('should have methods for getting filters', function () {
-          expect(queryFilter.getFilters).to.be.a('function');
-          expect(queryFilter.getAppFilters).to.be.a('function');
-          expect(queryFilter.getGlobalFilters).to.be.a('function');
-        });
-
-        it('should have methods for modifying filters', function () {
-          expect(queryFilter.addFilters).to.be.a('function');
-          expect(queryFilter.toggleFilter).to.be.a('function');
-          expect(queryFilter.toggleAll).to.be.a('function');
-          expect(queryFilter.removeFilter).to.be.a('function');
-          expect(queryFilter.removeAll).to.be.a('function');
-          expect(queryFilter.invertFilter).to.be.a('function');
-          expect(queryFilter.invertAll).to.be.a('function');
-          expect(queryFilter.pinFilter).to.be.a('function');
-          expect(queryFilter.pinAll).to.be.a('function');
-        });
-      });
-    });
-
-    describe('Actions', function () {
-      describe(require('specs/components/filter_bar/_getFilters'));
-      describe(require('specs/components/filter_bar/_addFilters'));
-      describe(require('specs/components/filter_bar/_removeFilters'));
-      describe(require('specs/components/filter_bar/_toggleFilters'));
-      describe(require('specs/components/filter_bar/_invertFilters'));
-      describe(require('specs/components/filter_bar/_pinFilters'));
-    });
-  });
-});
diff --git a/test/unit/specs/components/filter_bar/uniqFilters.js b/test/unit/specs/components/filter_bar/uniqFilters.js
deleted file mode 100644
index 4b09f89151943..0000000000000
--- a/test/unit/specs/components/filter_bar/uniqFilters.js
+++ /dev/null
@@ -1,46 +0,0 @@
-define(function (require) {
-  var uniqFilters = require('components/filter_bar/lib/uniqFilters');
-  describe('Filter Bar Directive', function () {
-    describe('uniqFilter', function () {
-
-      it('should filter out dups', function () {
-        var before = [
-          { query: { _type: { match: { query: 'apache', type: 'phrase' } } } },
-          { query: { _type: { match: { query: 'apache', type: 'phrase' } } } }
-        ];
-        var results = uniqFilters(before);
-        expect(results).to.have.length(1);
-      });
-
-      it('should filter out duplicates, ignoring meta attributes', function () {
-        var before = [
-          {
-            meta: { negate: true },
-            query: { _type: { match: { query: 'apache', type: 'phrase' } } }
-          },
-          {
-            meta: { negate: false },
-            query: { _type: { match: { query: 'apache', type: 'phrase' } } }
-          }
-        ];
-        var results = uniqFilters(before);
-        expect(results).to.have.length(1);
-      });
-
-      it('should filter out duplicates, ignoring $state attributes', function () {
-        var before = [
-          {
-            $state: { store: 'appState' },
-            query: { _type: { match: { query: 'apache', type: 'phrase' } } }
-          },
-          {
-            $state: { store: 'globalState' },
-            query: { _type: { match: { query: 'apache', type: 'phrase' } } }
-          }
-        ];
-        var results = uniqFilters(before);
-        expect(results).to.have.length(1);
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/components/filter_manager/filter_manager.js b/test/unit/specs/components/filter_manager/filter_manager.js
deleted file mode 100644
index 41fa772602e61..0000000000000
--- a/test/unit/specs/components/filter_manager/filter_manager.js
+++ /dev/null
@@ -1,137 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var sinon = require('test_utils/auto_release_sinon');
-  var MockState = require('fixtures/mock_state');
-  var $rootScope;
-  var queryFilter;
-  var filterManager;
-  var appState;
-
-  function checkAddFilters(length, comps, idx) {
-    idx = idx || 0;
-    var filters = queryFilter.addFilters.getCall(idx).args[0];
-
-    expect(filters.length).to.be(length);
-    if (!_.isArray(comps)) return;
-    comps.forEach(function (comp, i) {
-      expect(filters[i]).to.eql(comp);
-    });
-  }
-
-  describe('Filter Manager', function () {
-    beforeEach(module('kibana'));
-
-    beforeEach(function () {
-      module('kibana/courier', function ($provide) {
-        $provide.service('courier', require('fixtures/mock_courier'));
-      });
-
-      module('kibana/global_state', function ($provide) {
-        $provide.service('getAppState', function () {
-          return function () {
-            return appState;
-          };
-        });
-      });
-    });
-
-    beforeEach(function () {
-      inject(function (_$rootScope_, Private) {
-        $rootScope = _$rootScope_;
-        filterManager = Private(require('components/filter_manager/filter_manager'));
-        appState = new MockState();
-        appState.filters = [];
-
-        // mock required queryFilter methods, used in the manager
-        queryFilter = Private(require('components/filter_bar/query_filter'));
-        sinon.stub(queryFilter, 'getAppFilters', function () {
-          return appState.filters;
-        });
-        sinon.stub(queryFilter, 'addFilters', function (filters) {
-          if (!_.isArray(filters)) filters = [filters];
-          appState.filters = appState.filters.concat(filters);
-        });
-        sinon.stub(queryFilter, 'invertFilter', function (filter) {
-          filter.meta.negate = !filter.meta.negate;
-        });
-      });
-    });
-
-    it('should have an `add` function', function () {
-      expect(filterManager.add).to.be.a(Function);
-    });
-
-    it('should add a filter', function () {
-      filterManager.add('myField', 1, '+', 'myIndex');
-      expect(queryFilter.addFilters.callCount).to.be(1);
-      checkAddFilters(1, [{
-        meta: { index: 'myIndex', negate: false },
-        query: { match: { myField: { query: 1, type: 'phrase'} } }
-      }]);
-    });
-
-    it('should add multiple filters if passed an array of values', function () {
-      filterManager.add('myField', [1, 2, 3], '+', 'myIndex');
-      expect(queryFilter.addFilters.callCount).to.be(1);
-      checkAddFilters(3, [{
-        meta: { index: 'myIndex', negate: false },
-        query: { match: { myField: { query: 1, type: 'phrase'} } }
-      }, {
-        meta: { index: 'myIndex', negate: false },
-        query: { match: { myField: { query: 2, type: 'phrase'} } }
-      }, {
-        meta: { index: 'myIndex', negate: false },
-        query: { match: { myField: { query: 3, type: 'phrase'} } }
-      }]);
-    });
-
-    it('should add an exists filter if _exists_ is used as the field', function () {
-      filterManager.add('_exists_', 'myField', '+', 'myIndex');
-      checkAddFilters(1, [{
-        meta: { index: 'myIndex', negate: false },
-        exists: { field: 'myField' }
-      }]);
-    });
-
-    it('should negate existing filter instead of added a conflicting filter', function () {
-      filterManager.add('myField', 1, '+', 'myIndex');
-      checkAddFilters(1, [{
-        meta: { index: 'myIndex', negate: false },
-        query: { match: { myField: { query: 1, type: 'phrase'} } }
-      }], 0);
-      expect(appState.filters).to.have.length(1);
-
-      // NOTE: negating exists filters also forces disabled to false
-      filterManager.add('myField', 1, '-', 'myIndex');
-      checkAddFilters(0, null, 1);
-      expect(appState.filters).to.have.length(1);
-
-      filterManager.add('_exists_', 'myField', '+', 'myIndex');
-      checkAddFilters(1, [{
-        meta: { index: 'myIndex', negate: false },
-        exists: { field: 'myField' }
-      }], 2);
-      expect(appState.filters).to.have.length(2);
-
-      filterManager.add('_exists_', 'myField', '-', 'myIndex');
-      checkAddFilters(0, null, 3);
-      expect(appState.filters).to.have.length(2);
-    });
-
-    it('should enable matching filters being changed', function () {
-      _.each([true, false], function (negate) {
-        appState.filters = [{
-          query: { match: { myField: { query: 1 } } },
-          meta: { disabled: true, negate: negate }
-        }];
-        expect(appState.filters.length).to.be(1);
-        expect(appState.filters[0].meta.disabled).to.be(true);
-
-        filterManager.add('myField', 1, '+', 'myIndex');
-        expect(appState.filters.length).to.be(1);
-        expect(appState.filters[0].meta.disabled).to.be(false);
-      });
-    });
-  });
-});
-
diff --git a/test/unit/specs/components/filter_manager/lib/phrase.js b/test/unit/specs/components/filter_manager/lib/phrase.js
deleted file mode 100644
index daf78c082b8d7..0000000000000
--- a/test/unit/specs/components/filter_manager/lib/phrase.js
+++ /dev/null
@@ -1,43 +0,0 @@
-define(function (require) {
-  var fn = require('components/filter_manager/lib/phrase');
-  var _ = require('lodash');
-  var indexPattern, expected;
-  describe('Filter Manager', function () {
-    describe('Phrase filter builder', function () {
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private, _$rootScope_, Promise) {
-        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-        expected = _.cloneDeep(require('fixtures/filter_skeleton'));
-      }));
-
-      it('should be a function', function () {
-        expect(fn).to.be.a(Function);
-      });
-
-      it('should return a match query filter when passed a standard field', function () {
-        expected.query = {
-          match: {
-            bytes: {
-              query: 5,
-              type: 'phrase'
-            }
-          }
-        };
-        expect(fn(indexPattern.fields.byName.bytes, 5, indexPattern)).to.eql(expected);
-      });
-
-      it('should return a script filter when passed a scripted field', function () {
-        expected.meta.field = 'script number';
-        expected.script = {
-          script: '(' + indexPattern.fields.byName['script number'].script + ') == value',
-          lang: 'expression',
-          params: {
-            value: 5,
-          }
-        };
-        expect(fn(indexPattern.fields.byName['script number'], 5, indexPattern)).to.eql(expected);
-      });
-    });
-  });
-});
-
diff --git a/test/unit/specs/components/filter_manager/lib/query.js b/test/unit/specs/components/filter_manager/lib/query.js
deleted file mode 100644
index d098ff3de7127..0000000000000
--- a/test/unit/specs/components/filter_manager/lib/query.js
+++ /dev/null
@@ -1,27 +0,0 @@
-define(function (require) {
-  var fn = require('components/filter_manager/lib/query');
-  var _ = require('lodash');
-  var indexPattern, expected;
-  describe('Filter Manager', function () {
-    describe('Phrase filter builder', function () {
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private, _$rootScope_, Promise) {
-        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-        expected = _.cloneDeep(require('fixtures/filter_skeleton'));
-      }));
-
-      it('should be a function', function () {
-        expect(fn).to.be.a(Function);
-      });
-
-      it('should return a query filter when passed a standard field', function () {
-        expected.query = {
-          foo: 'bar'
-        };
-        expect(fn({foo: 'bar'}, indexPattern.id)).to.eql(expected);
-      });
-
-    });
-  });
-});
-
diff --git a/test/unit/specs/components/filter_manager/lib/range.js b/test/unit/specs/components/filter_manager/lib/range.js
deleted file mode 100644
index 717de4de2d1be..0000000000000
--- a/test/unit/specs/components/filter_manager/lib/range.js
+++ /dev/null
@@ -1,66 +0,0 @@
-define(function (require) {
-  var fn = require('components/filter_manager/lib/range');
-  var _ = require('lodash');
-  var indexPattern, expected;
-  describe('Filter Manager', function () {
-    describe('Range filter builder', function () {
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private, _$rootScope_, Promise) {
-        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-        expected = _.cloneDeep(require('fixtures/filter_skeleton'));
-      }));
-
-      it('should be a function', function () {
-        expect(fn).to.be.a(Function);
-      });
-
-      it('should return a range filter when passed a standard field', function () {
-        expected.range = {
-          bytes: {
-            gte: 1,
-            lte: 3
-          }
-        };
-        expect(fn(indexPattern.fields.byName.bytes, {gte: 1, lte: 3}, indexPattern)).to.eql(expected);
-      });
-
-      it('should return a script filter when passed a scripted field', function () {
-        expected.meta.field = 'script number';
-        expected.script = {
-          lang: 'expression',
-          script: '(' + indexPattern.fields.byName['script number'].script + ')>=gte && (' +
-            indexPattern.fields.byName['script number'].script + ')<=lte',
-          params: {
-            value: '>=1 <=3',
-            gte: 1,
-            lte: 3
-          }
-        };
-        expect(fn(indexPattern.fields.byName['script number'], {gte: 1, lte: 3}, indexPattern)).to.eql(expected);
-      });
-
-      it('should throw an error when gte and gt, or lte and lt are both passed', function () {
-        expect(function () {
-          fn(indexPattern.fields.byName['script number'], {gte: 1, gt: 3}, indexPattern);
-        }).to.throwError();
-        expect(function () {
-          fn(indexPattern.fields.byName['script number'], {lte: 1, lt: 3}, indexPattern);
-        }).to.throwError();
-      });
-
-      it('to use the right operator for each of gte, gt, lt and lte', function () {
-        _.each({gte: '>=', gt: '>', lte: '<=', lt: '<'}, function (operator, key) {
-          var params = {};
-          params[key] = 5;
-          var filter = fn(indexPattern.fields.byName['script number'], params, indexPattern);
-
-          expect(filter.script.script).to.be('(' + indexPattern.fields.byName['script number'].script + ')' + operator + key);
-          expect(filter.script.params[key]).to.be(5);
-          expect(filter.script.params.value).to.be(operator + 5);
-
-        });
-      });
-    });
-  });
-});
-
diff --git a/test/unit/specs/components/highlight/highlight.js b/test/unit/specs/components/highlight/highlight.js
deleted file mode 100644
index ac8dbc6132873..0000000000000
--- a/test/unit/specs/components/highlight/highlight.js
+++ /dev/null
@@ -1,70 +0,0 @@
-define(function (require) {
-  describe('Highlight', function () {
-    var angular = require('angular');
-    require('components/highlight/highlight');
-
-    var filter, tags;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (highlightFilter, highlightTags) {
-      filter = highlightFilter;
-      tags = highlightTags;
-    }));
-
-    var text = '' +
-      'Bacon ipsum dolor amet pork loin pork cow pig beef chuck ground round shankle sirloin landjaeger kevin ' +
-      'venison sausage ribeye tongue. Chicken bacon ball tip pork. Brisket pork capicola spare ribs pastrami rump ' +
-      'sirloin, t-bone ham shoulder jerky turducken bresaola. Chicken cow beef picanha. Picanha hamburger alcatra ' +
-      'cupim. Salami capicola boudin pork belly shank picanha.';
-
-    it('should not modify text if highlight is empty', function () {
-      expect(filter(text, undefined)).to.be(text);
-      expect(filter(text, null)).to.be(text);
-      expect(filter(text, [])).to.be(text);
-    });
-
-    it('should highlight a single result', function () {
-      var highlights = [
-        tags.pre + 'hamburger' + tags.post + ' alcatra cupim. Salami capicola boudin pork belly shank picanha.'
-      ];
-      var result = filter(text, highlights);
-      expect(result.indexOf('<mark>hamburger</mark>')).to.be.greaterThan(-1);
-      expect(result.split('<mark>hamburger</mark>').length).to.be(text.split('hamburger').length);
-    });
-
-    it('should highlight multiple results', function () {
-      var highlights = [
-        'kevin venison sausage ribeye tongue. ' + tags.pre + 'Chicken' + tags.post + ' bacon ball tip pork. Brisket ' +
-        'pork capicola spare ribs pastrami rump sirloin, t-bone ham shoulder jerky turducken bresaola. ' + tags.pre +
-        'Chicken' + tags.post + ' cow beef picanha. Picanha'
-      ];
-      var result = filter(text, highlights);
-      expect(result.indexOf('<mark>Chicken</mark>')).to.be.greaterThan(-1);
-      expect(result.split('<mark>Chicken</mark>').length).to.be(text.split('Chicken').length);
-    });
-
-    it('should highlight multiple hits in a result', function () {
-      var highlights = [
-        'Bacon ipsum dolor amet ' + tags.pre + 'pork' + tags.post + ' loin ' +
-          '' + tags.pre + 'pork' + tags.post + ' cow pig beef chuck ground round shankle ' +
-          'sirloin landjaeger',
-        'kevin venison sausage ribeye tongue. Chicken bacon ball tip ' +
-          '' + tags.pre + 'pork' + tags.post + '. Brisket ' +
-          '' + tags.pre + 'pork' + tags.post + ' capicola spare ribs',
-        'hamburger alcatra cupim. Salami capicola boudin ' + tags.pre + 'pork' + tags.post + ' ' +
-          'belly shank picanha.'
-      ];
-      var result = filter(text, highlights);
-      expect(result.indexOf('<mark>pork</mark>')).to.be.greaterThan(-1);
-      expect(result.split('<mark>pork</mark>').length).to.be(text.split('pork').length);
-    });
-
-    it('should accept an object and return a string containing its properties', function () {
-      var obj = {foo: 1, bar: 2};
-      var result = filter(obj, null);
-      expect(result.indexOf('' + obj)).to.be(-1);
-      expect(result.indexOf('foo')).to.be.greaterThan(-1);
-      expect(result.indexOf('bar')).to.be.greaterThan(-1);
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/index_pattern/_FieldFormat.js b/test/unit/specs/components/index_pattern/_FieldFormat.js
deleted file mode 100644
index dd30e996f7660..0000000000000
--- a/test/unit/specs/components/index_pattern/_FieldFormat.js
+++ /dev/null
@@ -1,152 +0,0 @@
-define(function (require) {
-  return ['FieldFormat class', function () {
-    var _ = require('lodash');
-
-    var FieldFormat;
-    var TestFormat;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      FieldFormat = Private(require('components/index_patterns/_field_format/FieldFormat'));
-
-      TestFormat = function (params) {
-        TestFormat.Super.call(this, params);
-      };
-
-      TestFormat.id = 'test-format';
-      TestFormat.title = 'Test Format';
-      TestFormat.prototype._convert = _.asPrettyString;
-
-      _.class(TestFormat).inherits(FieldFormat);
-    }));
-
-    describe('params', function () {
-      it('accepts its params via the constructor', function () {
-        var f = new TestFormat({ foo: 'bar' });
-        expect(f.param('foo')).to.be('bar');
-      });
-
-      it('allows reading a clone of the params', function () {
-        var params = { foo: 'bar' };
-        var f = new TestFormat(params);
-        var output = f.params();
-        expect(output).to.eql(params);
-        expect(output).to.not.be(params);
-      });
-    });
-
-    describe('type', function () {
-      it('links the constructor class to instances as the `type`', function () {
-        var f = new TestFormat();
-        expect(f.type).to.be(TestFormat);
-      });
-    });
-
-    describe('toJSON', function () {
-      it('serializes to a version a basic id and param pair', function () {
-        var f = new TestFormat({ foo: 'bar' });
-        var ser = JSON.parse(JSON.stringify(f));
-        expect(ser).to.eql({ id: 'test-format', params: { foo: 'bar' } });
-      });
-
-      it('removes param values that match the defaults', function () {
-        TestFormat.paramDefaults = { foo: 'bar' };
-
-        var f = new TestFormat({ foo: 'bar', baz: 'bar' });
-        var ser = JSON.parse(JSON.stringify(f));
-        expect(ser.params).to.eql({ baz: 'bar' });
-      });
-
-      it('removes the params entirely if they are empty', function () {
-        var f = new TestFormat();
-        var ser = JSON.parse(JSON.stringify(f));
-        expect(ser).to.not.have.property('params');
-      });
-    });
-
-    describe('converters', function () {
-      describe('#getConverterFor', function () {
-        it('returns a converter for a specific content type', function () {
-          var f = new TestFormat();
-          expect(f.getConverterFor('html')()).to.be.a('string');
-          expect(f.getConverterFor('text')()).to.be.a('string');
-        });
-      });
-
-      describe('#_convert, the instance method or methods used to format values', function () {
-        it('can be a function, which gets converted to a text and html converter', function () {
-          TestFormat.prototype._convert = function () {
-            return 'formatted';
-          };
-
-          var f = new TestFormat();
-          var text = f.getConverterFor('text');
-          var html = f.getConverterFor('html');
-          expect(text).to.not.be(html);
-          expect(text()).to.be('formatted');
-          expect(html()).to.be('formatted');
-        });
-
-        it('can be an object, with seperate text and html converter', function () {
-          TestFormat.prototype._convert = {
-            text: _.constant('formatted text'),
-            html: _.constant('formatted html'),
-          };
-
-          var f = new TestFormat();
-          var text = f.getConverterFor('text');
-          var html = f.getConverterFor('html');
-          expect(text).to.not.be(html);
-          expect(text()).to.be('formatted text');
-          expect(html()).to.be('formatted html');
-        });
-
-        it('does not escape the output of the text converter', function () {
-          TestFormat.prototype._convert = _.constant('<script>alert("xxs");</script>');
-          var f = new TestFormat();
-          expect(f.convert('', 'text')).to.contain('<');
-        });
-
-        it('does escape the output of the text converter if used in an html context', function () {
-          TestFormat.prototype._convert = _.constant('<script>alert("xxs");</script>');
-          var f = new TestFormat();
-          expect(f.convert('', 'html')).to.not.contain('<');
-        });
-
-        it('does not escape the output of an html specific converter', function () {
-          TestFormat.prototype._convert = {
-            text: _.constant('<img>'),
-            html: _.constant('<img>'),
-          };
-
-          var f = new TestFormat();
-          expect(f.convert('', 'text')).to.be('<img>');
-          expect(f.convert('', 'html')).to.be('<img>');
-        });
-      });
-
-      describe('#convert', function () {
-        it('formats a value, defaulting to text content type', function () {
-          TestFormat.prototype._convert = {
-            text: _.constant('text'),
-            html: _.constant('html'),
-          };
-
-          var f = new TestFormat();
-          expect(f.convert('val')).to.be('text');
-        });
-
-        it('formats a value as html, when specified via second param', function () {
-          TestFormat.prototype._convert = {
-            text: _.constant('text'),
-            html: _.constant('html'),
-          };
-
-          var f = new TestFormat();
-          expect(f.convert('val', 'html')).to.be('html');
-        });
-      });
-
-    });
-  }];
-});
diff --git a/test/unit/specs/components/index_pattern/_cast_mapping_type.js b/test/unit/specs/components/index_pattern/_cast_mapping_type.js
deleted file mode 100644
index 5f8c3d43e9b0e..0000000000000
--- a/test/unit/specs/components/index_pattern/_cast_mapping_type.js
+++ /dev/null
@@ -1,58 +0,0 @@
-define(function (require) {
-  return ['type normalizer (castMappingType)', function () {
-    var _ = require('lodash');
-
-    var fn;
-    var fields;
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private, $injector) {
-      fn = Private(require('components/index_patterns/_cast_mapping_type'));
-    }));
-
-    it('should be a function', function () {
-      expect(fn).to.be.a(Function);
-    });
-
-    it('should have a types property', function () {
-      expect(fn).to.have.property('types');
-    });
-
-    it('should cast numeric types to "number"', function () {
-      var types = [
-        'float',
-        'double',
-        'integer',
-        'long',
-        'short',
-        'byte',
-        'token_count'
-      ];
-
-      _.each(types, function (type) {
-        expect(fn(type)).to.be('number');
-      });
-    });
-
-    it('should treat non-numeric known types as what they are', function () {
-      var types = [
-        'date',
-        'boolean',
-        'ip',
-        'attachment',
-        'geo_point',
-        'geo_shape',
-        'murmur3',
-        'string'
-      ];
-
-      _.each(types, function (type) {
-        expect(fn(type)).to.be(type);
-      });
-    });
-
-    it('should treat everything else as a string', function () {
-      expect(fn('fooTypeIsNotReal')).to.be('string');
-    });
-
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/index_pattern/_get_computed_fields.js b/test/unit/specs/components/index_pattern/_get_computed_fields.js
deleted file mode 100644
index b9deeaa40d966..0000000000000
--- a/test/unit/specs/components/index_pattern/_get_computed_fields.js
+++ /dev/null
@@ -1,34 +0,0 @@
-define(function (require) {
-  return ['get computed fields', function () {
-    var _ = require('lodash');
-
-    var indexPattern, getComputedFields, fn;
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private, $injector) {
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-      getComputedFields = require('components/index_patterns/_get_computed_fields');
-      indexPattern.getComputedFields = getComputedFields.bind(indexPattern);
-      fn = indexPattern.getComputedFields;
-
-    }));
-
-    it('should be a function', function () {
-      expect(fn).to.be.a(Function);
-    });
-
-    it('should request all stored fields', function () {
-      expect(fn().fields).to.contain('*');
-    });
-
-    it('should request _source seperately', function () {
-      expect(fn().fields).to.contain('_source');
-    });
-
-    it('should request date fields as fielddata_fields', function () {
-      expect(fn().fielddataFields).to.contain('@timestamp');
-      expect(fn().fielddataFields).to.not.include.keys('bytes');
-    });
-
-
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/index_pattern/_index_pattern.js b/test/unit/specs/components/index_pattern/_index_pattern.js
deleted file mode 100644
index cf37e9f04b0e0..0000000000000
--- a/test/unit/specs/components/index_pattern/_index_pattern.js
+++ /dev/null
@@ -1,276 +0,0 @@
-define(function (require) {
-  return ['index pattern', function () {
-    var _ = require('lodash');
-    var sinon = require('test_utils/auto_release_sinon');
-    var Promise = require('bluebird');
-    var errors = require('errors');
-    var IndexedArray = require('utils/indexed_array/index');
-    var IndexPattern;
-    var mapper;
-    var mappingSetup;
-    var mockLogstashFields;
-    var DocSource;
-    var config;
-    var docSourceResponse;
-    var indexPatternId = 'test-pattern';
-    var indexPattern;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private, $injector, _config_) {
-      config = _config_;
-      mockLogstashFields = Private(require('fixtures/logstash_fields'));
-      docSourceResponse = Private(require('fixtures/stubbed_doc_source_response'));
-
-      DocSource = Private(require('components/courier/data_source/doc_source'));
-      sinon.stub(DocSource.prototype, 'doIndex');
-      sinon.stub(DocSource.prototype, 'fetch');
-
-      // stub mapper
-      mapper = Private(require('components/index_patterns/_mapper'));
-      sinon.stub(mapper, 'getFieldsForIndexPattern', function () {
-        return Promise.resolve(_.filter(mockLogstashFields, { scripted: false }));
-      });
-
-      // stub mappingSetup
-      mappingSetup = Private(require('utils/mapping_setup'));
-      sinon.stub(mappingSetup, 'isDefined', function () {
-        return Promise.resolve(true);
-      });
-
-      IndexPattern = Private(require('components/index_patterns/_index_pattern'));
-    }));
-
-    // create an indexPattern instance for each test
-    beforeEach(function () {
-      return create(indexPatternId).then(function (pattern) {
-        indexPattern = pattern;
-      });
-    });
-
-    // helper function to create index patterns
-    function create(id, payload) {
-      var indexPattern = new IndexPattern(id);
-      DocSource.prototype.doIndex.returns(Promise.resolve(id));
-      payload = _.defaults(payload || {}, docSourceResponse(id));
-      setDocsourcePayload(payload);
-      return indexPattern.init();
-    }
-
-    function setDocsourcePayload(payload) {
-      DocSource.prototype.fetch.returns(Promise.resolve(payload));
-    }
-
-    describe('api', function () {
-      it('should have expected properties', function () {
-        return create('test-pattern').then(function (indexPattern) {
-          // methods
-          expect(indexPattern).to.have.property('refreshFields');
-          expect(indexPattern).to.have.property('popularizeField');
-          expect(indexPattern).to.have.property('getScriptedFields');
-          expect(indexPattern).to.have.property('getNonScriptedFields');
-          expect(indexPattern).to.have.property('getInterval');
-          expect(indexPattern).to.have.property('addScriptedField');
-          expect(indexPattern).to.have.property('removeScriptedField');
-          expect(indexPattern).to.have.property('toString');
-          expect(indexPattern).to.have.property('toJSON');
-          expect(indexPattern).to.have.property('save');
-
-          // properties
-          expect(indexPattern).to.have.property('fields');
-        });
-      });
-    });
-
-    describe('init', function () {
-      it('should append the found fields', function () {
-        expect(DocSource.prototype.fetch.callCount).to.be(1);
-        expect(indexPattern.fields).to.have.length(mockLogstashFields.length);
-        expect(indexPattern.fields).to.be.an(IndexedArray);
-      });
-    });
-
-    describe('fields', function () {
-      it('should have expected properties on fields', function () {
-        expect(indexPattern.fields[0]).to.have.property('bucketable');
-        expect(indexPattern.fields[0]).to.have.property('displayName');
-        expect(indexPattern.fields[0]).to.have.property('filterable');
-        expect(indexPattern.fields[0]).to.have.property('format');
-        expect(indexPattern.fields[0]).to.have.property('sortable');
-        expect(indexPattern.fields[0]).to.have.property('scripted');
-      });
-    });
-
-    describe('getScriptedFields', function () {
-      it('should return all scripted fields', function () {
-        var scriptedNames = _(mockLogstashFields).where({ scripted: true }).pluck('name').value();
-        var respNames = _.pluck(indexPattern.getScriptedFields(), 'name');
-        expect(respNames).to.eql(scriptedNames);
-      });
-    });
-
-    describe('getNonScriptedFields', function () {
-      it('should return all non-scripted fields', function () {
-        var notScriptedNames = _(mockLogstashFields).where({ scripted: false }).pluck('name').value();
-        var respNames = _.pluck(indexPattern.getNonScriptedFields(), 'name');
-        expect(respNames).to.eql(notScriptedNames);
-      });
-
-    });
-
-    describe('refresh fields', function () {
-      // override the default indexPattern, with a truncated field list
-      require('test_utils/no_digest_promises').activateForSuite();
-      var indexPatternId = 'test-pattern';
-      var indexPattern;
-      var fieldLength;
-      var truncatedFields;
-
-      beforeEach(function () {
-        fieldLength = mockLogstashFields.length;
-        truncatedFields = mockLogstashFields.slice(3);
-        return create(indexPatternId, {
-          _source: {
-            customFormats: '{}',
-            fields: JSON.stringify(truncatedFields)
-          }
-        }).then(function (pattern) {
-          indexPattern = pattern;
-        });
-      });
-
-      it('should fetch fields from the doc source', function () {
-        // ensure that we don't have all the fields
-        expect(truncatedFields.length).to.not.equal(mockLogstashFields.length);
-        expect(indexPattern.fields).to.have.length(truncatedFields.length);
-
-        // ensure that all fields will be included in the returned docSource
-        setDocsourcePayload(docSourceResponse(indexPatternId));
-
-        return Promise.all([
-          // read fields from elasticsearch
-          mapper.getFieldsForIndexPattern(),
-
-          // tell the index pattern to do the same
-          indexPattern.refreshFields(),
-        ])
-        .then(function (data) {
-          var expected = data[0]; // just the fields in the index
-          var fields = indexPattern.getNonScriptedFields(); // get all but scripted fields
-
-          expect(_.pluck(fields, 'name')).to.eql(_.pluck(expected, 'name'));
-        });
-      });
-
-      it('should preserve the scripted fields', function () {
-        // ensure that all fields will be included in the returned docSource
-        setDocsourcePayload(docSourceResponse(indexPatternId));
-
-        // add spy to indexPattern.getScriptedFields
-        var scriptedFieldsSpy = sinon.spy(indexPattern, 'getScriptedFields');
-
-        // refresh fields, which will fetch
-        return indexPattern.refreshFields().then(function () {
-          // called to append scripted fields to the response from mapper.getFieldsForIndexPattern
-          expect(scriptedFieldsSpy.callCount).to.equal(1);
-
-          var scripted = _.where(mockLogstashFields, { scripted: true });
-          var expected = _.filter(indexPattern.fields, { scripted: true });
-          expect(_.pluck(expected, 'name')).to.eql(_.pluck(scripted, 'name'));
-        });
-      });
-    });
-
-    describe('add and remove scripted fields', function () {
-      it('should append the scripted field', function () {
-        // keep a copy of the current scripted field count
-        var saveSpy = sinon.spy(indexPattern, 'save');
-        var oldCount = indexPattern.getScriptedFields().length;
-
-        // add a new scripted field
-        var scriptedField = {
-          name: 'new scripted field',
-          script: 'false',
-          type: 'boolean'
-        };
-        indexPattern.addScriptedField(scriptedField.name, scriptedField.script, scriptedField.type);
-        indexPattern._indexFields(); // normally triggered by docSource.onUpdate()
-
-        var scriptedFields = indexPattern.getScriptedFields();
-        expect(saveSpy.callCount).to.equal(1);
-        expect(scriptedFields).to.have.length(oldCount + 1);
-        expect(indexPattern.fields.byName[scriptedField.name].displayName).to.equal(scriptedField.name);
-      });
-
-      it('should remove scripted field, by name', function () {
-        var saveSpy = sinon.spy(indexPattern, 'save');
-        var scriptedFields = indexPattern.getScriptedFields();
-        var oldCount = scriptedFields.length;
-        var scriptedField = _.last(scriptedFields);
-
-        indexPattern.removeScriptedField(scriptedField.name);
-
-        expect(saveSpy.callCount).to.equal(1);
-        expect(indexPattern.getScriptedFields().length).to.equal(oldCount - 1);
-        expect(indexPattern.fields.byName[scriptedField.name]).to.equal(undefined);
-      });
-
-      it('should not allow duplicate names', function () {
-        var scriptedFields = indexPattern.getScriptedFields();
-        var scriptedField = _.last(scriptedFields);
-        expect(function () {
-          indexPattern.addScriptedField(scriptedField.name, '\'new script\'', 'string');
-        }).to.throwError(function (e) {
-          expect(e).to.be.a(errors.DuplicateField);
-        });
-      });
-    });
-
-    describe('popularizeField', function () {
-      it('should increment the poplarity count by default', function () {
-        var saveSpy = sinon.stub(indexPattern, 'save');
-        indexPattern.fields.forEach(function (field, i) {
-          var oldCount = field.count;
-
-          indexPattern.popularizeField(field.name);
-
-          expect(saveSpy.callCount).to.equal(i + 1);
-          expect(field.count).to.equal(oldCount + 1);
-        });
-      });
-
-      it('should increment the poplarity count', function () {
-        var saveSpy = sinon.stub(indexPattern, 'save');
-        indexPattern.fields.forEach(function (field, i) {
-          var oldCount = field.count;
-          var incrementAmount = 4;
-
-          indexPattern.popularizeField(field.name, incrementAmount);
-
-          expect(saveSpy.callCount).to.equal(i + 1);
-          expect(field.count).to.equal(oldCount + incrementAmount);
-        });
-      });
-
-      it('should decrement the poplarity count', function () {
-        indexPattern.fields.forEach(function (field, i) {
-          var oldCount = field.count;
-          var incrementAmount = 4;
-          var decrementAmount = -2;
-
-          indexPattern.popularizeField(field.name, incrementAmount);
-          indexPattern.popularizeField(field.name, decrementAmount);
-
-          expect(field.count).to.equal(oldCount + incrementAmount + decrementAmount);
-        });
-      });
-
-      it('should not go below 0', function () {
-        indexPattern.fields.forEach(function (field) {
-          var decrementAmount = -Number.MAX_VALUE;
-          indexPattern.popularizeField(field.name, decrementAmount);
-          expect(field.count).to.equal(0);
-        });
-      });
-    });
-  }];
-});
diff --git a/test/unit/specs/components/index_pattern/_map_field.js b/test/unit/specs/components/index_pattern/_map_field.js
deleted file mode 100644
index 1c989dabcc48d..0000000000000
--- a/test/unit/specs/components/index_pattern/_map_field.js
+++ /dev/null
@@ -1,57 +0,0 @@
-define(function (require) {
-  return ['field mapping normalizer (mapField)', function () {
-    var _ = require('lodash');
-
-    var fn;
-    var fields;
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private, $injector, config) {
-      config.set('metaFields', ['_id', '_timestamp']);
-      fn = Private(require('components/index_patterns/_map_field'));
-      fields = require('fixtures/field_mapping').test.mappings.testType;
-    }));
-
-    it('should be a function', function () {
-      expect(fn).to.be.a(Function);
-    });
-
-    it('should return a modified copy of the object, not modify the original', function () {
-      var pristine = _.cloneDeep(fields['foo.bar']);
-      var mapped = fn(fields['foo.bar'], 'foo.bar');
-
-      expect(fields['foo.bar']).to.not.eql(mapped);
-      expect(fields['foo.bar']).to.eql(pristine);
-    });
-
-    it('should not consider _id indexed unless it is', function () {
-      var mapped = fn(fields._id, '_id');
-      expect(mapped.indexed).to.be(false);
-
-      var mapping = _.cloneDeep(fields._id);
-      mapping.mapping._id.index = 'not_analyzed';
-      var mapped2 = fn(mapping, '_id');
-      expect(mapped2.indexed).to.be(true);
-    });
-
-    it('should always consider _timestamp to be an indexed date', function () {
-      var mapped = fn(fields._timestamp, '_timestamp');
-      expect(mapped.indexed).to.be(true);
-      expect(mapped.type).to.be('date');
-    });
-
-    it('should treat falsy and no as false for index', function () {
-      var mapped = fn(fields.index_no_field, 'index_no_field');
-      expect(mapped.indexed).to.be(false);
-
-      fields.index_no_field.index = false;
-      mapped = fn(fields.index_no_field, 'index_no_field');
-      expect(mapped.indexed).to.be(false);
-    });
-
-    it('should treat other values for index as true', function () {
-      var mapped = fn(fields.not_analyzed_field, 'not_analyzed_field');
-      expect(mapped.indexed).to.be(true);
-    });
-
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/index_pattern/_pattern_to_wildcard.js b/test/unit/specs/components/index_pattern/_pattern_to_wildcard.js
deleted file mode 100644
index 8dc5f7d758e08..0000000000000
--- a/test/unit/specs/components/index_pattern/_pattern_to_wildcard.js
+++ /dev/null
@@ -1,37 +0,0 @@
-define(function (require) {
-  return ['Index pattern to wildcard', function () {
-
-    var fn = require('components/index_patterns/_pattern_to_wildcard')();
-
-
-    it('should be a function', function () {
-      expect(fn).to.be.a(Function);
-    });
-
-    it('should parse patterns with a single escaped sequence', function () {
-      expect(fn('[foo-]YYYY')).to.equal('foo-*');
-    });
-
-    it('should parse patterns with a multiple escaped sequences', function () {
-      expect(fn('[foo-]YYYY[-bar]')).to.equal('foo-*-bar');
-      expect(fn('[foo-]YYYY[-bar-]MM')).to.equal('foo-*-bar-*');
-    });
-
-    it('should handle leading patterns', function () {
-      expect(fn('YYYY[-foo]')).to.equal('*-foo');
-    });
-
-    it('should ignore [ when inside an escape', function () {
-      expect(fn('[f[oo-]YYYY')).to.equal('f[oo-*');
-    });
-
-    // Not sure if this behavior is useful, but this is how the code works
-    it('should add ] to the string when outside the pattern', function () {
-      expect(fn('[foo-]]YYYY')).to.equal('foo-]*');
-    });
-
-    it('should ignore ] when outside an escape', function () {
-      expect(fn('[f]oo-]YYYY')).to.equal('f*');
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/index_pattern/index.js b/test/unit/specs/components/index_pattern/index.js
deleted file mode 100644
index 1d479e018285e..0000000000000
--- a/test/unit/specs/components/index_pattern/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-define(function (require) {
-  describe('Index Patterns', function () {
-    describe(require('specs/components/index_pattern/_index_pattern'));
-    describe(require('specs/components/index_pattern/_cast_mapping_type'));
-    describe(require('specs/components/index_pattern/_map_field'));
-    describe(require('specs/components/index_pattern/_pattern_to_wildcard'));
-    describe(require('specs/components/index_pattern/_get_computed_fields'));
-    describe(require('specs/components/index_pattern/_FieldFormat'));
-  });
-});
diff --git a/test/unit/specs/components/listen/listen.js b/test/unit/specs/components/listen/listen.js
deleted file mode 100644
index 06c7691a522e6..0000000000000
--- a/test/unit/specs/components/listen/listen.js
+++ /dev/null
@@ -1,75 +0,0 @@
-define(function (require) {
-  describe('listen component', function () {
-    var sinon = require('test_utils/auto_release_sinon');
-
-    var $rootScope;
-    var Events;
-
-    require('components/listen');
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function ($injector, Private) {
-      $rootScope = $injector.get('$rootScope');
-      Events = Private(require('factories/events'));
-    }));
-
-    it('exposes the $listen method on all scopes', function () {
-      expect($rootScope.$listen).to.be.a('function');
-      expect($rootScope.$new().$listen).to.be.a('function');
-    });
-
-    it('binds to an event emitter', function () {
-      var emitter = new Events();
-      var $scope = $rootScope.$new();
-
-      function handler() {}
-      $scope.$listen(emitter, 'hello', handler);
-
-      expect(emitter._listeners.hello).to.have.length(1);
-      expect(emitter._listeners.hello[0].handler).to.be(handler);
-    });
-
-    it('binds to $scope, waiting for the destroy event', function () {
-      var emitter = new Events();
-      var $scope = $rootScope.$new();
-
-      sinon.stub($scope, '$on');
-      sinon.stub($rootScope, '$on');
-
-      function handler() {}
-      $scope.$listen(emitter, 'hello', handler);
-
-      expect($rootScope.$on).to.have.property('callCount', 0);
-      expect($scope.$on).to.have.property('callCount', 1);
-
-      var call = $scope.$on.firstCall;
-      expect(call.args[0]).to.be('$destroy');
-      expect(call.args[1]).to.be.a('function');
-    });
-
-    it('unbinds the event handler when $destroy is triggered', function () {
-      var emitter = new Events();
-      var $scope = $rootScope.$new();
-
-      sinon.stub($scope, '$on');
-      sinon.stub(emitter, 'off');
-
-      // set the listener
-      function handler() {}
-      $scope.$listen(emitter, 'hello', handler);
-
-      // get the unbinder that was registered to $scope
-      var unbinder = $scope.$on.firstCall.args[1];
-
-      // call the unbinder
-      expect(emitter.off).to.have.property('callCount', 0);
-      unbinder();
-      expect(emitter.off).to.have.property('callCount', 1);
-
-      // check that the off args were as expected
-      var call = emitter.off.firstCall;
-      expect(call.args[0]).to.be('hello');
-      expect(call.args[1]).to.be(handler);
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/paginated_table/index.js b/test/unit/specs/components/paginated_table/index.js
deleted file mode 100644
index 5f9a57d13e692..0000000000000
--- a/test/unit/specs/components/paginated_table/index.js
+++ /dev/null
@@ -1,375 +0,0 @@
-define(function (require) {
-  require('components/paginated_table/paginated_table');
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var sinon = require('sinon/sinon');
-
-  describe('paginated table', function () {
-    var $el;
-    var $rootScope;
-    var $compile;
-    var $scope;
-    var $elScope;
-    var $orderBy;
-    var defaultPerPage = 10;
-
-    var makeData = function (colCount, rowCount) {
-      var columns = [];
-      var rows = [];
-
-      if (_.isNumber(colCount)) {
-        _.times(colCount, function (i) {
-          columns.push({ title: 'column' + i });
-        });
-      } else {
-        columns = colCount;
-      }
-
-      if (_.isNumber(rowCount)) {
-        _.times(rowCount, function (col) {
-          var rowItems = [];
-
-          _.times(columns.length, function (row) {
-            rowItems.push('item' + col + row);
-          });
-
-          rows.push(rowItems);
-        });
-      } else {
-        rows = rowCount;
-      }
-
-      return {
-        columns: columns,
-        rows: rows
-      };
-    };
-
-    var renderTable = function (cols, rows, perPage) {
-      $scope.cols = cols || [];
-      $scope.rows = rows || [];
-      $scope.perPage = perPage || defaultPerPage;
-
-      $el = $compile('<paginated-table columns="cols" rows="rows" per-page="perPage">')($scope);
-
-      $scope.$digest();
-    };
-
-    beforeEach(function () {
-      module('kibana');
-
-      inject(function (_$rootScope_, _$compile_, $filter) {
-        $rootScope = _$rootScope_;
-        $compile = _$compile_;
-        $orderBy = $filter('orderBy');
-      });
-
-      $scope = $rootScope.$new();
-    });
-
-    // afterEach(function () {
-    //   $scope.$destroy();
-    // });
-
-    describe('rendering', function () {
-      it('should not display without rows', function () {
-        var cols = [{
-          title: 'test1'
-        }];
-        var rows = [];
-
-        renderTable(cols, rows);
-        expect($el.children().size()).to.be(0);
-      });
-
-      it('should render columns and rows', function () {
-        var data = makeData(2, 2);
-        var cols = data.columns;
-        var rows = data.rows;
-
-        renderTable(cols, rows);
-        expect($el.children().size()).to.be(1);
-        var tableRows = $el.find('tbody tr');
-        // should pad rows
-        expect(tableRows.size()).to.be(defaultPerPage);
-        // should contain the row data
-        expect(tableRows.eq(0).find('td').eq(0).text()).to.be(rows[0][0]);
-        expect(tableRows.eq(0).find('td').eq(1).text()).to.be(rows[0][1]);
-        expect(tableRows.eq(1).find('td').eq(0).text()).to.be(rows[1][0]);
-        expect(tableRows.eq(1).find('td').eq(1).text()).to.be(rows[1][1]);
-      });
-
-      it('should paginate rows', function () {
-        // note: paginate truncates pages, so don't make too many
-        var rowCount = _.random(16, 24);
-        var perPageCount = _.random(5, 8);
-        var data = makeData(3, rowCount);
-        var pageCount = Math.ceil(rowCount / perPageCount);
-
-        renderTable(data.columns, data.rows, perPageCount);
-        var tableRows = $el.find('tbody tr');
-        expect(tableRows.size()).to.be(perPageCount);
-        // add 2 for the first and last page links
-        expect($el.find('paginate-controls a').size()).to.be(pageCount + 2);
-      });
-    });
-
-    describe('sorting', function () {
-      var data;
-      var lastRowIndex;
-      var paginatedTable;
-
-      beforeEach(function () {
-        data = makeData(3, [
-          ['bbbb', 'aaaa', 'zzzz'],
-          ['cccc', 'cccc', 'aaaa'],
-          ['zzzz', 'bbbb', 'bbbb'],
-          ['aaaa', 'zzzz', 'cccc'],
-        ]);
-
-        lastRowIndex = data.rows.length - 1;
-        renderTable(data.columns, data.rows);
-        paginatedTable = $el.isolateScope().paginatedTable;
-      });
-
-      // afterEach(function () {
-      //   $scope.$destroy();
-      // });
-
-      it('should not sort by default', function () {
-        var tableRows = $el.find('tbody tr');
-        expect(tableRows.eq(0).find('td').eq(0).text()).to.be(data.rows[0][0]);
-        expect(tableRows.eq(lastRowIndex).find('td').eq(0).text()).to.be(data.rows[lastRowIndex][0]);
-      });
-
-      it('should do nothing when sorting by invalid column id', function () {
-        // sortColumn
-        paginatedTable.sortColumn(999);
-        $scope.$digest();
-
-        var tableRows = $el.find('tbody tr');
-        expect(tableRows.eq(0).find('td').eq(0).text()).to.be('bbbb');
-        expect(tableRows.eq(0).find('td').eq(1).text()).to.be('aaaa');
-        expect(tableRows.eq(0).find('td').eq(2).text()).to.be('zzzz');
-      });
-
-      it('should do nothing when sorting by non sortable column', function () {
-        data.columns[0].sortable = false;
-
-        // sortColumn
-        paginatedTable.sortColumn(0);
-        $scope.$digest();
-
-        var tableRows = $el.find('tbody tr');
-        expect(tableRows.eq(0).find('td').eq(0).text()).to.be('bbbb');
-        expect(tableRows.eq(0).find('td').eq(1).text()).to.be('aaaa');
-        expect(tableRows.eq(0).find('td').eq(2).text()).to.be('zzzz');
-      });
-
-      it('should sort ascending on first invocation', function () {
-        // sortColumn
-        paginatedTable.sortColumn(0);
-        $scope.$digest();
-
-        var tableRows = $el.find('tbody tr');
-        expect(tableRows.eq(0).find('td').eq(0).text()).to.be('aaaa');
-        expect(tableRows.eq(lastRowIndex).find('td').eq(0).text()).to.be('zzzz');
-      });
-
-      it('should sort descending on second invocation', function () {
-        // sortColumn
-        paginatedTable.sortColumn(0);
-        paginatedTable.sortColumn(0);
-        $scope.$digest();
-
-        var tableRows = $el.find('tbody tr');
-        expect(tableRows.eq(0).find('td').eq(0).text()).to.be('zzzz');
-        expect(tableRows.eq(lastRowIndex).find('td').eq(0).text()).to.be('aaaa');
-      });
-
-      it('should clear sorting on third invocation', function () {
-        // sortColumn
-        paginatedTable.sortColumn(0);
-        paginatedTable.sortColumn(0);
-        paginatedTable.sortColumn(0);
-        $scope.$digest();
-
-        var tableRows = $el.find('tbody tr');
-        expect(tableRows.eq(0).find('td').eq(0).text()).to.be(data.rows[0][0]);
-        expect(tableRows.eq(lastRowIndex).find('td').eq(0).text()).to.be('aaaa');
-      });
-
-      it('should sort new column ascending', function () {
-        // sort by first column
-        paginatedTable.sortColumn(0);
-        $scope.$digest();
-
-        // sort by second column
-        paginatedTable.sortColumn(1);
-        $scope.$digest();
-
-        var tableRows = $el.find('tbody tr');
-        expect(tableRows.eq(0).find('td').eq(1).text()).to.be('aaaa');
-        expect(tableRows.eq(lastRowIndex).find('td').eq(1).text()).to.be('zzzz');
-      });
-
-    });
-
-    describe('sorting duplicate columns', function () {
-      var data;
-      var paginatedTable;
-      var colText = 'test row';
-
-      beforeEach(function () {
-        var cols = [
-          { title: colText },
-          { title: colText },
-          { title: colText }
-        ];
-        var rows = [
-          ['bbbb', 'aaaa', 'zzzz'],
-          ['cccc', 'cccc', 'aaaa'],
-          ['zzzz', 'bbbb', 'bbbb'],
-          ['aaaa', 'zzzz', 'cccc'],
-        ];
-        data = makeData(cols, rows);
-
-        renderTable(data.columns, data.rows);
-        paginatedTable = $el.isolateScope().paginatedTable;
-      });
-
-      it('should have duplicate column titles', function () {
-        var columns = $el.find('thead th span');
-        columns.each(function () {
-          expect($(this).text()).to.be(colText);
-        });
-      });
-
-      it('should handle sorting on columns with the same name', function () {
-        // sort by the last column
-        paginatedTable.sortColumn(2);
-        $scope.$digest();
-
-        var tableRows = $el.find('tbody tr');
-        expect(tableRows.eq(0).find('td').eq(0).text()).to.be('cccc');
-        expect(tableRows.eq(0).find('td').eq(1).text()).to.be('cccc');
-        expect(tableRows.eq(0).find('td').eq(2).text()).to.be('aaaa');
-        expect(tableRows.eq(1).find('td').eq(2).text()).to.be('bbbb');
-        expect(tableRows.eq(2).find('td').eq(2).text()).to.be('cccc');
-        expect(tableRows.eq(3).find('td').eq(2).text()).to.be('zzzz');
-      });
-
-      it('should sort correctly between columns', function () {
-        // sort by the last column
-        paginatedTable.sortColumn(2);
-        $scope.$digest();
-
-        var tableRows = $el.find('tbody tr');
-        expect(tableRows.eq(0).find('td').eq(0).text()).to.be('cccc');
-        expect(tableRows.eq(0).find('td').eq(1).text()).to.be('cccc');
-        expect(tableRows.eq(0).find('td').eq(2).text()).to.be('aaaa');
-
-        // sort by the first column
-        paginatedTable.sortColumn(0);
-        $scope.$digest();
-
-        tableRows = $el.find('tbody tr');
-        expect(tableRows.eq(0).find('td').eq(0).text()).to.be('aaaa');
-        expect(tableRows.eq(0).find('td').eq(1).text()).to.be('zzzz');
-        expect(tableRows.eq(0).find('td').eq(2).text()).to.be('cccc');
-
-        expect(tableRows.eq(1).find('td').eq(0).text()).to.be('bbbb');
-        expect(tableRows.eq(2).find('td').eq(0).text()).to.be('cccc');
-        expect(tableRows.eq(3).find('td').eq(0).text()).to.be('zzzz');
-      });
-
-      it('should not sort duplicate columns', function () {
-        paginatedTable.sortColumn(1);
-        $scope.$digest();
-
-        var sorters = $el.find('thead th i');
-        expect(sorters.eq(0).hasClass('fa-sort')).to.be(true);
-        expect(sorters.eq(1).hasClass('fa-sort')).to.be(false);
-        expect(sorters.eq(2).hasClass('fa-sort')).to.be(true);
-      });
-
-    });
-
-    describe('custom sorting', function () {
-      var data;
-      var paginatedTable;
-      var sortHandler;
-
-      beforeEach(function () {
-        sortHandler = sinon.spy();
-        data = makeData(3, 3);
-        $scope.cols = data.columns;
-        $scope.rows = data.rows;
-        $scope.perPage = defaultPerPage;
-        $scope.sortHandler = sortHandler;
-
-        $el = $compile('<paginated-table columns="cols" rows="rows" per-page="perPage"' +
-          'sort-handler="sortHandler">')($scope);
-
-        $scope.$digest();
-        paginatedTable = $el.isolateScope().paginatedTable;
-      });
-
-      // TODO: This is failing randomly
-      it('should allow custom sorting handler', function () {
-        var columnIndex = 1;
-        paginatedTable.sortColumn(columnIndex);
-        $scope.$digest();
-        expect(sortHandler.callCount).to.be(1);
-        expect(sortHandler.getCall(0).args[0]).to.be(columnIndex);
-      });
-    });
-
-    describe('object rows', function () {
-      var cols;
-      var rows;
-      var paginatedTable;
-
-      beforeEach(function () {
-        cols = [{
-          title: 'object test'
-        }];
-        rows = [
-          ['aaaa'],
-          [{
-            markup: '<h1>I am HTML in a row</h1>',
-            value: 'zzzz'
-          }],
-          ['bbbb']
-        ];
-        renderTable(cols, rows);
-        paginatedTable = $el.isolateScope().paginatedTable;
-      });
-
-      it('should append object markup', function () {
-        var tableRows = $el.find('tbody tr');
-        expect(tableRows.eq(0).find('h1').size()).to.be(0);
-        expect(tableRows.eq(1).find('h1').size()).to.be(1);
-        expect(tableRows.eq(2).find('h1').size()).to.be(0);
-      });
-
-      it('should sort using object value', function () {
-        paginatedTable.sortColumn(0);
-        $scope.$digest();
-        var tableRows = $el.find('tbody tr');
-        expect(tableRows.eq(0).find('h1').size()).to.be(0);
-        expect(tableRows.eq(1).find('h1').size()).to.be(0);
-        // html row should be the last row
-        expect(tableRows.eq(2).find('h1').size()).to.be(1);
-
-        paginatedTable.sortColumn(0);
-        $scope.$digest();
-        tableRows = $el.find('tbody tr');
-        // html row should be the first row
-        expect(tableRows.eq(0).find('h1').size()).to.be(1);
-        expect(tableRows.eq(1).find('h1').size()).to.be(0);
-        expect(tableRows.eq(2).find('h1').size()).to.be(0);
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/components/reflow_watcher.js b/test/unit/specs/components/reflow_watcher.js
deleted file mode 100644
index 6243ff23a65e0..0000000000000
--- a/test/unit/specs/components/reflow_watcher.js
+++ /dev/null
@@ -1,78 +0,0 @@
-define(function (require) {
-  describe('Reflow watcher', function () {
-    require('angular');
-    var $ = require('jquery');
-    var _ = require('lodash');
-    var sinon = require('test_utils/auto_release_sinon');
-
-    var $body = $(document.body);
-    var $window = $(window);
-    var expectStubbedEventAndEl = function (stub, event, $el) {
-      expect(stub.getCalls().some(function (call) {
-        var events = call.args[0].split(' ');
-        return _.contains(events, event) && $el.is(call.thisValue);
-      })).to.be(true);
-    };
-
-    var EventEmitter;
-    var reflowWatcher;
-    var $rootScope;
-    var $onStub;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private, $injector) {
-      $rootScope = $injector.get('$rootScope');
-      EventEmitter = Private(require('factories/events'));
-
-      // stub jQuery's $.on method while creating the reflowWatcher
-      $onStub = sinon.stub($.fn, 'on');
-      reflowWatcher = Private(require('components/reflow_watcher'));
-      $onStub.restore();
-
-      // setup the reflowWatchers $http watcher
-      $rootScope.$apply();
-    }));
-
-    it('is an event emitter', function () {
-      expect(reflowWatcher).to.be.an(EventEmitter);
-    });
-
-    describe('listens', function () {
-      it('to "mouseup" on the body', function () {
-        expectStubbedEventAndEl($onStub, 'mouseup', $body);
-      });
-
-      it('to "resize" on the window', function () {
-        expectStubbedEventAndEl($onStub, 'resize', $window);
-      });
-    });
-
-    describe('un-listens in #destroy()', function () {
-      var $offStub;
-
-      beforeEach(function () {
-        $offStub = sinon.stub($.fn, 'off');
-        reflowWatcher.destroy();
-        $offStub.restore();
-      });
-
-      it('to "mouseup" on the body', function () {
-        expectStubbedEventAndEl($offStub, 'mouseup', $body);
-      });
-
-      it('to "resize" on the window', function () {
-        expectStubbedEventAndEl($offStub, 'resize', $window);
-      });
-    });
-
-    it('triggers the "reflow" event within a new angular tick', function () {
-      var stub = sinon.stub();
-      reflowWatcher.on('reflow', stub);
-      reflowWatcher.trigger();
-
-      expect(stub).to.have.property('callCount', 0);
-      $rootScope.$apply();
-      expect(stub).to.have.property('callCount', 1);
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/setup/check_es_version.js b/test/unit/specs/components/setup/check_es_version.js
deleted file mode 100644
index 35c18b37ad138..0000000000000
--- a/test/unit/specs/components/setup/check_es_version.js
+++ /dev/null
@@ -1,75 +0,0 @@
-define(function (require) {
-  describe('Setup: Check ES Version', function () {
-    var _ = require('lodash');
-    var sinon = require('test_utils/auto_release_sinon');
-    require('test_utils/no_digest_promises').activateForSuite();
-
-    var checkEsVersion;
-    var es;
-    var Promise;
-
-    beforeEach(module('kibana', function ($provide) {
-      // hard coded to prevent failures when we bump the version
-      $provide.constant('minimumElasticsearchVersion', '1.4.3');
-    }));
-
-    beforeEach(inject(function (Private, $injector) {
-      checkEsVersion = Private(require('components/setup/steps/check_es_version'));
-      es = $injector.get('es');
-      Promise = $injector.get('Promise');
-    }));
-
-    function setNodes(/* ...versions */) {
-      var versions = _.shuffle(arguments);
-      var nodes = {};
-      var i = 0;
-
-      while (versions.length) {
-        var name = 'node-' + (++i);
-        var version = versions.shift();
-
-        var node = {
-          version: version,
-          http_address: 'http_address',
-          ip: 'ip'
-        };
-
-        if (!_.isString(version)) _.assign(node, version);
-        nodes[name] = node;
-      }
-
-      sinon.stub(es.nodes, 'info').returns(Promise.resolve({
-        nodes: nodes
-      }));
-    }
-
-    it('passes with single a node that matches', function () {
-      setNodes('1.4.3');
-      return checkEsVersion();
-    });
-
-    it('passes with multiple nodes that satisfy', function () {
-      setNodes('1.4.3', '1.4.4', '1.4.3-Beta1');
-      return checkEsVersion();
-    });
-
-    it('fails with a single node that is out of date', function () {
-      setNodes('1.4.4', '1.4.2', '1.4.5');
-      return checkEsVersion()
-      .then(function () {
-        throw new Error('expected validation to fail');
-      }, _.noop);
-    });
-
-    it('passes if that single node is a client node', function () {
-      setNodes(
-        '1.4.4',
-        { version: '1.4.2', attributes: { client: 'true' } },
-        '1.4.5'
-      );
-
-      return checkEsVersion();
-    });
-
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/setup/create_kibana_index.js b/test/unit/specs/components/setup/create_kibana_index.js
deleted file mode 100644
index e5cc5c4ca405c..0000000000000
--- a/test/unit/specs/components/setup/create_kibana_index.js
+++ /dev/null
@@ -1,33 +0,0 @@
-define(function (require) {
-  describe('Setup: Create Kibana Index', function () {
-    var sinon = require('test_utils/auto_release_sinon');
-    require('test_utils/no_digest_promises').activateForSuite();
-
-    var createKibanaIndex;
-    var es;
-    var Promise;
-
-    beforeEach(module('kibana'));
-
-    beforeEach(inject(function (Private, $injector) {
-      createKibanaIndex = Private(require('components/setup/steps/create_kibana_index'));
-      es = $injector.get('es');
-      Promise = $injector.get('Promise');
-    }));
-
-    it('sets number of shards for kibana index to 1', function () {
-      var es_indices_stub = sinon.stub(es.indices, 'create').returns(Promise.resolve({}));
-      createKibanaIndex();
-      expect(es_indices_stub.calledOnce).to.be(true);
-      expect(es_indices_stub.firstCall.args[0].body.settings.number_of_shards).to.be(1);
-    });
-
-    it('does not set number of replicas for kibana index', function () {
-      var es_indices_stub = sinon.stub(es.indices, 'create').returns(Promise.resolve({}));
-      createKibanaIndex();
-      expect(es_indices_stub.calledOnce).to.be(true);
-      expect(es_indices_stub.firstCall.args[0].body.settings).to.not.have.property('number_of_replicas');
-    });
-
-  });
-});
diff --git a/test/unit/specs/components/stringify/_conformance.js b/test/unit/specs/components/stringify/_conformance.js
deleted file mode 100644
index 4d4101a3eda19..0000000000000
--- a/test/unit/specs/components/stringify/_conformance.js
+++ /dev/null
@@ -1,115 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  var fieldFormats;
-  var FieldFormat;
-  var config;
-
-  var formatIds = [
-    'bytes',
-    'date',
-    'ip',
-    'number',
-    'percent',
-    'string',
-    'url',
-    '_source'
-  ];
-
-  return ['conformance', function () {
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private, $injector) {
-      fieldFormats = Private(require('registry/field_formats'));
-      FieldFormat = Private(require('components/index_patterns/_field_format/FieldFormat'));
-      config = $injector.get('config');
-    }));
-
-    formatIds.forEach(function (id) {
-      var instance;
-      var Type;
-
-      beforeEach(function () {
-        Type = fieldFormats.getType(id);
-        instance = fieldFormats.getInstance(id);
-      });
-
-      describe(id + ' Type', function () {
-        it('has an id', function () {
-          expect(Type.id).to.be.a('string');
-        });
-
-        it('has a title', function () {
-          expect(Type.title).to.be.a('string');
-        });
-
-        it('declares compatible field formats as a string or array', function () {
-          expect(Type.fieldType).to.be.ok();
-          expect(_.isString(Type.fieldType) || _.isArray(Type.fieldType)).to.be(true);
-        });
-      });
-
-      describe(id + ' Instance', function () {
-        it('extends FieldFormat', function () {
-          expect(instance).to.be.a(FieldFormat);
-        });
-      });
-    });
-
-    it('registers all of the fieldFormats', function () {
-      expect(_.difference(fieldFormats.raw, formatIds.map(fieldFormats.getType))).to.eql([]);
-    });
-
-    describe('Bytes format', basicPatternTests('bytes', require('numeral')));
-    describe('Percent Format', basicPatternTests('percent', require('numeral')));
-    describe('Date Format', basicPatternTests('date', require('moment')));
-
-    describe('Number Format', function () {
-      basicPatternTests('number', require('numeral'))();
-
-      it('tries to parse strings', function () {
-        var number = new (fieldFormats.getType('number'))({ pattern: '0.0b' });
-        expect(number.convert(123.456)).to.be('123.5B');
-        expect(number.convert('123.456')).to.be('123.5B');
-      });
-
-    });
-
-    function basicPatternTests(id, lib) {
-      var confKey = id === 'date' ? 'dateFormat' : 'format:' + id + ':defaultPattern';
-
-      return function () {
-        it('converts using the format:' + id + ':defaultPattern config', function () {
-          var inst = fieldFormats.getInstance(id);
-          [
-            '0b',
-            '0 b',
-            '0.[000] b',
-            '0.[000]b',
-            '0.[0]b'
-          ].forEach(function (pattern) {
-            var num = _.random(-10000, 10000, true);
-            config.set(confKey, pattern);
-            expect(inst.convert(num)).to.be(lib(num).format(pattern));
-          });
-        });
-
-        it('uses the pattern param if available', function () {
-          var num = _.random(-10000, 10000, true);
-          var defFormat = '0b';
-          var customFormat = '0.00000%';
-
-          config.set(confKey, defFormat);
-          var defInst = fieldFormats.getInstance(id);
-
-          var Type = fieldFormats.getType(id);
-          var customInst = new Type({ pattern: customFormat });
-
-          expect(defInst.convert(num)).to.not.be(customInst.convert(num));
-          expect(defInst.convert(num)).to.be(lib(num).format(defFormat));
-          expect(customInst.convert(num)).to.be(lib(num).format(customFormat));
-        });
-      };
-    }
-  }];
-});
diff --git a/test/unit/specs/components/stringify/_ip.js b/test/unit/specs/components/stringify/_ip.js
deleted file mode 100644
index 65c1b8de5e6e4..0000000000000
--- a/test/unit/specs/components/stringify/_ip.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define(function (require) {
-  return ['IP Address Format', function () {
-    var fieldFormats;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      fieldFormats = Private(require('registry/field_formats'));
-    }));
-
-    it('convers a value from a decimal to a string', function () {
-      var ip = fieldFormats.getInstance('ip');
-      expect(ip.convert(1186489492)).to.be('70.184.100.148');
-    });
-
-  }];
-});
diff --git a/test/unit/specs/components/stringify/_source.js b/test/unit/specs/components/stringify/_source.js
deleted file mode 100644
index e513b804fdc48..0000000000000
--- a/test/unit/specs/components/stringify/_source.js
+++ /dev/null
@@ -1,34 +0,0 @@
-define(function (require) {
-  return ['_source formatting', function () {
-    var $ = require('jquery');
-    var _ = require('lodash');
-
-    var fieldFormats;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      fieldFormats = Private(require('registry/field_formats'));
-    }));
-
-    describe('Source format', function () {
-      var indexPattern;
-      var hits;
-      var format;
-      var convertHtml;
-
-      beforeEach(inject(function (Private) {
-        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-        hits = Private(require('fixtures/hits'));
-        format = fieldFormats.getInstance('_source');
-        convertHtml = format.getConverterFor('html');
-      }));
-
-      it('uses the _source, field, and hit to create a <dl>', function () {
-        var hit = _.first(hits);
-        var $dl = $(convertHtml(hit._source, indexPattern.fields.byName._source, hit));
-        expect($dl.is('dl')).to.be.ok();
-        expect($dl.find('dt')).to.have.length(_.keys(indexPattern.flattenHit(hit)).length);
-      });
-    });
-  }];
-});
diff --git a/test/unit/specs/components/stringify/_string.js b/test/unit/specs/components/stringify/_string.js
deleted file mode 100644
index 2121d6826e65b..0000000000000
--- a/test/unit/specs/components/stringify/_string.js
+++ /dev/null
@@ -1,19 +0,0 @@
-define(function (require) {
-  return ['String Format', function () {
-    var fieldFormats;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      fieldFormats = Private(require('registry/field_formats'));
-    }));
-
-    it('decode a base64 string', function () {
-      var StringFormat = fieldFormats.getType('string');
-      var string = new StringFormat({
-        transform: 'base64'
-      });
-      expect(string.convert('Zm9vYmFy')).to.be('foobar');
-    });
-
-  }];
-});
diff --git a/test/unit/specs/components/stringify/_url.js b/test/unit/specs/components/stringify/_url.js
deleted file mode 100644
index 57261c45dcafd..0000000000000
--- a/test/unit/specs/components/stringify/_url.js
+++ /dev/null
@@ -1,119 +0,0 @@
-define(function (require) {
-  return ['Url Format', function () {
-    var $ = require('jquery');
-    var fieldFormats;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      fieldFormats = Private(require('registry/field_formats'));
-    }));
-
-    describe('Url Format', function () {
-      var Url;
-
-      beforeEach(function () {
-        Url = fieldFormats.getType('url');
-      });
-
-      it('ouputs a simple <a> tab by default', function () {
-        var url = new Url();
-
-        var $a = $(url.convert('http://elastic.co', 'html'));
-        expect($a.is('a')).to.be(true);
-        expect($a.size()).to.be(1);
-        expect($a.attr('href')).to.be('http://elastic.co');
-        expect($a.attr('target')).to.be('_blank');
-        expect($a.children().size()).to.be(0);
-      });
-
-      it('outputs an <image> if type === "img"', function () {
-        var url = new Url({ type: 'img' });
-
-        var $img = $(url.convert('http://elastic.co', 'html'));
-        expect($img.is('img')).to.be(true);
-        expect($img.attr('src')).to.be('http://elastic.co');
-      });
-
-      describe('url template', function () {
-        it('accepts a template', function () {
-          var url = new Url({ urlTemplate: 'url: {{ value }}' });
-          var $a = $(url.convert('url', 'html'));
-          expect($a.is('a')).to.be(true);
-          expect($a.size()).to.be(1);
-          expect($a.attr('href')).to.be('url: url');
-          expect($a.attr('target')).to.be('_blank');
-          expect($a.children().size()).to.be(0);
-        });
-
-        it('only outputs the url if the contentType === "text"', function () {
-          var url = new Url();
-          expect(url.convert('url', 'text')).to.be('url');
-        });
-      });
-
-      describe('label template', function () {
-        it('accepts a template', function () {
-          var url = new Url({ labelTemplate: 'extension: {{ value }}' });
-          var $a = $(url.convert('php', 'html'));
-          expect($a.is('a')).to.be(true);
-          expect($a.size()).to.be(1);
-          expect($a.attr('href')).to.be('php');
-          expect($a.html()).to.be('extension: php');
-        });
-
-        it('uses the label template for text formating', function () {
-          var url = new Url({ labelTemplate: 'external {{value }}'});
-          expect(url.convert('url', 'text')).to.be('external url');
-        });
-
-        it('can use the raw value', function () {
-          var url = new Url({
-            labelTemplate: 'external {{value}}'
-          });
-          expect(url.convert('url?', 'text')).to.be('external url?');
-        });
-
-        it('can use the url', function () {
-          var url = new Url({
-            urlTemplate: 'http://google.com/{{value}}',
-            labelTemplate: 'external {{url}}'
-          });
-          expect(url.convert('url?', 'text')).to.be('external http://google.com/url%3F');
-        });
-      });
-
-      describe('templating', function () {
-        it('ignores unknown variables', function () {
-          var url = new Url({ urlTemplate: '{{ not really a var }}' });
-          expect(url.convert('url', 'text')).to.be('');
-        });
-
-        it('does not allow executing code in variable expressions', function () {
-          window.SHOULD_NOT_BE_TRUE = false;
-          var url = new Url({ urlTemplate: '{{ (window.SHOULD_NOT_BE_TRUE = true) && value }}' });
-          expect(url.convert('url', 'text')).to.be('');
-        });
-
-        describe('', function () {
-          before(function () {
-            Object.prototype.cantStopMeNow = {
-              toString: function () {
-                return 'fail';
-              },
-              cantStopMeNow: null
-            };
-          });
-
-          it('does not get values from the prototype chain', function () {
-            var url = new Url({ urlTemplate: '{{ cantStopMeNow }}' });
-            expect(url.convert('url', 'text')).to.be('');
-          });
-
-          after(function () {
-            delete Object.prototype.cantStopMeNow;
-          });
-        });
-      });
-    });
-  }];
-});
diff --git a/test/unit/specs/components/stringify/index.js b/test/unit/specs/components/stringify/index.js
deleted file mode 100644
index 5434ff622425b..0000000000000
--- a/test/unit/specs/components/stringify/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-define(function (require) {
-  describe('Stringify Component', function () {
-    describe(require('specs/components/stringify/_conformance'));
-    describe(require('specs/components/stringify/_ip'));
-    describe(require('specs/components/stringify/_source'));
-    describe(require('specs/components/stringify/_string'));
-    describe(require('specs/components/stringify/_url'));
-  });
-});
diff --git a/test/unit/specs/components/style_compile/style_compile.js b/test/unit/specs/components/style_compile/style_compile.js
deleted file mode 100644
index 789d96e338221..0000000000000
--- a/test/unit/specs/components/style_compile/style_compile.js
+++ /dev/null
@@ -1,42 +0,0 @@
-define(function (require) {
-  describe('styleCompile directive', function () {
-    var $ = require('jquery');
-
-    var config;
-    var $rootScope;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function ($injector) {
-      config = $injector.get('config');
-      $rootScope = $injector.get('$rootScope');
-    }));
-
-    it('exports a few config values as css', function () {
-      var $style = $('#style-compile');
-
-      config.set('truncate:maxHeight', 0);
-      $rootScope.$apply();
-      expect($style.html().trim()).to.be([
-        '.truncate-by-height {',
-        '  max-height: none;',
-        '  display: inline-block;',
-        '}',
-        '.truncate-by-height::before {',
-        '  top: -15px;',
-        '}'
-      ].join('\n'));
-
-      config.set('truncate:maxHeight', 15);
-      $rootScope.$apply();
-      expect($style.html().trim()).to.be([
-        '.truncate-by-height {',
-        '  max-height: 15px !important;',
-        '  display: inline-block;',
-        '}',
-        '.truncate-by-height::before {',
-        '  top: 0px;',
-        '}'
-      ].join('\n'));
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/timefilter/diff_interval.js b/test/unit/specs/components/timefilter/diff_interval.js
deleted file mode 100644
index 12f60cd58a06e..0000000000000
--- a/test/unit/specs/components/timefilter/diff_interval.js
+++ /dev/null
@@ -1,75 +0,0 @@
-define(function (require) {
-  var sinon = require('test_utils/auto_release_sinon');
-  describe('Timefilter service', function () {
-    describe('Refresh interval diff watcher', function () {
-
-      var fn, update, fetch, timefilter;
-      beforeEach(module('kibana'));
-
-      beforeEach(inject(function (Private) {
-        update = sinon.spy();
-        fetch = sinon.spy();
-        timefilter = {
-          refreshInterval: {
-            pause: false,
-            value: 0
-          },
-          emit: function (eventType) {
-            if (eventType === 'update') update();
-            if (eventType === 'fetch') fetch();
-          }
-        };
-
-        fn = Private(require('components/timefilter/lib/diff_interval'))(timefilter);
-      }));
-
-      it('not emit anything if nothing has changed', function () {
-        timefilter.refreshInterval = {pause: false, value: 0};
-        fn();
-        expect(update.called).to.be(false);
-        expect(fetch.called).to.be(false);
-      });
-
-      it('emit only an update when paused', function () {
-        timefilter.refreshInterval = {pause: true, value: 5000};
-        fn();
-        expect(update.called).to.be(true);
-        expect(fetch.called).to.be(false);
-      });
-
-      it('emit update, not fetch, when switching to value: 0', function () {
-        timefilter.refreshInterval = {pause: false, value: 5000};
-        fn();
-        expect(update.calledOnce).to.be(true);
-        expect(fetch.calledOnce).to.be(true);
-        timefilter.refreshInterval = {pause: false, value: 0};
-        fn();
-        expect(update.calledTwice).to.be(true);
-        expect(fetch.calledTwice).to.be(false);
-      });
-
-      it('should emit update, not fetch, when moving from unpaused to paused', function () {
-        timefilter.refreshInterval = {pause: false, value: 5000};
-        fn();
-        expect(update.calledOnce).to.be(true);
-        expect(fetch.calledOnce).to.be(true);
-        timefilter.refreshInterval = {pause: true, value: 5000};
-        fn();
-        expect(update.calledTwice).to.be(true);
-        expect(fetch.calledTwice).to.be(false);
-      });
-
-      it('should emit update and fetch when unpaused', function () {
-        timefilter.refreshInterval = {pause: true, value: 5000};
-        fn();
-        expect(update.calledOnce).to.be(true);
-        expect(fetch.calledOnce).to.be(false);
-        timefilter.refreshInterval = {pause: false, value: 5000};
-        fn();
-        expect(update.calledTwice).to.be(true);
-        expect(fetch.calledOnce).to.be(true);
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/components/timefilter/diff_time.js b/test/unit/specs/components/timefilter/diff_time.js
deleted file mode 100644
index f9b3cd0f2237b..0000000000000
--- a/test/unit/specs/components/timefilter/diff_time.js
+++ /dev/null
@@ -1,42 +0,0 @@
-define(function (require) {
-  var sinon = require('test_utils/auto_release_sinon');
-  describe('Timefilter service', function () {
-    describe('time diff watcher', function () {
-
-      var fn, update, fetch, timefilter;
-      beforeEach(module('kibana'));
-
-      beforeEach(inject(function (Private) {
-        update = sinon.spy();
-        fetch = sinon.spy();
-        timefilter = {
-          time: {
-            from: 0,
-            to: 1
-          },
-          emit: function (eventType) {
-            if (eventType === 'update') update();
-            if (eventType === 'fetch') fetch();
-          }
-        };
-
-        fn = Private(require('components/timefilter/lib/diff_time'))(timefilter);
-      }));
-
-      it('not emit anything if the time has not changed', function () {
-        timefilter.time = {from: 0, to: 1};
-        fn();
-        expect(update.called).to.be(false);
-        expect(fetch.called).to.be(false);
-      });
-
-      it('emit update and fetch if the time has changed', function () {
-        timefilter.time = {from: 5, to: 10};
-        fn();
-        expect(update.called).to.be(true);
-        expect(fetch.called).to.be(true);
-      });
-
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/components/vis/_AggConfig.js b/test/unit/specs/components/vis/_AggConfig.js
deleted file mode 100644
index c536085e14cf2..0000000000000
--- a/test/unit/specs/components/vis/_AggConfig.js
+++ /dev/null
@@ -1,290 +0,0 @@
-define(function (require) {
-  return ['AggConfig', function () {
-    var sinon = require('test_utils/auto_release_sinon');
-
-    var Vis;
-    var AggType;
-    var AggConfig;
-    var indexPattern;
-    var fieldFormat;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      Vis = Private(require('components/vis/vis'));
-      AggType = Private(require('components/agg_types/_agg_type'));
-      AggConfig = Private(require('components/vis/AggConfig'));
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-      fieldFormat = Private(require('registry/field_formats'));
-    }));
-
-    describe('#toDsl', function () {
-      it('calls #write()', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            {
-              type: 'date_histogram',
-              schema: 'segment'
-            }
-          ]
-        });
-
-        var aggConfig = vis.aggs.byTypeName.date_histogram[0];
-        var stub = sinon.stub(aggConfig, 'write').returns({ params: {} });
-
-        aggConfig.toDsl();
-        expect(stub.callCount).to.be(1);
-      });
-
-      it('uses the type name as the agg name', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            {
-              type: 'date_histogram',
-              schema: 'segment'
-            }
-          ]
-        });
-
-        var aggConfig = vis.aggs.byTypeName.date_histogram[0];
-        sinon.stub(aggConfig, 'write').returns({ params: {} });
-
-        var dsl = aggConfig.toDsl();
-        expect(dsl).to.have.property('date_histogram');
-      });
-
-      it('uses the params from #write() output as the agg params', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            {
-              type: 'date_histogram',
-              schema: 'segment'
-            }
-          ]
-        });
-
-        var aggConfig = vis.aggs.byTypeName.date_histogram[0];
-        var football = {};
-
-        sinon.stub(aggConfig, 'write').returns({ params: football });
-
-        var dsl = aggConfig.toDsl();
-        expect(dsl.date_histogram).to.be(football);
-      });
-
-      it('includes subAggs from #write() output', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            {
-              type: 'avg',
-              schema: 'metric'
-            },
-            {
-              type: 'date_histogram',
-              schema: 'segment'
-            }
-          ]
-        });
-
-        var histoConfig = vis.aggs.byTypeName.date_histogram[0];
-        var avgConfig = vis.aggs.byTypeName.avg[0];
-        var football = {};
-
-        sinon.stub(histoConfig, 'write').returns({ params: {}, subAggs: [avgConfig] });
-        sinon.stub(avgConfig, 'write').returns({ params: football });
-
-        var dsl = histoConfig.toDsl();
-
-        // didn't use .eql() because of variable key names, and final check is strict
-        expect(dsl).to.have.property('aggs');
-        expect(dsl.aggs).to.have.property(avgConfig.id);
-        expect(dsl.aggs[avgConfig.id]).to.have.property('avg');
-        expect(dsl.aggs[avgConfig.id].avg).to.be(football);
-      });
-    });
-
-    describe('::ensureIds', function () {
-      it('accepts an array of objects and assigns ids to them', function () {
-        var objs = [
-          {},
-          {},
-          {},
-          {}
-        ];
-        AggConfig.ensureIds(objs);
-        expect(objs[0]).to.have.property('id', '1');
-        expect(objs[1]).to.have.property('id', '2');
-        expect(objs[2]).to.have.property('id', '3');
-        expect(objs[3]).to.have.property('id', '4');
-      });
-
-      it('assigns ids relative to the other items in the list', function () {
-        var objs = [
-          { id: '100' },
-          {},
-        ];
-        AggConfig.ensureIds(objs);
-        expect(objs[0]).to.have.property('id', '100');
-        expect(objs[1]).to.have.property('id', '101');
-      });
-
-      it('assigns ids relative to the other items in the list', function () {
-        var objs = [
-          { id: '100' },
-          { id: '200' },
-          { id: '500' },
-          { id: '350' },
-          {},
-        ];
-        AggConfig.ensureIds(objs);
-        expect(objs[0]).to.have.property('id', '100');
-        expect(objs[1]).to.have.property('id', '200');
-        expect(objs[2]).to.have.property('id', '500');
-        expect(objs[3]).to.have.property('id', '350');
-        expect(objs[4]).to.have.property('id', '501');
-      });
-
-      it('uses ::nextId to get the starting value', function () {
-        sinon.stub(AggConfig, 'nextId').returns(534);
-        var objs = AggConfig.ensureIds([{}]);
-        expect(objs[0]).to.have.property('id', '534');
-      });
-
-      it('only calls ::nextId once', function () {
-        var start = 420;
-        sinon.stub(AggConfig, 'nextId').returns(start);
-        var objs = AggConfig.ensureIds([{}, {}, {}, {}, {}, {}, {}]);
-
-        expect(AggConfig.nextId).to.have.property('callCount', 1);
-        objs.forEach(function (obj, i) {
-          expect(obj).to.have.property('id', String(start + i));
-        });
-      });
-    });
-
-    describe('::nextId', function () {
-      it('accepts a list of objects and picks the next id', function () {
-        var next = AggConfig.nextId([ {id: 100}, {id: 500} ]);
-        expect(next).to.be(501);
-      });
-
-      it('handles an empty list', function () {
-        var next = AggConfig.nextId([]);
-        expect(next).to.be(1);
-      });
-
-      it('fails when the list is not defined', function () {
-        expect(function () {
-          AggConfig.nextId();
-        }).to.throwError();
-      });
-    });
-
-    describe('#toJSON', function () {
-      it('includes the aggs id, params, type and schema', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            {
-              type: 'date_histogram',
-              schema: 'segment'
-            }
-          ]
-        });
-
-        var aggConfig = vis.aggs.byTypeName.date_histogram[0];
-        expect(aggConfig.id).to.be('1');
-        expect(aggConfig.params).to.be.an('object');
-        expect(aggConfig.type).to.be.an(AggType).and.have.property('name', 'date_histogram');
-        expect(aggConfig.schema).to.be.an('object').and.have.property('name', 'segment');
-
-        var state = aggConfig.toJSON();
-        expect(state).to.have.property('id', '1');
-        expect(state.params).to.be.an('object');
-        expect(state).to.have.property('type', 'date_histogram');
-        expect(state).to.have.property('schema', 'segment');
-      });
-    });
-
-    describe('#fieldFormatter', function () {
-      it('returns the fields format unless the agg type has a custom getFormat handler', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            {
-              type: 'date_histogram',
-              schema: 'segment',
-              params: { field: '@timestamp' }
-            }
-          ]
-        });
-        expect(vis.aggs[0].fieldFormatter()).to.be(vis.aggs[0].field().format.getConverterFor());
-
-        vis = new Vis(indexPattern, {
-          type: 'metric',
-          aggs: [
-            {
-              type: 'count',
-              schema: 'metric',
-              params: { field: '@timestamp' }
-            }
-          ]
-        });
-        expect(vis.aggs[0].fieldFormatter()).to.be(fieldFormat.getDefaultInstance('number').getConverterFor());
-      });
-
-      it('returns the string format if the field does not have a format', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            {
-              type: 'date_histogram',
-              schema: 'segment',
-              params: { field: '@timestamp' }
-            }
-          ]
-        });
-
-        var agg = vis.aggs[0];
-        agg.params.field = { type: 'date', format: null };
-        expect(agg.fieldFormatter()).to.be(fieldFormat.getDefaultInstance('string').getConverterFor());
-      });
-
-      it('returns the string format if their is no field', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            {
-              type: 'date_histogram',
-              schema: 'segment',
-              params: { field: '@timestamp' }
-            }
-          ]
-        });
-
-        var agg = vis.aggs[0];
-        delete agg.params.field;
-        expect(agg.fieldFormatter()).to.be(fieldFormat.getDefaultInstance('string').getConverterFor());
-      });
-
-      it('returns the html converter if "html" is passed in', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            {
-              type: 'avg',
-              schema: 'metric',
-              params: { field: 'ssl' }
-            }
-          ]
-        });
-
-        var field = indexPattern.fields.byName.ssl;
-        expect(vis.aggs[0].fieldFormatter('html')).to.be(field.format.getConverterFor('html'));
-      });
-    });
-  }];
-});
diff --git a/test/unit/specs/components/vis/_AggConfigResult.js b/test/unit/specs/components/vis/_AggConfigResult.js
deleted file mode 100644
index 55777f2ceaaaa..0000000000000
--- a/test/unit/specs/components/vis/_AggConfigResult.js
+++ /dev/null
@@ -1,107 +0,0 @@
-define(function (require) {
-  return ['AggConfigResult', function () {
-    var _ = require('lodash');
-    var AggConfigResult = require('components/vis/AggConfigResult');
-
-    var AggConfig;
-    var indexPattern;
-    var Vis;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      Vis = Private(require('components/vis/vis'));
-      AggConfig = Private(require('components/vis/AggConfig'));
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-    }));
-
-    describe('initialization', function () {
-      it('should set the type to bucket for bucket based results', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [ { type: 'terms', schema: 'segment', params: { field: '_type' } } ]
-        });
-        var aggConfig = vis.aggs.byTypeName.terms[0];
-        var results = new AggConfigResult(aggConfig, null, 10, 'apache');
-        expect(results).to.have.property('aggConfig', aggConfig);
-        expect(results).to.have.property('$parent', null);
-        expect(results).to.have.property('type', 'bucket');
-        expect(results).to.have.property('value', 10);
-        expect(results).to.have.property('key', 'apache');
-      });
-
-      it('should set the type to metric for metric based results', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [ { type: 'avg', schema: 'metric', params: { field: 'bytes' } } ]
-        });
-        var aggConfig = vis.aggs.byTypeName.avg[0];
-        var results = new AggConfigResult(aggConfig, null, 1024);
-        expect(results).to.have.property('aggConfig', aggConfig);
-        expect(results).to.have.property('$parent', null);
-        expect(results).to.have.property('type', 'metric');
-        expect(results).to.have.property('value', 1024);
-        expect(results).to.have.property('key', undefined);
-      });
-    });
-
-
-    describe('hierarchical', function () {
-      describe('getPath()', function () {
-
-        it('should return the parent and itself (in an array) for the path', function () {
-          var vis = new Vis(indexPattern, {
-            type: 'histogram',
-            aggs: [
-              { type: 'terms', schema: 'segment', params: { field: '_type' } },
-              { type: 'terms', schema: 'segment', params: { field: 'extension' } }
-            ]
-          });
-          var parentAggConfig = vis.aggs.byTypeName.terms[0];
-          var aggConfig = vis.aggs.byTypeName.terms[1];
-          var parentResult = new AggConfigResult(parentAggConfig, null, 20, 'apache');
-          var result = new AggConfigResult(aggConfig, parentResult, 15, 'php');
-          var path = result.getPath();
-          expect(path).to.be.an(Array);
-          expect(path).to.have.length(2);
-          expect(path[0]).to.be(parentResult);
-          expect(path[1]).to.be(result);
-        });
-
-        it('should return itself (in an array) for the path', function () {
-          var vis = new Vis(indexPattern, {
-            type: 'histogram',
-            aggs: [
-              { type: 'terms', schema: 'segment', params: { field: 'extension' } }
-            ]
-          });
-          var aggConfig = vis.aggs.byTypeName.terms[0];
-          var result = new AggConfigResult(aggConfig, null, 15, 'php');
-          var path = result.getPath();
-          expect(path).to.be.an(Array);
-          expect(path).to.have.length(1);
-          expect(path[0]).to.be(result);
-        });
-
-      });
-
-      describe('createFilter', function () {
-        it('should return a filter object that represents the result', function () {
-          var vis = new Vis(indexPattern, {
-            type: 'histogram',
-            aggs: [
-              { type: 'terms', schema: 'segment', params: { field: 'extension' } }
-            ]
-          });
-          var aggConfig = vis.aggs.byTypeName.terms[0];
-          var result = new AggConfigResult(aggConfig, null, 15, 'php');
-          var filter = result.createFilter();
-          expect(filter).to.have.property('query');
-          expect(filter.query).to.have.property('match');
-          expect(filter.query.match).to.have.property('extension');
-          expect(filter.query.match.extension).to.have.property('query', 'php');
-          expect(filter.query.match.extension).to.have.property('type', 'phrase');
-        });
-      });
-    });
-  }];
-});
diff --git a/test/unit/specs/components/vis/_AggConfigs.js b/test/unit/specs/components/vis/_AggConfigs.js
deleted file mode 100644
index 93bdaf0f7311a..0000000000000
--- a/test/unit/specs/components/vis/_AggConfigs.js
+++ /dev/null
@@ -1,353 +0,0 @@
-define(function (require) {
-  return ['AggConfigs', function () {
-    var _ = require('lodash');
-    var sinon = require('test_utils/auto_release_sinon');
-
-    var Vis;
-    var IndexedArray;
-    var AggConfig;
-    var AggConfigs;
-    var SpiedAggConfig;
-    var indexPattern;
-    var Schemas;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      // replace the AggConfig module with a spy
-      var RealAggConfigPM = require('components/vis/AggConfig');
-      AggConfig = Private(RealAggConfigPM);
-      var spy = sinon.spy(AggConfig);
-      Object.defineProperty(spy, 'aggTypes', {
-        get: function () { return AggConfig.aggTypes; },
-        set: function (val) { AggConfig.aggTypes = val; }
-      });
-
-      Private.stub(RealAggConfigPM, spy);
-
-      // load main deps
-      Vis = Private(require('components/vis/vis'));
-      SpiedAggConfig = Private(require('components/vis/AggConfig'));
-      AggConfigs = Private(require('components/vis/AggConfigs'));
-      IndexedArray = require('utils/indexed_array/index');
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-      Schemas = Private(require('components/vis/Schemas'));
-    }));
-
-    it('extends IndexedArray', function () {
-      var ac = new AggConfigs();
-      expect(ac).to.be.a(IndexedArray);
-    });
-
-    describe('constructor', function () {
-      it('handles passing just a vis', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: []
-        });
-
-        var ac = new AggConfigs(vis);
-        expect(ac).to.have.length(1);
-      });
-
-      it('converts configStates into AggConfig objects if they are not already', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: []
-        });
-
-        var ac = new AggConfigs(vis, [
-          {
-            type: 'date_histogram',
-            schema: 'segment'
-          },
-          new AggConfig(vis, {
-            type: 'terms',
-            schema: 'split'
-          })
-        ]);
-
-        expect(ac).to.have.length(3);
-        expect(SpiedAggConfig).to.have.property('callCount', 3);
-      });
-
-      it('attemps to ensure that all states have an id', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: []
-        });
-
-        var states = [
-          {
-            type: 'date_histogram',
-            schema: 'segment'
-          },
-          {
-            type: 'terms',
-            schema: 'split'
-          }
-        ];
-
-        var spy = sinon.spy(SpiedAggConfig, 'ensureIds');
-        var ac = new AggConfigs(vis, states);
-        expect(spy.callCount).to.be(1);
-        expect(spy.firstCall.args[0]).to.be(states);
-      });
-
-      describe('defaults', function () {
-        var vis;
-        beforeEach(function () {
-          vis = {
-            indexPattern: indexPattern,
-            type: {
-              schemas: new Schemas([
-                {
-                  group: 'metrics',
-                  name: 'metric',
-                  title: 'Simple',
-                  min: 1,
-                  max: 2,
-                  defaults: [
-                    { schema: 'metric', type: 'count' },
-                    { schema: 'metric', type: 'avg' },
-                    { schema: 'metric', type: 'sum' }
-                  ]
-                },
-                {
-                  group: 'buckets',
-                  name: 'segment',
-                  title: 'Example',
-                  min: 0,
-                  max: 1,
-                  defaults: [
-                    { schema: 'segment', type: 'terms' },
-                    { schema: 'segment', type: 'filters' }
-                  ]
-                }
-              ])
-            }
-          };
-        });
-
-        it('should only set the number of defaults defined by the max', function () {
-          var ac = new AggConfigs(vis);
-          expect(ac.bySchemaName.metric).to.have.length(2);
-        });
-
-        it('should set the defaults defined in the schema when none exist', function () {
-          var ac = new AggConfigs(vis);
-          expect(ac).to.have.length(3);
-        });
-
-        it('should NOT set the defaults defined in the schema when some exist', function () {
-          var ac = new AggConfigs(vis, [{ schema: 'segment', type: 'date_histogram' }]);
-          expect(ac).to.have.length(3);
-          expect(ac.bySchemaName.segment[0].type.name).to.equal('date_histogram');
-        });
-      });
-    });
-
-    describe('#getRequestAggs', function () {
-      it('performs a stable sort, but moves metrics to the bottom', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            { type: 'avg', schema: 'metric' },
-            { type: 'terms', schema: 'split' },
-            { type: 'histogram', schema: 'split' },
-            { type: 'sum', schema: 'metric' },
-            { type: 'date_histogram', schema: 'segment' },
-            { type: 'filters', schema: 'split' },
-            { type: 'percentiles', schema: 'metric' }
-          ]
-        });
-
-        var sorted = vis.aggs.getRequestAggs();
-        var aggs = _.indexBy(vis.aggs, function (agg) {
-          return agg.type.name;
-        });
-
-        expect(sorted.shift()).to.be(aggs.terms);
-        expect(sorted.shift()).to.be(aggs.histogram);
-        expect(sorted.shift()).to.be(aggs.date_histogram);
-        expect(sorted.shift()).to.be(aggs.filters);
-        expect(sorted.shift()).to.be(aggs.avg);
-        expect(sorted.shift()).to.be(aggs.sum);
-        expect(sorted.shift()).to.be(aggs.percentiles);
-        expect(sorted).to.have.length(0);
-      });
-    });
-
-    describe('#getResponseAggs', function () {
-      it('returns all request aggs for basic aggs', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            { type: 'terms', schema: 'split' },
-            { type: 'date_histogram', schema: 'segment' },
-            { type: 'count', schema: 'metric' }
-          ]
-        });
-
-        var sorted = vis.aggs.getResponseAggs();
-        var aggs = _.indexBy(vis.aggs, function (agg) {
-          return agg.type.name;
-        });
-
-        expect(sorted.shift()).to.be(aggs.terms);
-        expect(sorted.shift()).to.be(aggs.date_histogram);
-        expect(sorted.shift()).to.be(aggs.count);
-        expect(sorted).to.have.length(0);
-      });
-
-      it('expands aggs that have multiple responses', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            { type: 'terms', schema: 'split' },
-            { type: 'date_histogram', schema: 'segment' },
-            { type: 'percentiles', schema: 'metric', params: { percents: [1, 2, 3]} }
-          ]
-        });
-
-        var sorted = vis.aggs.getResponseAggs();
-        var aggs = _.indexBy(vis.aggs, function (agg) {
-          return agg.type.name;
-        });
-
-        expect(sorted.shift()).to.be(aggs.terms);
-        expect(sorted.shift()).to.be(aggs.date_histogram);
-        expect(sorted.shift().id).to.be(aggs.percentiles.id + '.' + 1);
-        expect(sorted.shift().id).to.be(aggs.percentiles.id + '.' + 2);
-        expect(sorted.shift().id).to.be(aggs.percentiles.id + '.' + 3);
-        expect(sorted).to.have.length(0);
-      });
-    });
-
-    describe('#toDsl', function () {
-      it('uses the sorted aggs', function () {
-        var vis = new Vis(indexPattern, { type: 'histogram' });
-        sinon.spy(vis.aggs, 'getRequestAggs');
-        vis.aggs.toDsl();
-        expect(vis.aggs.getRequestAggs).to.have.property('callCount', 1);
-      });
-
-      it('calls aggConfig#toDsl() on each aggConfig and compiles the nested output', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            { type: 'date_histogram', schema: 'segment' },
-            { type: 'filters', schema: 'split' }
-          ]
-        });
-
-        var aggInfos = vis.aggs.map(function (aggConfig) {
-          var football = {};
-
-          sinon.stub(aggConfig, 'toDsl', function () {
-            return football;
-          });
-
-          return {
-            id: aggConfig.id,
-            football: football
-          };
-        });
-
-        (function recurse(lvl) {
-          var info = aggInfos.shift();
-
-          expect(lvl).to.have.property(info.id);
-          expect(lvl[info.id]).to.be(info.football);
-
-          if (lvl[info.id].aggs) {
-            return recurse(lvl[info.id].aggs);
-          }
-        }(vis.aggs.toDsl()));
-
-        expect(aggInfos).to.have.length(1);
-      });
-
-      it('skips aggs that don\'t have a dsl representation', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            { type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
-            { type: 'count', schema: 'metric' }
-          ]
-        });
-
-        var dsl = vis.aggs.toDsl();
-        var histo = vis.aggs.byTypeName.date_histogram[0];
-        var count = vis.aggs.byTypeName.count[0];
-
-        expect(dsl).to.have.property(histo.id);
-        expect(dsl[histo.id]).to.be.an('object');
-        expect(dsl[histo.id]).to.not.have.property('aggs');
-        expect(dsl).to.not.have.property(count.id);
-      });
-
-      it('writes multiple metric aggregations at the same level', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            { type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
-            { type: 'avg', schema: 'metric', params: { field: 'bytes' }  },
-            { type: 'sum', schema: 'metric', params: { field: 'bytes' }  },
-            { type: 'min', schema: 'metric', params: { field: 'bytes' }  },
-            { type: 'max', schema: 'metric', params: { field: 'bytes' }  }
-          ]
-        });
-
-        var dsl = vis.aggs.toDsl();
-
-        var histo = vis.aggs.byTypeName.date_histogram[0];
-        var metrics = vis.aggs.bySchemaGroup.metrics;
-
-        expect(dsl).to.have.property(histo.id);
-        expect(dsl[histo.id]).to.be.an('object');
-        expect(dsl[histo.id]).to.have.property('aggs');
-
-        metrics.forEach(function (metric) {
-          expect(dsl[histo.id].aggs).to.have.property(metric.id);
-          expect(dsl[histo.id].aggs[metric.id]).to.not.have.property('aggs');
-        });
-      });
-
-      it('writes multiple metric aggregations at every level if the vis is hierarchical', function () {
-        var vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            { type: 'terms', schema: 'segment', params: { field: 'ip', orderBy: 1 } },
-            { type: 'terms', schema: 'segment', params: { field: 'extension', orderBy: 1 } },
-            { id: 1, type: 'avg', schema: 'metric', params: { field: 'bytes' }  },
-            { type: 'sum', schema: 'metric', params: { field: 'bytes' }  },
-            { type: 'min', schema: 'metric', params: { field: 'bytes' }  },
-            { type: 'max', schema: 'metric', params: { field: 'bytes' }  }
-          ]
-        });
-        vis.isHierarchical = _.constant(true);
-
-        var topLevelDsl = vis.aggs.toDsl();
-        var buckets = vis.aggs.bySchemaGroup.buckets;
-        var metrics = vis.aggs.bySchemaGroup.metrics;
-
-        (function checkLevel(dsl) {
-          var bucket = buckets.shift();
-          expect(dsl).to.have.property(bucket.id);
-
-          expect(dsl[bucket.id]).to.be.an('object');
-          expect(dsl[bucket.id]).to.have.property('aggs');
-
-          metrics.forEach(function (metric) {
-            expect(dsl[bucket.id].aggs).to.have.property(metric.id);
-            expect(dsl[bucket.id].aggs[metric.id]).to.not.have.property('aggs');
-          });
-
-          if (buckets.length) {
-            checkLevel(dsl[bucket.id].aggs);
-          }
-        }(topLevelDsl));
-      });
-    });
-  }];
-});
diff --git a/test/unit/specs/components/vis/_Renderbot.js b/test/unit/specs/components/vis/_Renderbot.js
deleted file mode 100644
index 5d1f7d9c10105..0000000000000
--- a/test/unit/specs/components/vis/_Renderbot.js
+++ /dev/null
@@ -1,37 +0,0 @@
-define(function (require) {
-  return ['renderbot', function () {
-    var Renderbot;
-
-    function init() {
-      module('kibana');
-
-      inject(function (Private) {
-        Renderbot = Private(require('components/vis/Renderbot'));
-      });
-    }
-
-    describe('API', function () {
-      var vis;
-      var $el;
-      var renderbot;
-
-      beforeEach(init);
-      beforeEach(function () {
-        vis = { hello: 'world' };
-        $el = 'element';
-        renderbot = new Renderbot(vis, $el);
-      });
-
-      it('should have expected methods', function () {
-        expect(renderbot).to.have.property('render');
-        expect(renderbot).to.have.property('destroy');
-        expect(renderbot).to.have.property('updateParams');
-      });
-
-      it('should throw if not implemented', function () {
-        expect(renderbot.render).to.throwError();
-        expect(renderbot.destroy).to.throwError();
-      });
-    });
-  }];
-});
diff --git a/test/unit/specs/components/vis/_Vis.js b/test/unit/specs/components/vis/_Vis.js
deleted file mode 100644
index 300b0140c83b4..0000000000000
--- a/test/unit/specs/components/vis/_Vis.js
+++ /dev/null
@@ -1,107 +0,0 @@
-define(function (require) {
-  return ['Vis Class', function () {
-
-    var _ = require('lodash');
-
-    var indexPattern;
-    var Vis;
-    var visTypes;
-
-    var vis;
-    var stateFixture = {
-      type: 'pie',
-      aggs: [
-        { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-        { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
-        { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
-      ],
-      params: { isDonut: true },
-      listeners: { click: _.noop }
-    };
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      Vis = Private(require('components/vis/vis'));
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-      visTypes = Private(require('registry/vis_types'));
-    }));
-
-    beforeEach(function () {
-      vis = new Vis(indexPattern, stateFixture);
-    });
-
-    var verifyVis = function (vis) {
-      expect(vis).to.have.property('aggs');
-      expect(vis.aggs).to.have.length(3);
-
-      expect(vis).to.have.property('type');
-      expect(vis.type).to.eql(visTypes.byName.pie);
-
-      expect(vis).to.have.property('listeners');
-      expect(vis.listeners).to.have.property('click');
-      expect(vis.listeners.click).to.eql(_.noop);
-
-      expect(vis).to.have.property('params');
-      expect(vis.params).to.have.property('isDonut', true);
-      expect(vis).to.have.property('indexPattern', indexPattern);
-    };
-
-    describe('initialization', function () {
-      it('should set the state', function () {
-        verifyVis(vis);
-      });
-    });
-
-    describe('getState()', function () {
-      it('should get a state that represents the... er... state', function () {
-        var state = vis.getState();
-        expect(state).to.have.property('type', 'pie');
-
-        expect(state).to.have.property('params');
-        expect(state.params).to.have.property('isDonut', true);
-
-        expect(state).to.have.property('listeners');
-        expect(state.listeners).to.have.property('click');
-        expect(state.listeners.click).to.eql(_.noop);
-
-        expect(state).to.have.property('aggs');
-        expect(state.aggs).to.have.length(3);
-      });
-    });
-
-    describe('clone()', function () {
-      it('should make clone of itself', function () {
-        var clone = vis.clone();
-        verifyVis(clone);
-      });
-    });
-
-    describe('setState()', function () {
-      it('should set the state to defualts', function () {
-        var vis = new Vis(indexPattern);
-        expect(vis).to.have.property('type');
-        expect(vis.type).to.eql(visTypes.byName.histogram);
-        expect(vis).to.have.property('aggs');
-        expect(vis.aggs).to.have.length(1);
-        expect(vis).to.have.property('listeners');
-        expect(vis.listeners).to.eql({});
-        expect(vis).to.have.property('params');
-        expect(vis.params).to.have.property('addLegend', true);
-        expect(vis.params).to.have.property('addTooltip', true);
-        expect(vis.params).to.have.property('mode', 'stacked');
-        expect(vis.params).to.have.property('shareYAxis', true);
-      });
-    });
-
-    describe('isHierarchical()', function () {
-      it('should return true for hierarchical vis (like pie)', function () {
-        expect(vis.isHierarchical()).to.be(true);
-      });
-      it('should return false for non-hierarchical vis (like histogram)', function () {
-        var vis = new Vis(indexPattern);
-        expect(vis.isHierarchical()).to.be(false);
-      });
-    });
-
-  }];
-});
diff --git a/test/unit/specs/components/vis/index.js b/test/unit/specs/components/vis/index.js
deleted file mode 100644
index aafd662e41da1..0000000000000
--- a/test/unit/specs/components/vis/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-define(function (require) {
-  describe('Vis Component', function () {
-    describe(require('specs/components/vis/_AggConfig'));
-    describe(require('specs/components/vis/_AggConfigResult'));
-    describe(require('specs/components/vis/_AggConfigs'));
-    describe(require('specs/components/vis/_Vis'));
-  });
-});
diff --git a/test/unit/specs/components/vislib_vis_type/_VislibRenderbot.js b/test/unit/specs/components/vislib_vis_type/_VislibRenderbot.js
deleted file mode 100644
index 9880bf36f7088..0000000000000
--- a/test/unit/specs/components/vislib_vis_type/_VislibRenderbot.js
+++ /dev/null
@@ -1,168 +0,0 @@
-define(function (require) {
-  return ['renderbot', function exportWrapper() {
-    var _ = require('lodash');
-    var $ = require('jquery');
-    var sinon = require('test_utils/auto_release_sinon');
-    var vislib;
-    var Vis;
-    var Renderbot;
-    var VislibRenderbot;
-    var normalizeChartData;
-    var mockVisType = {
-      name: 'test'
-    };
-
-    function init() {
-      module('kibana');
-
-      inject(function ($injector, Private, _vislib_) {
-        vislib = _vislib_;
-        Vis = Private(require('components/vislib/vis'));
-        Renderbot = Private(require('components/vis/Renderbot'));
-        VislibRenderbot = Private(require('components/vislib_vis_type/VislibRenderbot'));
-        normalizeChartData = Private(require('components/agg_response/index'));
-      });
-    }
-
-    beforeEach(init);
-
-    describe('creation', function () {
-      var vis = { type: mockVisType };
-      var $el = 'element';
-      var createVisStub;
-      var renderbot;
-
-      beforeEach(function () {
-        createVisStub = sinon.stub(VislibRenderbot.prototype, '_createVis', _.noop);
-        renderbot = new VislibRenderbot(vis, $el);
-      });
-
-      it('should be a Renderbot', function () {
-        expect(renderbot).to.be.a(Renderbot);
-      });
-
-      it('should create a new Vis object', function () {
-        expect(createVisStub.callCount).to.be(1);
-      });
-    });
-
-    describe('_createVis', function () {
-      var vis = {
-        type: mockVisType,
-        listeners: {
-          'test': _.noop,
-          'test2': _.noop,
-          'test3': _.noop
-        }
-      };
-      var $el = $('<div>testing</div>');
-      var listenerSpy;
-      var renderbot;
-
-      beforeEach(function () {
-        sinon.stub(VislibRenderbot.prototype, '_getVislibParams', _.constant({}));
-        listenerSpy = sinon.spy(vislib.Vis.prototype, 'on');
-        renderbot = new VislibRenderbot(vis, $el);
-      });
-
-      it('should attach listeners and set vislibVis', function () {
-        expect(listenerSpy.callCount).to.be(3);
-        expect(listenerSpy.calledWith('test', _.noop)).to.be(true);
-        expect(renderbot.vislibVis).to.be.a(Vis);
-      });
-    });
-
-    describe('param update', function () {
-      var params = { one: 'fish', two: 'fish' };
-      var vis = {
-        type: _.defaults({
-          params: {
-            defaults: params
-          }
-        }, mockVisType)
-      };
-      var $el = $('<div>testing</div>');
-      var createVisSpy;
-      var getParamsStub;
-      var renderbot;
-
-      beforeEach(function () {
-        createVisSpy = sinon.spy(VislibRenderbot.prototype, '_createVis');
-        // getParamsStub = sinon.stub(VislibRenderbot.prototype, '_getVislibParams', _identity);
-        // getParamsStub.returns(params);
-        renderbot = new VislibRenderbot(vis, $el);
-      });
-
-      it('should create a new Vis object when params change', function () {
-        // called on init
-        expect(createVisSpy.callCount).to.be(1);
-        renderbot.updateParams(_.clone(params));
-        // not called again, same params
-        expect(createVisSpy.callCount).to.be(1);
-        renderbot.vis.params = { one: 'fishy', two: 'fishy' };
-        renderbot.updateParams();
-        // called again, new params
-        expect(createVisSpy.callCount).to.be(2);
-        renderbot.updateParams();
-        // same params again, no new call
-        expect(createVisSpy.callCount).to.be(2);
-      });
-    });
-
-    describe('render', function () {
-      var vis = { type: mockVisType, isHierarchical: _.constant(false) };
-      var $el = $('<div>testing</div>');
-      var renderbot;
-      var stubs = {};
-
-      beforeEach(function () {
-        sinon.stub(VislibRenderbot.prototype, '_getVislibParams', _.constant({}));
-      });
-
-      it('should use #buildChartData', function () {
-        var renderbot = new VislibRenderbot(vis, $el);
-
-        var football = {};
-        var buildStub = sinon.stub(renderbot, 'buildChartData', _.constant(football));
-        var renderStub = sinon.stub(renderbot.vislibVis, 'render');
-
-        renderbot.render('flat data');
-        expect(renderStub.callCount).to.be(1);
-        expect(buildStub.callCount).to.be(1);
-        expect(renderStub.firstCall.args[0]).to.be(football);
-      });
-    });
-
-    describe('destroy', function () {
-      var vis = {
-        type: mockVisType,
-        listeners: {
-          'test': _.noop,
-          'test2': _.noop,
-          'test3': _.noop
-        }
-      };
-      var $el = $('<div>testing</div>');
-      var listenerSpy;
-      var renderbot;
-
-      beforeEach(function () {
-        sinon.stub(VislibRenderbot.prototype, '_getVislibParams', _.constant({}));
-        listenerSpy = sinon.spy(vislib.Vis.prototype, 'off');
-        renderbot = new VislibRenderbot(vis, $el);
-      });
-
-      it('should detatch listeners', function () {
-        renderbot.destroy();
-        expect(listenerSpy.callCount).to.be(3);
-        expect(listenerSpy.calledWith('test', _.noop)).to.be(true);
-      });
-
-      it('should destroy the vis', function () {
-        var spy = sinon.spy(renderbot.vislibVis, 'destroy');
-        renderbot.destroy();
-        expect(spy.callCount).to.be(1);
-      });
-    });
-  }];
-});
diff --git a/test/unit/specs/components/vislib_vis_type/_buildChartData.js b/test/unit/specs/components/vislib_vis_type/_buildChartData.js
deleted file mode 100644
index 01afdddab0b16..0000000000000
--- a/test/unit/specs/components/vislib_vis_type/_buildChartData.js
+++ /dev/null
@@ -1,135 +0,0 @@
-define(function (require) {
-  return ['renderbot#buildChartData', function () {
-    var _ = require('lodash');
-    var sinon = require('test_utils/auto_release_sinon');
-
-    var VislibRenderbot;
-    var buildChartData;
-    var aggResponse;
-    var TableGroup;
-    var Table;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private) {
-      Table = Private(require('components/agg_response/tabify/_table'));
-      TableGroup = Private(require('components/agg_response/tabify/_table_group'));
-      aggResponse = Private(require('components/agg_response/index'));
-      VislibRenderbot = Private(require('components/vislib_vis_type/VislibRenderbot'));
-      buildChartData = Private(require('components/vislib_vis_type/buildChartData'));
-    }));
-
-    describe('for hierarchical vis', function () {
-      it('defers to hierarchical aggResponse converter', function () {
-        var football = {};
-        var renderbot = {
-          vis: {
-            isHierarchical: _.constant(true)
-          }
-        };
-
-        var stub = sinon.stub(aggResponse, 'hierarchical').returns(football);
-        expect(buildChartData.call(renderbot, football)).to.be(football);
-        expect(stub).to.have.property('callCount', 1);
-        expect(stub.firstCall.args[0]).to.be(renderbot.vis);
-        expect(stub.firstCall.args[1]).to.be(football);
-      });
-    });
-
-    describe('for point plot', function () {
-      it('calls tabify to simplify the data into a table', function () {
-        var renderbot = {
-          vis: {
-            isHierarchical: _.constant(false)
-          }
-        };
-        var football = { tables: [], hits: { total: 1 } };
-
-        var stub = sinon.stub(aggResponse, 'tabify').returns(football);
-        expect(buildChartData.call(renderbot, football)).to.eql({ rows: [], hits: 1 });
-        expect(stub).to.have.property('callCount', 1);
-        expect(stub.firstCall.args[0]).to.be(renderbot.vis);
-        expect(stub.firstCall.args[1]).to.be(football);
-      });
-
-      it('returns a single chart if the tabify response contains only a single table', function () {
-        var chart = { hits: 1, rows: [], columns: [] };
-        var renderbot = {
-          vis: {
-            isHierarchical: _.constant(false),
-            type: {
-              responseConverter: _.constant(chart)
-            }
-          }
-        };
-        var esResp = { hits: { total: 1 } };
-        var tabbed = { tables: [ new Table() ] };
-
-        sinon.stub(aggResponse, 'tabify').returns(tabbed);
-        expect(buildChartData.call(renderbot, esResp)).to.eql(chart);
-      });
-
-      it('converts table groups into rows/columns wrappers for charts', function () {
-        var chart = { hits: 1, rows: [], columns: [] };
-        var converter = sinon.stub().returns('chart');
-        var esResp = { hits: { total: 1 } };
-        var tables = [new Table(), new Table(), new Table(), new Table()];
-
-        var renderbot = {
-          vis: {
-            isHierarchical: _.constant(false),
-            type: {
-              responseConverter: converter
-            }
-          }
-        };
-
-        var tabify = sinon.stub(aggResponse, 'tabify').returns({
-          tables: [
-            {
-              aggConfig: { params: { row: true } },
-              tables: [
-                {
-                  aggConfig: { params: { row: false } },
-                  tables: [ tables[0] ]
-                },
-                {
-                  aggConfig: { params: { row: false } },
-                  tables: [ tables[1] ]
-                }
-              ]
-            },
-            {
-              aggConfig: { params: { row: true } },
-              tables: [
-                {
-                  aggConfig: { params: { row: false } },
-                  tables: [ tables[2] ]
-                },
-                {
-                  aggConfig: { params: { row: false } },
-                  tables: [ tables[3] ]
-                }
-              ]
-            }
-          ]
-        });
-
-        var chartData = buildChartData.call(renderbot, esResp);
-
-        // verify tables were converted
-        expect(converter).to.have.property('callCount', 4);
-        expect(converter.args[0][1]).to.be(tables[0]);
-        expect(converter.args[1][1]).to.be(tables[1]);
-        expect(converter.args[2][1]).to.be(tables[2]);
-        expect(converter.args[3][1]).to.be(tables[3]);
-
-        expect(chartData).to.have.property('rows');
-        expect(chartData.rows).to.have.length(2);
-        chartData.rows.forEach(function (row) {
-          expect(row).to.have.property('columns');
-          expect(row.columns).to.eql([ 'chart', 'chart' ]);
-        });
-      });
-    });
-  }];
-});
diff --git a/test/unit/specs/components/vislib_vis_type/index.js b/test/unit/specs/components/vislib_vis_type/index.js
deleted file mode 100644
index d662a2f1c2040..0000000000000
--- a/test/unit/specs/components/vislib_vis_type/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-define(function (require) {
-  describe('Vis Type', function () {
-    describe(require('specs/components/vislib_vis_type/_VislibRenderbot'));
-    describe(require('specs/components/vislib_vis_type/_buildChartData'));
-  });
-});
diff --git a/test/unit/specs/components/watch_multi.js b/test/unit/specs/components/watch_multi.js
deleted file mode 100644
index 290a9ddfcecf1..0000000000000
--- a/test/unit/specs/components/watch_multi.js
+++ /dev/null
@@ -1,200 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  describe('$scope.$watchMulti', function () {
-    var sinon = require('test_utils/auto_release_sinon');
-
-    var $rootScope;
-    var $scope;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function ($injector) {
-      $rootScope = $injector.get('$rootScope');
-      $scope = $rootScope.$new();
-    }));
-
-    describe('basic functionality', function () {
-      it('exposes $watchMulti on all scopes', function () {
-        expect($rootScope.$watchMulti).to.be.a('function');
-        expect($scope).to.have.property('$watchMulti', $rootScope.$watchMulti);
-
-        var $isoScope = $scope.$new(true);
-        expect($isoScope).to.have.property('$watchMulti', $rootScope.$watchMulti);
-      });
-
-      it('returns a working unwatch function', function () {
-        $scope.a = 0;
-        $scope.b = 0;
-        var triggers = 0;
-        var unwatch = $scope.$watchMulti(['a', 'b'], function () { triggers++; });
-
-        // initial watch
-        $scope.$apply();
-        expect(triggers).to.be(1);
-
-        // prove that it triggers on chagne
-        $scope.a++;
-        $scope.$apply();
-        expect(triggers).to.be(2);
-
-        // remove watchers
-        expect($scope.$$watchers).to.not.eql([]);
-        unwatch();
-        expect($scope.$$watchers).to.eql([]);
-
-        // prove that it doesn't trigger anymore
-        $scope.a++;
-        $scope.$apply();
-        expect(triggers).to.be(2);
-      });
-    });
-
-    describe('simple scope watchers', function () {
-      it('only triggers a single watch on initialization', function () {
-        var stub = sinon.stub();
-
-        $scope.$watchMulti([
-          'one',
-          'two',
-          'three'
-        ], stub);
-        $rootScope.$apply();
-
-        expect(stub.callCount).to.be(1);
-      });
-
-      it('only triggers a single watch when multiple values change', function () {
-        var stub = sinon.spy(function (a, b) {});
-
-        $scope.$watchMulti([
-          'one',
-          'two',
-          'three'
-        ], stub);
-
-        $rootScope.$apply();
-        expect(stub.callCount).to.be(1);
-
-        $scope.one = 'a';
-        $scope.two = 'b';
-        $scope.three = 'c';
-        $rootScope.$apply();
-
-        expect(stub.callCount).to.be(2);
-      });
-
-      it('passes an array of the current and previous values, in order',
-      function () {
-        var stub = sinon.spy(function (a, b) {});
-
-        $scope.one = 'a';
-        $scope.two = 'b';
-        $scope.three = 'c';
-        $scope.$watchMulti([
-          'one',
-          'two',
-          'three'
-        ], stub);
-
-        $rootScope.$apply();
-        expect(stub.firstCall.args).to.eql([
-          ['a', 'b', 'c'],
-          ['a', 'b', 'c']
-        ]);
-
-        $scope.one = 'do';
-        $scope.two = 're';
-        $scope.three = 'mi';
-        $rootScope.$apply();
-
-        expect(stub.secondCall.args).to.eql([
-          ['do', 're', 'mi'],
-          ['a', 'b', 'c']
-        ]);
-      });
-
-      it('always has an up to date value', function () {
-        var count = 0;
-
-        $scope.vals = [1, 0];
-        $scope.$watchMulti([ 'vals[0]', 'vals[1]' ], function (cur, prev) {
-          expect(cur).to.eql($scope.vals);
-          count++;
-        });
-
-        var $child = $scope.$new();
-        $child.$watch('vals[0]', function (cur) {
-          $child.vals[1] = cur;
-        });
-
-        $rootScope.$apply();
-        expect(count).to.be(2);
-      });
-    });
-
-    describe('complex watch expressions', function () {
-      var stateWatchers;
-      var firstValue;
-      var secondValue;
-
-      beforeEach(function () {
-        var firstGetter = function () {
-          return firstValue;
-        };
-
-        var secondGetter = function () {
-          return secondValue;
-        };
-
-        stateWatchers = [{
-          fn: $rootScope.$watch,
-          get: firstGetter
-        }, {
-          fn: $rootScope.$watch,
-          get: secondGetter
-        }];
-      });
-
-      it('should trigger the watcher on initialization', function () {
-        var stub = sinon.stub();
-        firstValue = 'first';
-        secondValue = 'second';
-
-        $scope.$watchMulti(stateWatchers, stub);
-        $rootScope.$apply();
-
-        expect(stub.callCount).to.be(1);
-
-        expect(stub.firstCall.args[0]).to.eql([firstValue, secondValue]);
-        expect(stub.firstCall.args[1]).to.eql([firstValue, secondValue]);
-      });
-    });
-
-    describe('nested watchers', function () {
-      it('should trigger the handler at least once', function () {
-        var $scope = $rootScope.$new();
-        $scope.$$watchers = [{
-          get: _.noop,
-          fn: _.noop,
-          eq: false,
-          last: false
-        }, {
-          get: _.noop,
-          fn: registerWatchers,
-          eq: false,
-          last: false
-        }];
-
-        var first = sinon.stub();
-        var second = sinon.stub();
-
-        function registerWatchers() {
-          $scope.$watchMulti([first, second], function () {
-            expect(first.callCount).to.be.greaterThan(0);
-            expect(second.callCount).to.be.greaterThan(0);
-          });
-        }
-        $scope.$digest();
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/courier/data_source/decorate_query.js b/test/unit/specs/courier/data_source/decorate_query.js
deleted file mode 100644
index b75438fd917c5..0000000000000
--- a/test/unit/specs/courier/data_source/decorate_query.js
+++ /dev/null
@@ -1,40 +0,0 @@
-define(function (require) {
-  var moment = require('moment');
-  describe('Query decorator', function () {
-
-    var _ = require('lodash');
-    var config;
-
-    var indexPattern, getComputedFields, fn;
-    beforeEach(function () {
-      module('kibana');
-
-      module('kibana', function ($provide) {
-
-        // Super simple config stub
-        $provide.service('config', function () {
-          var keys = {};
-          return {
-            get: function (key) { return keys[key]; },
-            set: function (key, value) { keys[key] = value; }
-          };
-        });
-      });
-    });
-
-    beforeEach(inject(function (Private, $injector, _config_) {
-      config = _config_;
-      fn = Private(require('components/courier/data_source/_decorate_query'));
-    }));
-
-    it('should be a function', function () {
-      expect(fn).to.be.a(Function);
-    });
-
-    it('should merge in the query string options', function () {
-      config.set('query:queryString:options', {analyze_wildcard: true});
-      expect(fn({query_string: {query: '*'}})).to.eql({query_string: {query: '*', analyze_wildcard: true}});
-    });
-
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/courier/fetch/doc.js b/test/unit/specs/courier/fetch/doc.js
deleted file mode 100644
index 2b21998529a5f..0000000000000
--- a/test/unit/specs/courier/fetch/doc.js
+++ /dev/null
@@ -1,105 +0,0 @@
-define(function (require) {
-  describe('Courier DocFetchRequest class', function () {
-    var sinon = require('test_utils/auto_release_sinon');
-
-    var storage;
-    var source;
-    var defer;
-    var req;
-
-    var setVersion;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private, Promise, $injector) {
-      var DocSource = Private(require('components/courier/data_source/doc_source'));
-      var DocFetchRequest = Private(require('components/courier/fetch/request/doc'));
-
-      storage =
-      $injector.get('localStorage').store =
-      $injector.get('sessionStorage').store = {
-        getItem: sinon.stub(),
-        setItem: sinon.stub(),
-        removeItem: sinon.stub(),
-        clear: sinon.stub()
-      };
-
-      source = new DocSource({})
-      .set('index', 'doc-index')
-      .set('type', 'doc-type')
-      .set('id', 'doc-id');
-
-      defer = Promise.defer();
-
-      req = new DocFetchRequest(source, defer);
-
-      /**
-       * Setup the version numbers for tests. There are two versions for the
-       * purposes of these tests.
-       *
-       * @param {number} mine - the version that the DocSource most
-       *                      recently received from elasticsearch.
-       * @param {number} theirs - the version that other DocSources have
-       *                        received from elasticsearfch.
-       */
-      setVersion = function (mine, theirs) {
-        // mine – the version the source think is accurate
-        // theirs - the version other sources think is accurate
-
-        source._version = mine;
-        storage.getItem.withArgs(source._versionKey()).returns(theirs);
-      };
-    }));
-
-    describe('#canStart', function () {
-      it('can if the doc is unknown', function () {
-        setVersion(undefined, undefined);
-
-        expect(req.canStart()).to.be(true);
-      });
-
-      it('cannot if the doc is unknown but the request is already in progress', function () {
-        setVersion(undefined, undefined);
-        req.start();
-
-        expect(req.canStart()).to.be(false);
-      });
-
-      it('can if the doc is out of date', function () {
-        setVersion(1, 2);
-
-        expect(req.canStart()).to.be(true);
-      });
-
-      it('can if the doc is out of date and the request is in progress', function () {
-        setVersion(1, 2);
-        req.start();
-
-        expect(req.canStart()).to.be(true);
-      });
-
-      it('cannot if the doc is up to date', function () {
-        setVersion(2, 2);
-
-        expect(req.canStart()).to.be(false);
-      });
-
-      it('can if the doc is overdated', function () {
-        setVersion(5, 2);
-
-        expect(req.canStart()).to.be(true);
-      });
-
-      it('can if shared version is cleared', function () {
-        setVersion(10, undefined);
-
-        expect(req.canStart()).to.be(true);
-      });
-
-      it('can if everyone else has a doc', function () {
-        setVersion(undefined, 10);
-
-        expect(req.canStart()).to.be(true);
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/directives/auto_select_if_only_one.js b/test/unit/specs/directives/auto_select_if_only_one.js
deleted file mode 100644
index bae3314aafa42..0000000000000
--- a/test/unit/specs/directives/auto_select_if_only_one.js
+++ /dev/null
@@ -1,50 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  require('directives/auto_select_if_only_one');
-
-  describe('Auto-select if only one directive', function () {
-    var $compile, $rootScope;
-    var html = '<select ng-model="value" ng-options="option.name for option in options" auto-select-if-only-one="options"></select>';
-    var zeroOptions = [];
-    var oneOption = [{label: 'foo'}];
-    var multiOptions = [{label: 'foo'}, {label: 'bar'}];
-
-    beforeEach(module('kibana'));
-
-    beforeEach(inject(function (_$compile_, _$rootScope_) {
-      $compile = _$compile_;
-      $rootScope = _$rootScope_;
-      $compile(html)($rootScope);
-      $rootScope.value = null;
-    }));
-
-    it('should not auto-select if there are no options', function () {
-      $rootScope.options = zeroOptions;
-      $rootScope.$digest();
-      expect($rootScope.value).to.not.be.ok();
-    });
-
-    it('should not auto-select if there are multiple options', function () {
-      $rootScope.options = multiOptions;
-      $rootScope.$digest();
-      expect($rootScope.value).to.not.be.ok();
-    });
-
-    it('should auto-select if there is only one option', function () {
-      $rootScope.options = oneOption;
-      $rootScope.$digest();
-      expect($rootScope.value).to.be(oneOption[0]);
-    });
-
-    it('should still auto select if the collection contains 2 items but is filtered to 1', function () {
-      $rootScope.options = multiOptions;
-      var html = '<select ng-model="value" ng-options="option.name for option in options | filter:{label:\'bar\'}" ' +
-      'auto-select-if-only-one="options | filter:{label:\'bar\'}"></select>';
-      $compile(html)($rootScope);
-      $rootScope.value = null;
-      $rootScope.$digest();
-
-      expect($rootScope.value).to.be(multiOptions[1]);
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/directives/confirm-click.js b/test/unit/specs/directives/confirm-click.js
deleted file mode 100644
index 37eeb352fd02e..0000000000000
--- a/test/unit/specs/directives/confirm-click.js
+++ /dev/null
@@ -1,123 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var $ = require('jquery');
-  var sinon = require('sinon/sinon');
-
-  require('directives/confirm_click');
-
-  // Load the kibana app dependencies.
-  require('angular-route');
-
-  require('plugins/discover/index');
-
-  var $parentScope, $scope, $elem;
-
-  var init = function (text) {
-    // Load the application
-    module('kibana');
-
-    // Create the scope
-    inject(function ($rootScope, $compile) {
-
-      // Give us a scope
-      $parentScope = $rootScope;
-
-      // Create the element
-      $elem = angular.element(
-        '<a confirm-click="runThis()">runThis</a>'
-      );
-
-      // And compile it
-      $compile($elem)($parentScope);
-
-      // Fire a digest cycle
-      $elem.scope().$digest();
-
-      // Grab the isolate scope so we can test it
-      $scope = $elem.scope();
-
-      // Add a function to check the run status of.
-      $scope.runThis = sinon.spy();
-    });
-  };
-
-
-  describe('confirmClick directive', function () {
-
-
-    describe('event handlers', function () {
-      var events;
-
-      beforeEach(function () {
-        init();
-        events = $._data($elem[0], 'events');
-      });
-
-      it('should get a click handler', function (done) {
-        expect(events).to.be.a(Object);
-        expect(events.click).to.be.a(Array);
-        done();
-      });
-
-      it('should unbind click handlers when the scope is destroyed', function (done) {
-        $scope.$destroy();
-        expect(events.click).to.be(undefined);
-        done();
-      });
-
-    });
-
-
-
-    describe('confirmed', function () {
-      var confirmed;
-
-      beforeEach(function () {
-        init();
-        confirmed = sinon.stub(window, 'confirm');
-        confirmed.returns(true);
-      });
-
-      afterEach(function () {
-        window.confirm.restore();
-      });
-
-      it('should trigger window.confirm when clicked', function (done) {
-        $elem.click();
-        expect(confirmed.called).to.be(true);
-        done();
-      });
-
-      it('should run the click function when positively confirmed', function (done) {
-        $elem.click();
-        expect($scope.runThis.called).to.be(true);
-        done();
-      });
-
-    });
-
-    describe('not confirmed', function () {
-      var confirmed;
-
-      beforeEach(function () {
-        init();
-        confirmed = sinon.stub(window, 'confirm');
-        confirmed.returns(false);
-      });
-
-      afterEach(function () {
-        window.confirm.restore();
-      });
-
-      it('should not run the click function when canceled', function (done) {
-        $elem.click();
-        expect($scope.runThis.called).to.be(false);
-        done();
-      });
-
-    });
-
-
-  });
-
-});
diff --git a/test/unit/specs/directives/css_truncate.js b/test/unit/specs/directives/css_truncate.js
deleted file mode 100644
index 15de5f7ef5f53..0000000000000
--- a/test/unit/specs/directives/css_truncate.js
+++ /dev/null
@@ -1,64 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var $ = require('jquery');
-
-  require('angular-route');
-  require('plugins/discover/index');
-
-  var $parentScope, $scope, $elem;
-
-  var init = function (expandable) {
-    // Load the application
-    module('kibana');
-
-    // Create the scope
-    inject(function ($rootScope, $compile) {
-
-      // Give us a scope
-      $parentScope = $rootScope;
-
-      // Create the element
-      $elem = angular.element(
-        '<span css-truncate ' + (expandable ? 'css-truncate-expandable' : '') + '>this isnt important</span>'
-      );
-
-      // And compile it
-      $compile($elem)($parentScope);
-
-      // Fire a digest cycle
-      $elem.scope().$digest();
-
-      // Grab the isolate scope so we can test it
-      $scope = $elem.isolateScope();
-    });
-  };
-
-
-  describe('cssTruncate directive', function () {
-
-    describe('expandable', function () {
-
-      beforeEach(function () {
-        init(true);
-      });
-
-      it('should set text-overflow to ellipsis and whitespace to nowrap', function (done) {
-        expect($elem.css('text-overflow')).to.be('ellipsis');
-        expect($elem.css('white-space')).to.be('nowrap');
-        done();
-      });
-
-      it('should set white-space to normal when clicked, and back to nowrap when clicked again', function (done) {
-        $scope.toggle();
-        expect($elem.css('white-space')).to.be('normal');
-
-        $scope.toggle();
-        expect($elem.css('white-space')).to.be('nowrap');
-        done();
-      });
-
-    });
-
-  });
-
-});
diff --git a/test/unit/specs/directives/fixedScroll.js b/test/unit/specs/directives/fixedScroll.js
deleted file mode 100644
index db8688e018259..0000000000000
--- a/test/unit/specs/directives/fixedScroll.js
+++ /dev/null
@@ -1,159 +0,0 @@
-define(function (require) {
-  require('components/fixedScroll');
-
-  describe('FixedScroll directive', function () {
-    var $ = require('jquery');
-    var sinon = require('test_utils/auto_release_sinon');
-    var Promise = require('bluebird');
-
-    var compile;
-    var trash = [];
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function ($compile, $rootScope) {
-
-      compile = function (ratioY, ratioX) {
-        if (ratioX == null) ratioX = ratioY;
-
-        // since the directive works at the sibling level we create a
-        // parent for everything to happen in
-        var $parent = $('<div>').css({
-          position: 'fixed',
-          top: 0,
-          left: 0,
-          right: 0,
-          bottom: 0
-        });
-
-        $parent.appendTo(document.body);
-        trash.push($parent);
-
-        var $el = $('<div fixed-scroll></div>').css({
-          'overflow-x': 'auto',
-          'width': $parent.width()
-        }).appendTo($parent);
-
-        var $content = $('<div>').css({
-          width: $parent.width() * ratioX,
-          height: $parent.height() * ratioY
-        }).appendTo($el);
-
-        $compile($parent)($rootScope);
-        $rootScope.$digest();
-
-        return {
-          $container: $el,
-          $content: $content,
-          $scroller: $parent.find('.fixed-scroll-scroller')
-        };
-      };
-
-    }));
-
-    afterEach(function () {
-      trash.splice(0).forEach(function ($el) {
-        $el.remove();
-      });
-    });
-
-    it('does nothing when not needed', function () {
-      var els = compile(0.5, 1.5);
-      expect(els.$scroller).to.have.length(0);
-
-      els = compile(1.5, 0.5);
-      expect(els.$scroller).to.have.length(0);
-    });
-
-    it('attaches a scroller below the element when the content is larger then the container', function () {
-      var els = compile(1.5);
-      expect(els.$scroller).to.have.length(1);
-    });
-
-    it('copies the width of the container', function () {
-      var els = compile(1.5);
-      expect(els.$scroller.width()).to.be(els.$container.width());
-    });
-
-    it('mimics the scrollWidth of the element', function () {
-      var els = compile(1.5);
-      expect(els.$scroller.prop('scrollWidth')).to.be(els.$container.prop('scrollWidth'));
-    });
-
-    describe('scroll event handling / tug of war prevention', function () {
-      it('listens when needed, unlistens when not needed', function () {
-        var on = sinon.spy($.fn, 'on');
-        var off = sinon.spy($.fn, 'off');
-
-        function checkThisVals(name, spy) {
-          // the this values should be different
-          expect(spy.thisValues[0].is(spy.thisValues[1])).to.be(false);
-          // but they should be either $scroller or $container
-          spy.thisValues.forEach(function ($this) {
-            if ($this.is(els.$scroller) || $this.is(els.$container)) return;
-            expect.fail('expected ' + name + ' to be called with $scroller or $container');
-          });
-        }
-
-        var els = compile(1.5);
-        expect(on.callCount).to.be(2);
-        checkThisVals('$.fn.on', on);
-
-        expect(off.callCount).to.be(0);
-        els.$container.width(els.$container.prop('scrollWidth'));
-        els.$container.scope().$digest();
-        expect(off.callCount).to.be(2);
-
-        checkThisVals('$.fn.off', off);
-      });
-
-      [
-        { from: '$container', to: '$scroller' },
-        { from: '$scroller', to: '$container' }
-      ].forEach(function (names) {
-        describe('scroll events ' + JSON.stringify(names), function () {
-          var spy;
-          var els;
-          var $from;
-          var $to;
-
-          beforeEach(function () {
-            spy = sinon.spy($.fn, 'scrollLeft');
-            els = compile(1.5);
-            $from = els[names.from];
-            $to = els[names.to];
-          });
-
-          it('transfers the scrollLeft', function () {
-            expect(spy.callCount).to.be(0);
-            $from.scroll();
-            expect(spy.callCount).to.be(2);
-
-            // first call should read the scrollLeft from the $container
-            var firstCall = spy.getCall(0);
-            expect(firstCall.thisValue.is($from)).to.be(true);
-            expect(firstCall.args).to.eql([]);
-
-            // second call should be setting the scrollLeft on the $scroller
-            var secondCall = spy.getCall(1);
-            expect(secondCall.thisValue.is($to)).to.be(true);
-            expect(secondCall.args).to.eql([firstCall.returnValue]);
-          });
-
-          /**
-           * In practice, calling $el.scrollLeft() causes the "scroll" event to trigger,
-           * but the browser seems to be very careful about triggering the event too much
-           * and I can't reliably recreate the browsers behavior in a test. So... faking it!
-           */
-          it('prevents tug of war by ignoring echo scroll events', function () {
-            $from.scroll();
-            expect(spy.callCount).to.be(2);
-
-            spy.reset();
-            $to.scroll();
-            expect(spy.callCount).to.be(0);
-          });
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/directives/inequality.js b/test/unit/specs/directives/inequality.js
deleted file mode 100644
index 3e4c580abf3d7..0000000000000
--- a/test/unit/specs/directives/inequality.js
+++ /dev/null
@@ -1,72 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  require('directives/inequality');
-
-  describe('greater_than model validator directive', function () {
-    var $compile, $rootScope;
-    var html;
-
-    beforeEach(module('kibana'));
-
-    beforeEach(inject(function (_$compile_, _$rootScope_) {
-      $compile = _$compile_;
-      $rootScope = _$rootScope_;
-    }));
-
-    // no value is the same as 0
-    describe('without value', function () {
-      var element;
-      beforeEach(function () {
-        html = '<input type="text" ng-model="value" greater-than />';
-        element = $compile(html)($rootScope);
-      });
-
-      it('should be valid when larger than 0', function () {
-        $rootScope.value = '1';
-        $rootScope.$digest();
-        expect(element.hasClass('ng-valid')).to.be.ok();
-      });
-
-      it('should be valid for 0', function () {
-        $rootScope.value = '0';
-        $rootScope.$digest();
-        expect(element.hasClass('ng-valid')).to.be.ok();
-      });
-
-      it('should be valid for negatives', function () {
-        $rootScope.value = '-10';
-        $rootScope.$digest();
-        expect(element.hasClass('ng-valid')).to.be.ok();
-      });
-    });
-
-    [0, 1, 10, 42, -12].forEach(function (num) {
-      describe('with value ' + num, function () {
-        var element;
-        beforeEach(function () {
-          html = '<input type="text" ng-model="value" greater-than="' + num + '" />';
-          element = $compile(html)($rootScope);
-        });
-
-        it('should be valid when larger than ' + num, function () {
-          $rootScope.value = num + 1;
-          $rootScope.$digest();
-          expect(element.hasClass('ng-valid')).to.be.ok();
-        });
-
-        it('should be invalid for ' + num, function () {
-          $rootScope.value = num;
-          $rootScope.$digest();
-          expect(element.hasClass('ng-invalid')).to.be.ok();
-        });
-
-        it('should be invalid for less than ' + num, function () {
-          $rootScope.value = num - 1;
-          $rootScope.$digest();
-          expect(element.hasClass('ng-invalid')).to.be.ok();
-        });
-      });
-    });
-
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/directives/input_focus.js b/test/unit/specs/directives/input_focus.js
deleted file mode 100644
index 77c2d7be39cdd..0000000000000
--- a/test/unit/specs/directives/input_focus.js
+++ /dev/null
@@ -1,53 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var $ = require('jquery');
-  require('directives/input_focus');
-
-  describe('Input focus directive', function () {
-    var $compile, $rootScope, $timeout, element;
-    var $el, selectedEl, selectedText;
-    var inputValue = 'Input Text Value';
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (_$compile_, _$rootScope_, _$timeout_) {
-      $compile = _$compile_;
-      $rootScope = _$rootScope_;
-      $timeout = _$timeout_;
-
-      $el = $('<div>');
-      $el.appendTo('body');
-    }));
-
-    afterEach(function () {
-      $el.remove();
-      $el = null;
-    });
-
-    function renderEl(html) {
-      $rootScope.value = inputValue;
-      element = $compile(html)($rootScope);
-      element.appendTo($el);
-      $rootScope.$digest();
-      $timeout.flush();
-      selectedEl = document.activeElement;
-      selectedText = selectedEl.value.slice(
-        selectedEl.selectionStart,
-        selectedEl.selectionEnd
-      );
-    }
-
-
-    it('should focus the input', function () {
-      renderEl('<input type="text" ng-model="value" input-focus />');
-      expect(selectedEl).to.equal(element[0]);
-      expect(selectedText.length).to.equal(0);
-    });
-
-    it('should select the text in the input', function () {
-      renderEl('<input type="text" ng-model="value" input-focus="select" />');
-      expect(selectedEl).to.equal(element[0]);
-      expect(selectedText.length).to.equal(inputValue.length);
-      expect(selectedText).to.equal(inputValue);
-    });
-  });
-});
diff --git a/test/unit/specs/directives/input_whole_number.js b/test/unit/specs/directives/input_whole_number.js
deleted file mode 100644
index 07c0226ec4df1..0000000000000
--- a/test/unit/specs/directives/input_whole_number.js
+++ /dev/null
@@ -1,48 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  require('directives/input_whole_number');
-
-  describe('Whole number input directive', function () {
-    var $compile, $rootScope;
-    var html = '<input type="text" ng-model="value" input-whole-number />';
-
-    beforeEach(module('kibana'));
-
-    beforeEach(inject(function (_$compile_, _$rootScope_) {
-      $compile = _$compile_;
-      $rootScope = _$rootScope_;
-    }));
-
-    it('should allow whole numbers', function () {
-      var element = $compile(html)($rootScope);
-
-      $rootScope.value = '123';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-
-      $rootScope.value = '1.0';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-
-      $rootScope.value = '-5.0';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-    });
-
-    it('should disallow numbers with decimals', function () {
-      var element = $compile(html)($rootScope);
-
-      $rootScope.value = '123.0';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-
-      $rootScope.value = '1.2';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-
-      $rootScope.value = '-5.5';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/directives/spinner.js b/test/unit/specs/directives/spinner.js
deleted file mode 100644
index 16ff9db1b4bcc..0000000000000
--- a/test/unit/specs/directives/spinner.js
+++ /dev/null
@@ -1,52 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var $ = require('jquery');
-
-  // Load the kibana app dependencies.
-  require('angular-route');
-
-  require('plugins/discover/index');
-
-  var $parentScope, $scope, $elem;
-
-  var init = function () {
-    // Load the application
-    module('kibana');
-
-    // Create the scope
-    inject(function ($rootScope, $compile) {
-
-      // Give us a scope
-      $parentScope = $rootScope;
-
-      // Create the element
-      $elem = angular.element(
-        '<span class="spinner"></span>'
-      );
-
-      // And compile it
-      $compile($elem)($parentScope);
-
-      // Fire a digest cycle
-      $elem.scope().$digest();
-
-      // Grab the isolate scope so we can test it
-      $scope = $elem.isolateScope();
-    });
-  };
-
-
-  describe('spinner directive', function () {
-
-    beforeEach(function () {
-      init();
-    });
-
-    it('should contain 3 divs', function (done) {
-      expect($elem.children('div').length).to.be(3);
-      done();
-    });
-
-  });
-
-});
diff --git a/test/unit/specs/directives/timepicker.js b/test/unit/specs/directives/timepicker.js
deleted file mode 100644
index 68a9f413f0c4f..0000000000000
--- a/test/unit/specs/directives/timepicker.js
+++ /dev/null
@@ -1,449 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var moment = require('moment');
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var sinon = require('test_utils/auto_release_sinon');
-
-
-  // Load the kibana app dependencies.
-  require('angular-route');
-
-  require('plugins/visualize/index');
-  require('plugins/dashboard/index');
-
-  // TODO: This should not be needed, timefilter is only included here, it should move
-  require('plugins/discover/index');
-
-  var $parentScope, $scope, $elem;
-  var anchor = '2014-01-01T06:06:06.666Z';
-  var clock;
-
-  var init = function () {
-    // Load the application
-    module('kibana');
-
-    // Stub out the clock so 'now' doesn't move
-    clock = sinon.useFakeTimers(moment(anchor).valueOf());
-
-    // Create the scope
-    inject(function ($rootScope, $compile) {
-
-      // Give us a scope
-      $parentScope = $rootScope;
-
-      // Add some parameters to it
-      var timefilter = {
-        time : {
-          from: moment().subtract(15, 'minutes'),
-          to: moment(),
-          mode: undefined
-        },
-        refreshInterval : {
-          value : 0,
-          display : 'Off'
-        }
-      };
-      $parentScope.timefilter = timefilter;
-
-      // Create the element
-      $elem = angular.element(
-        '<kbn-timepicker' +
-        ' from="timefilter.time.from"' +
-        ' to="timefilter.time.to"' +
-        ' mode="timefilter.time.mode"' +
-        ' active-tab="timefilter.timepickerActiveTab"' +
-        ' interval="timefilter.refreshInterval">' +
-        '</kbn-timepicker>'
-      );
-
-      // And compile it
-      $compile($elem)($parentScope);
-
-      // Fire a digest cycle
-      $elem.scope().$digest();
-
-      // Grab the isolate scope so we can test it
-      $scope = $elem.isolateScope();
-    });
-  };
-
-
-  describe('timepicker directive', function () {
-
-    describe('tabs', function () {
-
-      beforeEach(function () {
-        init();
-      });
-
-      it('should contain two tabs', function (done) {
-        expect($elem.find('.tab-pane').length).to.be(2);
-        done();
-      });
-    });
-
-    describe('refresh interval', function () {
-      var $courier;
-      beforeEach(function () {
-        init();
-        inject(function (courier, $rootScope) {
-          $courier = courier;
-          $rootScope.$apply();
-        });
-      });
-
-      it('should contain a list of options', function (done) {
-        expect($elem.find('.kbn-refresh-section').length).to.be.greaterThan(0);
-        done();
-      });
-
-      it('should have a $scope.setRefreshInterval() that sets interval variable', function (done) {
-        $scope.setRefreshInterval('interval');
-        expect($scope.interval).to.be('interval');
-        done();
-      });
-
-      it('should set the interval on the courier', function (done) {
-        // Change refresh interval and digest
-        $scope.setRefreshInterval({ value : 1000});
-        $elem.scope().$digest();
-        expect($courier.searchLooper.loopInterval()).to.be(1000);
-        done();
-      });
-
-      it('should disable the looper when paused', function (done) {
-        $scope.setRefreshInterval({ value : 1000, pause: true});
-        $elem.scope().$digest();
-        expect($courier.searchLooper.loopInterval()).to.be(0);
-        expect($scope.interval.value).to.be(1000);
-        done();
-      });
-
-      it('but keep interval.value set', function (done) {
-        $scope.setRefreshInterval({ value : 1000, pause: true});
-        $elem.scope().$digest();
-        expect($scope.interval.value).to.be(1000);
-        done();
-      });
-
-      it('should unpause when setRefreshInterval is called without pause:true', function (done) {
-        $scope.setRefreshInterval({ value : 1000, pause: true});
-        expect($scope.interval.pause).to.be(true);
-
-        $scope.setRefreshInterval({ value : 1000, pause: false});
-        expect($scope.interval.pause).to.be(false);
-
-        $scope.setRefreshInterval({ value : 1000});
-        expect($scope.interval.pause).to.be(false);
-
-        done();
-      });
-
-
-      it('should highlight the current active interval', function (done) {
-        $scope.setRefreshInterval({ value: 300000 });
-        $elem.scope().$digest();
-        expect($elem.find('.refresh-interval-active').length).to.be(1);
-        expect($elem.find('.refresh-interval-active').text().trim()).to.be('5 minutes');
-        done();
-      });
-
-      it('should default the interval on the courier with incorrect values', function (done) {
-        // Change refresh interval and digest
-        $scope.setRefreshInterval('undefined');
-        $elem.scope().$digest();
-        expect($courier.searchLooper.loopInterval()).to.be(0);
-        done();
-      });
-    });
-
-    describe('mode setting', function () {
-
-      beforeEach(function () {
-        init();
-      });
-
-      it('should be in quick mode by default', function (done) {
-        expect($scope.mode).to.be('quick');
-        done();
-      });
-
-      it('should highlight the right mode', function (done) {
-        expect($elem.find('.kbn-timepicker-modes .active').text().trim()).to.be('quick');
-
-        // Each of the 3 modes
-        var modes = ['absolute', 'relative', 'quick'];
-        _.each(modes, function (mode) {
-          $scope.setMode(mode);
-          $scope.$digest();
-          expect($elem.find('.kbn-timepicker-modes .active').text().trim()).to.be(mode);
-        });
-
-        done();
-      });
-    });
-
-    describe('quick mode', function () {
-
-      beforeEach(function () {
-        init();
-        $scope.setMode('quick');
-        $scope.$digest();
-      });
-
-      it('should contain 4 lists of options', function (done) {
-        expect($elem.find('.kbn-timepicker-section .list-unstyled').length).to.be(4);
-        done();
-      });
-
-      it('should have a $scope.setQuick() that sets the to and from variables to strings', function (done) {
-        $scope.setQuick('now', 'now');
-        expect($scope.from).to.be('now');
-        expect($scope.to).to.be('now');
-        done();
-      });
-    });
-
-    describe('relative mode', function () {
-
-      beforeEach(function () {
-        init();
-        $scope.setMode('relative');
-        $scope.$digest();
-      });
-
-      it('has a preview of the "from" input', function (done) {
-        var preview = $elem.find('.kbn-timepicker-section span[ng-show="relative.preview"]');
-        expect(preview.text()).to.be(moment().subtract(15, 'minutes').format($scope.format));
-        done();
-      });
-
-      it('has a disabled "to" field that contains "Now"', function (done) {
-        expect($elem.find('.kbn-timepicker-section input[disabled]').val()).to.be('Now');
-        done();
-      });
-
-      it('has a submit handler', function (done) {
-        var form = $elem.find('form[ng-submit="applyRelative()"]');
-        expect(form.length).to.be(1);
-        done();
-      });
-
-      it('disables the submit button if the form is invalid', function (done) {
-        var button;
-        button = $elem.find('button[disabled]');
-        expect(button.length).to.be(0);
-
-        // Make the form invalid
-        $scope.relative.count = 'foo';
-        $scope.formatRelative();
-        $scope.$digest();
-
-        button = $elem.find('button[disabled]');
-        expect(button.length).to.be(1);
-        done();
-      });
-
-      it('has a dropdown bound to relative.unit that contains all of the intervals', function (done) {
-        var select = $elem.find('.kbn-timepicker-section select[ng-model="relative.unit"]');
-        expect(select.length).to.be(1);
-        expect(select.find('option').length).to.be(7);
-
-        // Check each relative option, make sure it is in the list
-        _.each($scope.relativeOptions, function (unit, i) {
-          expect(select.find('option')[i].text).to.be(unit.text);
-        });
-        done();
-      });
-
-      it('has a checkbox that is checked when rounding is enabled', function (done) {
-        var checkbox = $elem.find('.kbn-timepicker-section input[ng-model="relative.round"]');
-        expect(checkbox.length).to.be(1);
-
-        // Rounding is disabled by default
-        expect(checkbox.attr('checked')).to.be(undefined);
-
-        // Enable rounding
-        $scope.relative.round = true;
-        $scope.$digest();
-        expect(checkbox.attr('checked')).to.be('checked');
-
-        done();
-      });
-
-      it('rounds the preview down to the unit when rounding is enabled', function (done) {
-        // Enable rounding
-        $scope.relative.round = true;
-        $scope.relative.count = 0;
-
-        _.each($scope.units, function (longUnit, shortUnit) {
-          $scope.relative.count = 0;
-          $scope.relative.unit = shortUnit;
-          $scope.formatRelative();
-
-          // The preview should match the start of the unit eg, the start of the minute
-          expect($scope.relative.preview).to.be(moment().startOf(longUnit).format($scope.format));
-        });
-
-        done();
-      });
-
-      it('does not round the preview down to the unit when rounding is disable', function (done) {
-        // Disable rounding
-        $scope.relative.round = false;
-        $scope.relative.count = 0;
-
-        _.each($scope.units, function (longUnit, shortUnit) {
-          $scope.relative.unit = shortUnit;
-          $scope.formatRelative();
-
-          // The preview should match the start of the unit eg, the start of the minute
-          expect($scope.relative.preview).to.be(moment().format($scope.format));
-        });
-
-        done();
-      });
-
-      it('has a $scope.applyRelative() that sets from and to based on relative.round, relative.count and relative.unit', function (done) {
-        // Disable rounding
-        $scope.relative.round = false;
-        $scope.relative.count = 1;
-        $scope.relative.unit = 's';
-        $scope.applyRelative();
-        expect($scope.from).to.be('now-1s');
-
-        $scope.relative.count = 2;
-        $scope.relative.unit = 'm';
-        $scope.applyRelative();
-        expect($scope.from).to.be('now-2m');
-
-        $scope.relative.count = 3;
-        $scope.relative.unit = 'h';
-        $scope.applyRelative();
-        expect($scope.from).to.be('now-3h');
-
-        // Enable rounding
-        $scope.relative.round = true;
-        $scope.relative.count = 7;
-        $scope.relative.unit = 'd';
-        $scope.applyRelative();
-        expect($scope.from).to.be('now-7d/d');
-
-        done();
-      });
-
-      it('updates the input fields when the scope variables are changed', function (done) {
-        var input = $elem.find('.kbn-timepicker-section input[ng-model="relative.count"]');
-        var select = $elem.find('.kbn-timepicker-section select[ng-model="relative.unit"]');
-
-        $scope.relative.count = 5;
-        $scope.$digest();
-        expect(input.val()).to.be('5');
-
-
-        // Should update the selected option
-        var i = 0;
-        _.each($scope.units, function (longUnit, shortUnit) {
-          $scope.relative.unit = shortUnit;
-          $scope.$digest();
-
-          expect(select.val()).to.be(i.toString());
-          i++;
-        });
-
-        done();
-
-      });
-
-    });
-
-    describe('absolute mode', function () {
-
-      var inputs;
-
-      beforeEach(function () {
-        init();
-        $scope.setMode('absolute');
-        $scope.$digest();
-
-        inputs = {
-          fromInput: $elem.find('.kbn-timepicker-section input[ng-model="absolute.from"]'),
-          toInput: $elem.find('.kbn-timepicker-section input[ng-model="absolute.to"]'),
-          fromCalendar: $elem.find('.kbn-timepicker-section table[ng-model="absolute.from"] '),
-          toCalendar: $elem.find('.kbn-timepicker-section table[ng-model="absolute.to"] '),
-        };
-
-      });
-
-      it('should have input boxes for absolute.from and absolute.to', function (done) {
-        expect(inputs.fromInput.length).to.be(1);
-        expect(inputs.toInput.length).to.be(1);
-        done();
-      });
-
-      it('should have tables that contain calendars bound to absolute.from and absolute.to', function (done) {
-        expect(inputs.fromCalendar.length).to.be(1);
-        expect(inputs.toCalendar.length).to.be(1);
-        done();
-      });
-
-      it('should present a timeframe of 15 minutes ago to now if scope.from and scope.to are not set', function (done) {
-        delete $scope.from;
-        delete $scope.to;
-        $scope.setMode('absolute');
-        $scope.$digest();
-
-        expect($scope.absolute.from.valueOf()).to.be(moment().subtract(15, 'minutes').valueOf());
-        expect($scope.absolute.to.valueOf()).to.be(moment().valueOf());
-        done();
-      });
-
-
-      it('should parse the time of scope.from and scope.to to set its own variables', function (done) {
-        $scope.setQuick('now-30m', 'now');
-        $scope.setMode('absolute');
-        $scope.$digest();
-
-        expect($scope.absolute.from.valueOf()).to.be(moment().subtract(30, 'minutes').valueOf());
-        expect($scope.absolute.to.valueOf()).to.be(moment().valueOf());
-        done();
-      });
-
-      it('should disable the "Go" button if from > to', function (done) {
-        $scope.absolute.from = moment('2012-02-01');
-        $scope.absolute.to = moment('2012-02-11');
-        $scope.$digest();
-        expect($elem.find('.kbn-timepicker-section button.kbn-timepicker-go').attr('disabled')).to.be(undefined);
-
-        $scope.absolute.from = moment('2012-02-12');
-        $scope.absolute.to = moment('2012-02-11');
-        $scope.$digest();
-        expect($elem.find('.kbn-timepicker-section button.kbn-timepicker-go').attr('disabled')).to.be('disabled');
-        done();
-      });
-
-      it('should only copy its input to scope.from and scope.to when scope.applyAbsolute() is called', function (done) {
-        $scope.setQuick('now-30m', 'now');
-        expect($scope.from).to.be('now-30m');
-        expect($scope.to).to.be('now');
-
-        $scope.absolute.from = moment('2012-02-01');
-        $scope.absolute.to = moment('2012-02-11');
-        expect($scope.from).to.be('now-30m');
-        expect($scope.to).to.be('now');
-
-        $scope.applyAbsolute();
-        expect($scope.from.valueOf()).to.be(moment('2012-02-01').valueOf());
-        expect($scope.to.valueOf()).to.be(moment('2012-02-11').valueOf());
-
-        $scope.$digest();
-
-        done();
-      });
-
-    });
-
-  });
-
-});
diff --git a/test/unit/specs/directives/truncate.js b/test/unit/specs/directives/truncate.js
deleted file mode 100644
index 30fd4309776f1..0000000000000
--- a/test/unit/specs/directives/truncate.js
+++ /dev/null
@@ -1,93 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var $ = require('jquery');
-
-  // Load the kibana app dependencies.
-  require('angular-route');
-
-  require('plugins/discover/index');
-
-  var $parentScope, $scope, $elem;
-
-  var init = function (text) {
-    // Load the application
-    module('kibana');
-
-    // Create the scope
-    inject(function ($rootScope, $compile) {
-
-      // Give us a scope
-      $parentScope = $rootScope;
-
-      // Create the element
-      $elem = angular.element(
-        '<kbn-truncated orig="' + text + '" length="10"></kbn-timepicker>'
-      );
-
-      // And compile it
-      $compile($elem)($parentScope);
-
-      // Fire a digest cycle
-      $elem.scope().$digest();
-
-      // Grab the isolate scope so we can test it
-      $scope = $elem.isolateScope();
-    });
-  };
-
-
-  describe('kbnTruncate directive', function () {
-
-    describe('long strings', function () {
-
-      beforeEach(function () {
-        init('some string of text over 10 characters');
-      });
-
-      it('should trim long strings', function (done) {
-        expect($elem.text()).to.be('some strin... more');
-        done();
-      });
-
-      it('should have a link to see more text', function (done) {
-        expect($elem.find('[ng-click="toggle()"]').text()).to.be('more');
-        done();
-      });
-
-      it('should should more text if the link is clicked and less text if clicked again', function (done) {
-        $scope.toggle();
-        $scope.$digest();
-        expect($elem.text()).to.be('some string of text over 10 characters less');
-        expect($elem.find('[ng-click="toggle()"]').text()).to.be('less');
-
-        $scope.toggle();
-        $scope.$digest();
-        expect($elem.text()).to.be('some strin... more');
-        expect($elem.find('[ng-click="toggle()"]').text()).to.be('more');
-
-        done();
-      });
-
-    });
-
-    describe('short strings', function () {
-
-      beforeEach(function () {
-        init('short');
-      });
-
-      it('should not trim short strings', function (done) {
-        expect($elem.text()).to.be('short');
-        done();
-      });
-
-      it('should not have a link', function (done) {
-        expect($elem.find('[ng-click="toggle()"]').length).to.be(0);
-        done();
-      });
-
-    });
-
-  });
-
-});
diff --git a/test/unit/specs/directives/typeahead.js b/test/unit/specs/directives/typeahead.js
deleted file mode 100644
index b78470b03d210..0000000000000
--- a/test/unit/specs/directives/typeahead.js
+++ /dev/null
@@ -1,215 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var sinon = require('sinon/sinon');
-
-  // Load the kibana app dependencies.
-  require('angular-route');
-  require('components/typeahead/typeahead');
-
-  // TODO: This should not be needed, timefilter is only included here, it should move
-  require('plugins/discover/index');
-
-  var typeaheadHistoryCount = 10;
-  var typeaheadName = 'unittest';
-  var $parentScope;
-  var $typeaheadScope, $elem;
-  var $typeaheadInputScope;
-  var typeaheadCtrl, PersistedLog;
-
-  var markup = '<div class="typeahead" kbn-typeahead="' + typeaheadName + '">' +
-    '<input type="text" placeholder="Filter..." class="form-control" ng-model="query" kbn-typeahead-input>' +
-    '<kbn-typeahead-items></kbn-typeahead-items>' +
-    '</div>';
-  var typeaheadItems = ['abc', 'def', 'ghi'];
-
-  var init = function () {
-    // Load the application
-    module('kibana');
-
-    module('kibana/typeahead', function ($provide) {
-      $provide.factory('PersistedLog', function () {
-        function PersistedLogMock(name, options) {
-          this.name = name;
-          this.options = options;
-        }
-
-        PersistedLogMock.prototype.add = sinon.stub();
-        PersistedLogMock.prototype.get = sinon.stub().returns(typeaheadItems);
-
-        return PersistedLogMock;
-      });
-
-      $provide.service('config', function () {
-        this.get = sinon.stub().returns(typeaheadHistoryCount);
-      });
-    });
-
-
-    // Create the scope
-    inject(function ($injector, $controller, $rootScope, $compile) {
-      // Give us a scope
-      $parentScope = $rootScope;
-
-      $elem = angular.element(markup);
-
-      PersistedLog = $injector.get('PersistedLog');
-
-      $compile($elem)($parentScope);
-      $elem.scope().$digest();
-      $typeaheadScope = $elem.isolateScope();
-      typeaheadCtrl = $elem.controller('kbnTypeahead');
-    });
-  };
-
-  describe('typeahead directive', function () {
-    describe('typeahead requirements', function () {
-      describe('missing input', function () {
-        var goodMarkup = markup;
-
-        before(function () {
-          markup = '<div class="typeahead" kbn-typeahead="' + typeaheadName + '">' +
-            '<kbn-typeahead-items></kbn-typeahead-items>' +
-            '</div>';
-        });
-
-        after(function () {
-          markup = goodMarkup;
-        });
-
-        it('should throw with message', function () {
-          expect(init).to.throwException(/kbn-typeahead-input must be defined/);
-        });
-      });
-    });
-
-    describe('internal functionality', function () {
-      beforeEach(function () {
-        init();
-      });
-
-      describe('PersistedLog', function () {
-        it('should instantiate PersistedLog', function () {
-          expect(typeaheadCtrl.history.name).to.equal('typeahead:' + typeaheadName);
-          expect(typeaheadCtrl.history.options.maxLength).to.equal(typeaheadHistoryCount);
-          expect(typeaheadCtrl.history.options.filterDuplicates).to.equal(true);
-        });
-
-        it('should read data when directive is instantiated', function () {
-          expect(typeaheadCtrl.history.get.callCount).to.be(1);
-        });
-
-        it('should not save empty entries', function () {
-          var entries = typeaheadItems.slice(0);
-          entries.push('', 'jkl');
-          for (var i = 0; i < entries.length; i++) {
-            $typeaheadScope.inputModel.$setViewValue(entries[i]);
-            typeaheadCtrl.persistEntry();
-          }
-          expect(typeaheadCtrl.history.add.callCount).to.be(4);
-        });
-
-      });
-
-      describe('controller scope', function () {
-        it('should contain the input model', function () {
-          expect($typeaheadScope.inputModel).to.be.an('object');
-          expect($typeaheadScope.inputModel).to.have.keys(['$viewValue', '$modelValue', '$setViewValue']);
-        });
-
-        it('should save data to the scope', function () {
-          // $scope.items is set via history.add, so mock the output
-          typeaheadCtrl.history.add.returns(typeaheadItems);
-
-          // a single call will call history.add, which will respond with the mocked data
-          $typeaheadScope.inputModel.$setViewValue(typeaheadItems[0]);
-          typeaheadCtrl.persistEntry();
-
-          expect($typeaheadScope.items).to.be.an('array');
-          expect($typeaheadScope.items.length).to.be(typeaheadItems.length);
-        });
-
-        it('should order fitlered results', function () {
-          var entries = ['ac/dc', 'anthrax', 'abba', 'phantogram', 'skrillex'];
-          var allEntries = typeaheadItems.concat(entries);
-          var startMatches = allEntries.filter(function (item) {
-            return /^a/.test(item);
-          });
-          typeaheadCtrl.history.add.returns(allEntries);
-
-          for (var i = 0; i < entries.length; i++) {
-            $typeaheadScope.inputModel.$setViewValue(entries[i]);
-            typeaheadCtrl.persistEntry();
-          }
-
-          typeaheadCtrl.filterItemsByQuery('a');
-
-          expect($typeaheadScope.filteredItems).to.contain('phantogram');
-          var nonStarterIndex = $typeaheadScope.filteredItems.indexOf('phantogram');
-
-          startMatches.forEach(function (item) {
-            expect($typeaheadScope.filteredItems).to.contain(item);
-            expect($typeaheadScope.filteredItems.indexOf(item)).to.be.below(nonStarterIndex);
-          });
-
-          expect($typeaheadScope.filteredItems).not.to.contain('skrillex');
-        });
-      });
-
-      describe('list appearance', function () {
-        beforeEach(function () {
-          typeaheadCtrl.history.add.returns(typeaheadItems);
-          $typeaheadScope.inputModel.$setViewValue(typeaheadItems[0]);
-          typeaheadCtrl.persistEntry();
-
-          // make sure the data looks how we expect
-          expect($typeaheadScope.items.length).to.be(3);
-        });
-
-        it('should default to hidden', function () {
-          expect(typeaheadCtrl.isVisible()).to.be(false);
-        });
-
-        it('should appear when not hidden, has matches input and focused', function () {
-          typeaheadCtrl.setHidden(false);
-          expect(typeaheadCtrl.isVisible()).to.be(false);
-
-          typeaheadCtrl.filterItemsByQuery(typeaheadItems[0]);
-          expect(typeaheadCtrl.isVisible()).to.be(false);
-
-          // only visible when all conditions match
-          typeaheadCtrl.setFocused(true);
-          expect(typeaheadCtrl.isVisible()).to.be(true);
-
-          typeaheadCtrl.setFocused(false);
-          expect(typeaheadCtrl.isVisible()).to.be(false);
-        });
-
-        it('should appear when not hidden, has matches input and moused over', function () {
-          typeaheadCtrl.setHidden(false);
-          expect(typeaheadCtrl.isVisible()).to.be(false);
-
-          typeaheadCtrl.filterItemsByQuery(typeaheadItems[0]);
-          expect(typeaheadCtrl.isVisible()).to.be(false);
-
-          // only visible when all conditions match
-          typeaheadCtrl.setMouseover(true);
-          expect(typeaheadCtrl.isVisible()).to.be(true);
-
-          typeaheadCtrl.setMouseover(false);
-          expect(typeaheadCtrl.isVisible()).to.be(false);
-        });
-
-        it('should hide when no matches', function () {
-          typeaheadCtrl.setHidden(false);
-          typeaheadCtrl.setFocused(true);
-
-          typeaheadCtrl.filterItemsByQuery(typeaheadItems[0]);
-          expect(typeaheadCtrl.isVisible()).to.be(true);
-
-          typeaheadCtrl.filterItemsByQuery('a8h4o8ah48thal4i7rlia4ujru4glia47gf');
-          expect(typeaheadCtrl.isVisible()).to.be(false);
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/directives/validate_cidr_mask.js b/test/unit/specs/directives/validate_cidr_mask.js
deleted file mode 100644
index 9ea4472bf046e..0000000000000
--- a/test/unit/specs/directives/validate_cidr_mask.js
+++ /dev/null
@@ -1,84 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  require('directives/validate_cidr_mask');
-
-  describe('Validate CIDR mask directive', function () {
-    var $compile, $rootScope;
-    var html = '<input type="text" ng-model="value" validate-cidr-mask />';
-
-    beforeEach(module('kibana'));
-
-    beforeEach(inject(function (_$compile_, _$rootScope_) {
-      $compile = _$compile_;
-      $rootScope = _$rootScope_;
-    }));
-
-    it('should allow empty input', function () {
-      var element = $compile(html)($rootScope);
-
-      $rootScope.value = '';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-
-      $rootScope.value = null;
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-
-      $rootScope.value = undefined;
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-    });
-
-    it('should allow valid CIDR masks', function () {
-      var element = $compile(html)($rootScope);
-
-      $rootScope.value = '0.0.0.0/1';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-
-      $rootScope.value = '128.0.0.1/31';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-
-      $rootScope.value = '1.2.3.4/2';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-
-      $rootScope.value = '67.129.65.201/27';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-    });
-
-    it('should disallow invalid CIDR masks', function () {
-      var element = $compile(html)($rootScope);
-
-      $rootScope.value = 'hello, world';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-
-      $rootScope.value = '0.0.0.0';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-
-      $rootScope.value = '0.0.0.0/0';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-
-      $rootScope.value = '0.0.0.0/33';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-
-      $rootScope.value = '256.0.0.0/32';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-
-      $rootScope.value = '0.0.0.0/32/32';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-
-      $rootScope.value = '1.2.3/1';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/directives/validate_date_math.js b/test/unit/specs/directives/validate_date_math.js
deleted file mode 100644
index 4ab0aaa45f1fa..0000000000000
--- a/test/unit/specs/directives/validate_date_math.js
+++ /dev/null
@@ -1,68 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  require('directives/validate_date_math');
-
-  describe('Validate date math directive', function () {
-    var $compile, $rootScope;
-    var html = '<input type="text" ng-model="value" validate-date-math />';
-
-    beforeEach(module('kibana'));
-
-    beforeEach(inject(function (_$compile_, _$rootScope_) {
-      $compile = _$compile_;
-      $rootScope = _$rootScope_;
-    }));
-
-    it('should allow valid date math', function () {
-      var element = $compile(html)($rootScope);
-
-      $rootScope.value = 'now';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-
-      $rootScope.value = '2012-02-28';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-
-      $rootScope.value = 'now-3d';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-
-      $rootScope.value = 'now-3M/M';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-
-      $rootScope.value = '2012-05-31||-3M/M';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-    });
-
-    it('should disallow invalid date math', function () {
-      var element = $compile(html)($rootScope);
-
-      $rootScope.value = 'hello, world';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-
-      $rootScope.value = 'now+-5w';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-
-      $rootScope.value = '2012-02-31';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-
-      $rootScope.value = '5/5/2005+3d';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-    });
-
-    it('should allow empty values', function () {
-      var element = $compile(html)($rootScope);
-
-      $rootScope.value = '';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/directives/validate_index_name.js b/test/unit/specs/directives/validate_index_name.js
deleted file mode 100644
index da1b5eede0e72..0000000000000
--- a/test/unit/specs/directives/validate_index_name.js
+++ /dev/null
@@ -1,68 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-
-  // Load the kibana app dependencies.
-  require('directives/validate_index_name');
-
-  describe('Validate index name directive', function () {
-    var $compile, $rootScope;
-    var html = '<input type="text" ng-model="indexName" validate-index-name />';
-
-    beforeEach(module('kibana'));
-
-    beforeEach(inject(function (_$compile_, _$rootScope_) {
-      $compile = _$compile_;
-      $rootScope = _$rootScope_;
-    }));
-
-    function checkPattern(input) {
-      $rootScope.indexName = input;
-      var element = $compile(html)($rootScope);
-      $rootScope.$digest();
-      return element;
-    }
-
-    var badPatterns = [
-      null,
-      undefined,
-      '',
-      '.',
-      '..',
-      'foo\\bar',
-      'foo/bar',
-      'foo?bar',
-      'foo"bar',
-      'foo<bar',
-      'foo>bar',
-      'foo|bar',
-      'foo bar',
-      'foo,bar',
-    ];
-
-    var goodPatterns = [
-      '...',
-      'foo',
-      'foo.bar',
-      'foo*',
-      'foo.bar*',
-      'foo.*',
-      '[foo-]YYYY-MM-DD',
-    ];
-
-    badPatterns.forEach(function (pattern) {
-      it('should not accept index pattern: ' + pattern, function () {
-        var element = checkPattern(pattern);
-        expect(element.hasClass('ng-invalid')).to.be(true);
-        expect(element.hasClass('ng-valid')).to.not.be(true);
-      });
-    });
-
-    goodPatterns.forEach(function (pattern) {
-      it('should accept index pattern: ' + pattern, function () {
-        var element = checkPattern(pattern);
-        expect(element.hasClass('ng-invalid')).to.not.be(true);
-        expect(element.hasClass('ng-valid')).to.be(true);
-      });
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/directives/validate_ip.js b/test/unit/specs/directives/validate_ip.js
deleted file mode 100644
index afb04d90c71cb..0000000000000
--- a/test/unit/specs/directives/validate_ip.js
+++ /dev/null
@@ -1,76 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  require('directives/validate_ip');
-
-  describe('Validate IP directive', function () {
-    var $compile, $rootScope;
-    var html = '<input type="text" ng-model="value" validate-ip />';
-
-    beforeEach(module('kibana'));
-
-    beforeEach(inject(function (_$compile_, _$rootScope_) {
-      $compile = _$compile_;
-      $rootScope = _$rootScope_;
-    }));
-
-    it('should allow empty input', function () {
-      var element = $compile(html)($rootScope);
-
-      $rootScope.value = '';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-
-      $rootScope.value = null;
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-
-      $rootScope.value = undefined;
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-    });
-
-    it('should allow valid IP addresses', function () {
-      var element = $compile(html)($rootScope);
-
-      $rootScope.value = '0.0.0.0';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-
-      $rootScope.value = '0.0.0.1';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-
-      $rootScope.value = '126.45.211.34';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-
-      $rootScope.value = '255.255.255.255';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-valid')).to.be.ok();
-    });
-
-    it('should disallow invalid IP addresses', function () {
-      var element = $compile(html)($rootScope);
-
-      $rootScope.value = 'hello, world';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-
-      $rootScope.value = '0.0.0';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-
-      $rootScope.value = '256.0.0.0';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-
-      $rootScope.value = '-1.0.0.0';
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-
-      $rootScope.value = Number.MAX_VALUE;
-      $rootScope.$digest();
-      expect(element.hasClass('ng-invalid')).to.be.ok();
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/directives/validate_json.js b/test/unit/specs/directives/validate_json.js
deleted file mode 100644
index e8da03ff87617..0000000000000
--- a/test/unit/specs/directives/validate_json.js
+++ /dev/null
@@ -1,88 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-
-  // Load the kibana app dependencies.
-  require('directives/validate_json');
-
-  var $parentScope;
-  var $elemScope;
-  var $elem;
-  var mockScope = '';
-
-  var input = {
-    valid: '{ "test": "json input" }',
-    invalid: 'strings are not json'
-  };
-
-  var markup = {
-    textarea: '<textarea ng-model="mockModel" validate-json></textarea>',
-    input: '<input type="text" ng-model="mockModel" validate-json>'
-  };
-
-  var init = function (type) {
-    // Load the application
-    module('kibana');
-    type = type || 'input';
-    var elMarkup = markup[type];
-
-    // Create the scope
-    inject(function ($injector, $rootScope, $compile) {
-      // Give us a scope
-      $parentScope = $rootScope;
-      $parentScope.mockModel = mockScope;
-
-      $elem = angular.element(elMarkup);
-      $compile($elem)($parentScope);
-      $elemScope = $elem.isolateScope();
-    });
-  };
-
-  describe('validate-json directive', function () {
-    var checkValid = function (input, className) {
-      $parentScope.mockModel = input;
-      $elem.scope().$digest();
-      expect($elem.hasClass(className)).to.be(true);
-    };
-
-    describe('initialization', function () {
-      beforeEach(function () {
-        init();
-      });
-
-      it('should use the model', function () {
-        expect($elemScope).to.have.property('ngModel');
-      });
-
-    });
-
-    Object.keys(markup).forEach(function (inputType) {
-      describe(inputType, function () {
-        beforeEach(function () {
-          init(inputType);
-        });
-
-        it('should be an input', function () {
-          expect($elem.get(0).tagName).to.be(inputType.toUpperCase());
-        });
-
-        it('should set valid state', function () {
-          checkValid(input.valid, 'ng-valid');
-        });
-
-        it('should be valid when empty', function () {
-          checkValid('', 'ng-valid');
-        });
-
-        it('should set invalid state', function () {
-          checkValid(input.invalid, 'ng-invalid');
-        });
-
-        it('should update validity on changes', function () {
-          checkValid(input.valid, 'ng-valid');
-          checkValid(input.invalid, 'ng-invalid');
-          checkValid(input.valid, 'ng-valid');
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/directives/validate_query.js b/test/unit/specs/directives/validate_query.js
deleted file mode 100644
index ab79b36aa090f..0000000000000
--- a/test/unit/specs/directives/validate_query.js
+++ /dev/null
@@ -1,242 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var sinon = require('test_utils/auto_release_sinon');
-
-  // Load the kibana app dependencies.
-  require('components/validate_query/validate_query');
-
-  var $rootScope;
-  var $timeout;
-  var $compile;
-  var Promise;
-  var Private;
-  var config;
-  var debounceDelay = 300;
-  var $elemScope;
-  var $elem;
-
-  var cycleIndex = 0;
-  var mockValidateQuery;
-  var markup = '<input ng-model="mockModel" validate-query="mockQueryInput" input-focus type="text">';
-  var fromUser;
-  var toUser = require('components/validate_query/lib/to_user');
-
-
-  var validEsResponse = function () {
-    return Promise.resolve({ valid: true });
-  };
-
-  var invalidEsResponse = function () {
-    return Promise.reject({ body: { error: 'mock invalid query' } });
-  };
-
-  var checkClass = function (className) {
-    expect($elem.hasClass(className)).to.be(true);
-  };
-
-  var init = function () {
-    // Load the application
-    module('kibana');
-
-    module('kibana', function ($provide) {
-      $provide.service('es', function () {
-        return { indices: { validateQuery: function () {} } };
-      });
-
-      // Super simple config stub
-      $provide.service('config', function () {
-        var keys = {};
-        return {
-          get: function (key) { return keys[key]; },
-          set: function (key, value) { keys[key] = value; }
-        };
-      });
-
-      $provide.constant('configFile', {
-        kibana_index: 'test-index'
-      });
-    });
-
-    // Create the scope
-    inject(function ($injector, _$rootScope_, _$compile_, _$timeout_, _Promise_, _Private_, _config_) {
-      $timeout = _$timeout_;
-      $compile = _$compile_;
-      Promise = _Promise_;
-      Private = _Private_;
-      config = _config_;
-
-      // Give us a scope
-      $rootScope = _$rootScope_;
-
-      var es = $injector.get('es');
-      mockValidateQuery = sinon.stub(es.indices, 'validateQuery');
-    });
-  };
-
-  var compile = function () {
-    $rootScope.mockModel = 'cycle' + cycleIndex++;
-    $rootScope.mockQueryInput = undefined;
-
-    $elem = angular.element(markup);
-    $compile($elem)($rootScope);
-    $elemScope = $elem.isolateScope();
-    $rootScope.$digest();
-  };
-
-  describe('validate-query directive', function () {
-    describe('initialization', function () {
-      beforeEach(function () {
-        init();
-        mockValidateQuery.returns(validEsResponse());
-        compile();
-      });
-
-      it('should use the model', function () {
-        expect($elemScope).to.have.property('ngModel');
-      });
-
-      it('should call validate with changes', function () {
-        // once for init
-        expect(mockValidateQuery.callCount).to.be(1);
-
-        $rootScope.mockModel = 'different input';
-        $rootScope.$digest();
-        // once on change (leading edge)
-        expect(mockValidateQuery.callCount).to.be(2);
-        $timeout.flush();
-        // once on change (trailing edge)
-        expect(mockValidateQuery.callCount).to.be(3);
-      });
-    });
-
-    describe('valid querystring', function () {
-      var mockValidateReturns;
-
-      beforeEach(function () {
-        init();
-        mockValidateQuery.returns(validEsResponse());
-        compile();
-      });
-
-      it('should set valid state', function () {
-        // give angular time to set up the directive
-        checkClass('ng-valid-query-input');
-        checkClass('ng-valid');
-      });
-    });
-
-    describe('invalid querystring', function () {
-      var mockValidateReturns;
-
-      beforeEach(function () {
-        init();
-        mockValidateQuery.returns(invalidEsResponse());
-        compile();
-      });
-
-      it('should set invalid state', function () {
-        checkClass('ng-invalid');
-      });
-    });
-
-    describe('changing input', function () {
-      it('should change validity based on response', function () {
-        init();
-        mockValidateQuery.onCall(0).returns(validEsResponse());
-        compile();
-        $rootScope.$digest();
-        checkClass('ng-valid');
-
-        // leading and trailing edges
-        mockValidateQuery.onCall(1).returns(invalidEsResponse());
-        mockValidateQuery.onCall(2).returns(invalidEsResponse());
-        $rootScope.mockModel = 'invalid:';
-        // trigger model change, which fires watcher
-        $rootScope.$digest();
-        // leading edge
-        $timeout.flush(); // trailing edge
-        checkClass('ng-invalid');
-
-        // leading and trailing edges
-        mockValidateQuery.onCall(3).returns(validEsResponse());
-        mockValidateQuery.onCall(4).returns(validEsResponse());
-        $rootScope.mockModel = 'valid';
-        // trigger model change, which fires watcher
-        $rootScope.$digest();
-        // leading edge
-        $timeout.flush(); // trailing edge
-        checkClass('ng-valid');
-      });
-    });
-
-    describe('user input parser', function () {
-
-      beforeEach(function () {
-        fromUser = Private(require('components/validate_query/lib/from_user'));
-        config.set('query:queryString:options', {});
-      });
-
-      it('should return the input if passed an object', function () {
-        expect(fromUser({foo: 'bar'})).to.eql({foo: 'bar'});
-      });
-
-      it('unless the object is empty, that implies a *', function () {
-        expect(fromUser({})).to.eql({query_string: {query: '*'}});
-      });
-
-      it('should treat an empty string as a *', function () {
-        expect(fromUser('')).to.eql({query_string: {query: '*'}});
-      });
-
-      it('should merge in the query string options', function () {
-        config.set('query:queryString:options', {analyze_wildcard: true});
-        expect(fromUser('foo')).to.eql({query_string: {query: 'foo', analyze_wildcard: true}});
-        expect(fromUser('')).to.eql({query_string: {query: '*', analyze_wildcard: true}});
-      });
-
-
-      it('should treat input that does not start with { as a query string', function () {
-        expect(fromUser('foo')).to.eql({query_string: {query: 'foo'}});
-        expect(fromUser('400')).to.eql({query_string: {query: '400'}});
-        expect(fromUser('true')).to.eql({query_string: {query: 'true'}});
-      });
-
-      it('should parse valid JSON', function () {
-        expect(fromUser('{}')).to.eql({});
-        expect(fromUser('{a:b}')).to.eql({query_string: {query: '{a:b}'}});
-      });
-    });
-
-    describe('model presentation formatter', function () {
-      it('should present undefined as empty string', function () {
-        var notDefined;
-        expect(toUser(notDefined)).to.be('');
-      });
-
-      it('should present null as empty string', function () {
-        expect(toUser(null)).to.be('');
-      });
-
-      it('should present objects as strings', function () {
-        expect(toUser({foo: 'bar'})).to.be('{"foo":"bar"}');
-      });
-
-      it('should present query_string queries as strings', function () {
-        expect(toUser({ query_string: { query: 'lucene query string' } })).to.be('lucene query string');
-      });
-
-      it('should present query_string queries without a query as an empty string', function () {
-        expect(toUser({ query_string: {} })).to.be('');
-      });
-
-      it('should present string as strings', function () {
-        expect(toUser('foo')).to.be('foo');
-      });
-
-      it('should present numbers as strings', function () {
-        expect(toUser(400)).to.be('400');
-      });
-    });
-
-  });
-});
diff --git a/test/unit/specs/factories/base_object.js b/test/unit/specs/factories/base_object.js
deleted file mode 100644
index bb655bf992f53..0000000000000
--- a/test/unit/specs/factories/base_object.js
+++ /dev/null
@@ -1,51 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-  var sinon = require('sinon/sinon');
-  require('services/private');
-
-
-  describe('Base Object', function () {
-    var $rootScope;
-    var BaseObject;
-    beforeEach(function () {
-      module('kibana');
-
-      inject(function (_$rootScope_, Private) {
-        $rootScope = _$rootScope_;
-        BaseObject = require('utils/BaseObject');
-      });
-    });
-
-    it('should take an inital set of values', function () {
-      var baseObject = new BaseObject({ message: 'test' });
-      expect(baseObject).to.have.property('message', 'test');
-    });
-
-    it('should serialize _attributes to RISON', function () {
-      var baseObject = new BaseObject();
-      baseObject.message = 'Testing... 1234';
-      var rison = baseObject.toRISON();
-      expect(rison).to.equal('(message:\'Testing... 1234\')');
-    });
-
-    it('should not serialize $$attributes to RISON', function () {
-      var baseObject = new BaseObject();
-      baseObject.$$attributes = { foo: 'bar' };
-      baseObject.message = 'Testing... 1234';
-      var rison = baseObject.toRISON();
-      expect(rison).to.equal('(message:\'Testing... 1234\')');
-    });
-
-    it('should serialize _attributes for JSON', function () {
-      var baseObject = new BaseObject();
-      baseObject.message = 'Testing... 1234';
-      baseObject._private = 'foo';
-      baseObject.$private = 'stuff';
-      var json = JSON.stringify(baseObject);
-      expect(json).to.equal('{"message":"Testing... 1234"}');
-    });
-
-  });
-
-});
diff --git a/test/unit/specs/factories/events.js b/test/unit/specs/factories/events.js
deleted file mode 100644
index 7d5117b4d180e..0000000000000
--- a/test/unit/specs/factories/events.js
+++ /dev/null
@@ -1,230 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-  var sinon = require('test_utils/auto_release_sinon');
-  require('services/private');
-
-  describe('Events', function () {
-    require('test_utils/no_digest_promises').activateForSuite();
-
-    var $rootScope;
-    var Events;
-    var Notifier;
-    var Promise;
-
-    beforeEach(function () {
-      module('kibana');
-
-      inject(function ($injector, Private) {
-        $rootScope = $injector.get('$rootScope');
-        Notifier = $injector.get('Notifier');
-        Promise = $injector.get('Promise');
-        Events = Private(require('factories/events'));
-      });
-    });
-
-    it('should handle on events', function () {
-      var obj = new Events();
-      var prom = obj.on('test', function (message) {
-        expect(message).to.equal('Hello World');
-      });
-
-      obj.emit('test', 'Hello World');
-
-      return prom;
-    });
-
-    it('should work with inherited objects', function () {
-      _.class(MyEventedObject).inherits(Events);
-      function MyEventedObject() {
-        MyEventedObject.Super.call(this);
-      }
-      var obj = new MyEventedObject();
-
-      var prom = obj.on('test', function (message) {
-        expect(message).to.equal('Hello World');
-      });
-
-      obj.emit('test', 'Hello World');
-
-      return prom;
-    });
-
-    it('should clear events when off is called', function () {
-      var obj = new Events();
-      obj.on('test', _.noop);
-      expect(obj._listeners).to.have.property('test');
-      expect(obj._listeners.test).to.have.length(1);
-      obj.off();
-      expect(obj._listeners).to.not.have.property('test');
-    });
-
-    it('should clear a specific handler when off is called for an event', function () {
-      var obj = new Events();
-      var handler1 = sinon.stub();
-      var handler2 = sinon.stub();
-      obj.on('test', handler1);
-      obj.on('test', handler2);
-      expect(obj._listeners).to.have.property('test');
-      obj.off('test', handler1);
-
-      return obj.emit('test', 'Hello World')
-      .then(function () {
-        sinon.assert.calledOnce(handler2);
-        sinon.assert.notCalled(handler1);
-      });
-    });
-
-    it('should clear a all handlers when off is called for an event', function () {
-      var obj = new Events();
-      var handler1 = sinon.stub();
-      obj.on('test', handler1);
-      expect(obj._listeners).to.have.property('test');
-      obj.off('test');
-      expect(obj._listeners).to.not.have.property('test');
-
-      return obj.emit('test', 'Hello World')
-      .then(function () {
-        sinon.assert.notCalled(handler1);
-      });
-    });
-
-    it('should handle mulitple identical emits in the same tick', function () {
-      var obj = new Events();
-      var handler1 = sinon.stub();
-
-      obj.on('test', handler1);
-      var emits = [
-        obj.emit('test', 'one'),
-        obj.emit('test', 'two'),
-        obj.emit('test', 'three')
-      ];
-
-      return Promise
-      .all(emits)
-      .then(function () {
-        expect(handler1.callCount).to.be(emits.length);
-        expect(handler1.getCall(0).calledWith('one')).to.be(true);
-        expect(handler1.getCall(1).calledWith('two')).to.be(true);
-        expect(handler1.getCall(2).calledWith('three')).to.be(true);
-      });
-    });
-
-    it('should handle emits from the handler', function () {
-      var obj = new Events();
-      var secondEmit = Promise.defer();
-      var handler1 = sinon.spy(function () {
-        if (handler1.calledTwice) {
-          return;
-        }
-        obj.emit('test').then(_.bindKey(secondEmit, 'resolve'));
-      });
-
-      obj.on('test', handler1);
-
-      return Promise
-      .all([
-        obj.emit('test'),
-        secondEmit.promise
-      ])
-      .then(function () {
-        expect(handler1.callCount).to.be(2);
-      });
-    });
-
-    it('should only emit to handlers registered before emit is called', function () {
-      var obj = new Events();
-      var handler1 = sinon.stub();
-      var handler2 = sinon.stub();
-
-      obj.on('test', handler1);
-      var emits = [
-        obj.emit('test', 'one'),
-        obj.emit('test', 'two'),
-        obj.emit('test', 'three')
-      ];
-
-
-      return Promise.all(emits).then(function () {
-        expect(handler1.callCount).to.be(emits.length);
-
-        obj.on('test', handler2);
-
-        var emits2 = [
-          obj.emit('test', 'four'),
-          obj.emit('test', 'five'),
-          obj.emit('test', 'six')
-        ];
-
-        return Promise.all(emits2)
-        .then(function () {
-          expect(handler1.callCount).to.be(emits.length + emits2.length);
-          expect(handler2.callCount).to.be(emits2.length);
-        });
-      });
-    });
-
-    it('should pass multiple arguments from the emitter', function () {
-      var obj = new Events();
-      var handler = sinon.stub();
-      var payload = [
-        'one',
-        { hello: 'tests' },
-        null
-      ];
-
-      obj.on('test', handler);
-
-      return obj.emit('test', payload[0], payload[1], payload[2])
-      .then(function () {
-        expect(handler.callCount).to.be(1);
-        expect(handler.calledWithExactly(payload[0], payload[1], payload[2])).to.be(true);
-      });
-    });
-
-    it('should preserve the scope of the handler', function () {
-      var obj = new Events();
-      var expected = 'some value';
-      var testValue;
-
-      function handler(arg1, arg2) {
-        testValue = this.getVal();
-      }
-      handler.getVal = _.constant(expected);
-
-      obj.on('test', handler);
-      return obj.emit('test')
-      .then(function () {
-        expect(testValue).to.equal(expected);
-      });
-    });
-
-    it('should always emit in the same order', function () {
-      var handler = sinon.stub();
-
-      var obj = new Events();
-      obj.on('block', _.partial(handler, 'block'));
-      obj.on('last', _.partial(handler, 'last'));
-
-      return Promise
-      .all([
-        obj.emit('block'),
-        obj.emit('block'),
-        obj.emit('block'),
-        obj.emit('block'),
-        obj.emit('block'),
-        obj.emit('block'),
-        obj.emit('block'),
-        obj.emit('block'),
-        obj.emit('block'),
-        obj.emit('last')
-      ])
-      .then(function () {
-        expect(handler.callCount).to.be(10);
-        handler.args.forEach(function (args, i) {
-          expect(args[0]).to.be(i < 9 ? 'block' : 'last');
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/filters/field_type.js b/test/unit/specs/filters/field_type.js
deleted file mode 100644
index 675fb4877e5b6..0000000000000
--- a/test/unit/specs/filters/field_type.js
+++ /dev/null
@@ -1,67 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-
-  // Load the kibana app dependencies.
-  require('angular-route');
-  require('plugins/discover/index');
-  require('filters/field_type');
-
-  var filter, types;
-
-  var init = function (expandable) {
-    // Load the application
-    module('kibana');
-
-    types = [
-      {name: 's1', type: 'string'},
-      {name: 's2', type: 'string'},
-      {name: 's3', type: 'string'},
-
-      {name: 'n1', type: 'number'},
-      {name: 'n2', type: 'number'},
-
-      {name: 'i1', type: 'ip'},
-      {name: 'd1', type: 'date'},
-    ];
-
-    // Create the scope
-    inject(function ($filter) {
-      filter = $filter('fieldType');
-    });
-  };
-
-
-  describe('fieldType array filter', function () {
-
-    beforeEach(function () {
-      init();
-    });
-
-    it('should have a fieldType filter', function () {
-      expect(filter).to.not.be(null);
-    });
-
-    it('should have 3 string fields', function () {
-      expect(filter(types, 'string').length).to.be(3);
-    });
-
-    it('should have 2 number fields', function () {
-      expect(filter(types, 'number').length).to.be(2);
-    });
-
-    it('should have 1 ip field and 1 date field', function () {
-      expect(_.pluck(filter(types, ['date', 'ip']), 'name')).to.eql(['i1', 'd1']);
-    });
-
-    it('should return all fields when passed *', function () {
-      expect(filter(types, '*').length).to.be(7);
-    });
-
-    it('should allow negation', function () {
-      var resultNames = _.pluck(filter(types, '!string'), 'name');
-      expect(resultNames).to.eql(['n1', 'n2', 'i1', 'd1']);
-    });
-  });
-
-});
diff --git a/test/unit/specs/filters/label.js b/test/unit/specs/filters/label.js
deleted file mode 100644
index ac180f75d2bc5..0000000000000
--- a/test/unit/specs/filters/label.js
+++ /dev/null
@@ -1,42 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-  var faker = require('faker');
-
-  // Load the kibana app dependencies.
-  require('angular-route');
-
-  // Load kibana and its applications
-  require('plugins/discover/index');
-
-  var filter;
-
-  var init = function (expandable) {
-    // Load the application
-    module('kibana');
-
-    // Create the scope
-    inject(function ($filter) {
-      filter = $filter('label');
-    });
-  };
-
-  describe('label filter', function () {
-    beforeEach(function () {
-      init();
-    });
-
-    it('should have a label filter', function () {
-      expect(filter).to.not.be(null);
-    });
-
-    it('should capitalize the first letter in a string', function () {
-      expect(filter('something')).to.be('Something');
-    });
-
-    it('should capitalize the first letter in every word', function () {
-      expect(filter('foo bar fizz buzz')).to.be('Foo Bar Fizz Buzz');
-    });
-  });
-
-});
diff --git a/test/unit/specs/filters/moment.js b/test/unit/specs/filters/moment.js
deleted file mode 100644
index b4053eb382ae3..0000000000000
--- a/test/unit/specs/filters/moment.js
+++ /dev/null
@@ -1,54 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var sinon = require('sinon/sinon');
-  var moment = require('moment');
-
-  // Load the kibana app dependencies.
-  require('angular-route');
-  require('filters/moment');
-
-  var filter, config;
-  var anchor = '2014-01-01T06:06:06.666';
-  var clock;
-
-  var init = function (expandable) {
-    // Load the application
-    module('kibana');
-
-    clock = sinon.useFakeTimers(moment(anchor).valueOf());
-
-    // Create the scope
-    inject(function ($filter, _config_) {
-      filter = $filter('moment');
-      config = _config_;
-    });
-  };
-
-
-  describe('moment formatting filter', function () {
-
-    beforeEach(function () {
-      init();
-    });
-
-    it('should have a moment filter', function () {
-      expect(filter).to.not.be(null);
-    });
-
-    // MMMM Do YYYY, HH:mm:ss.SSS
-    it('should format moments', function () {
-      expect(filter(moment())).to.be('January 1st 2014, 06:06:06.666');
-    });
-
-    it('should format dates', function () {
-      expect(filter(new Date())).to.be('January 1st 2014, 06:06:06.666');
-    });
-
-    it('should return the original value if passed anything other than a moment or Date', function () {
-      expect(filter('beer')).to.be('beer');
-      expect(filter(1)).to.be(1);
-      expect(filter([])).to.eql([]);
-    });
-  });
-
-});
diff --git a/test/unit/specs/filters/rison.js b/test/unit/specs/filters/rison.js
deleted file mode 100644
index bf3dacbdc7b7a..0000000000000
--- a/test/unit/specs/filters/rison.js
+++ /dev/null
@@ -1,57 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-
-  // Load the kibana app dependencies.
-  require('angular-route');
-
-  // Load kibana and its applications
-  require('plugins/discover/index');
-
-  var rison;
-  var risonDecode;
-
-  var init = function (expandable) {
-    // Load the application
-    module('kibana');
-
-    // Create the scope
-    inject(function ($filter) {
-      rison = $filter('rison');
-      risonDecode = $filter('risonDecode');
-    });
-  };
-
-  describe('rison filters', function () {
-    var testObj = {
-      time: {
-        from: 'now-15m',
-        to: 'now'
-      }
-    };
-    var testRison = '(time:(from:now-15m,to:now))';
-
-    beforeEach(function () {
-      init();
-    });
-
-    describe('rison', function () {
-      it('should have the filter', function () {
-        expect(rison).to.not.be(null);
-      });
-
-      it('should rison encode data', function () {
-        expect(rison(testObj)).to.be(testRison);
-      });
-    });
-
-    describe('risonDecode', function () {
-      it('should have the filter', function () {
-        expect(risonDecode).to.not.be(null);
-      });
-
-      it('should decode rison data', function () {
-        expect(risonDecode(testRison)).to.eql(testObj);
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/filters/short_dots.js b/test/unit/specs/filters/short_dots.js
deleted file mode 100644
index b537b1ff5f61d..0000000000000
--- a/test/unit/specs/filters/short_dots.js
+++ /dev/null
@@ -1,54 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-
-  // Load the kibana app dependencies.
-  require('angular-route');
-  require('plugins/discover/index');
-  require('filters/short_dots');
-
-  var filter, config;
-
-  var init = function (expandable) {
-    // Load the application
-    module('kibana');
-
-    // Create the scope
-    inject(function ($filter, _config_) {
-      config = _config_;
-      filter = $filter('shortDots');
-    });
-  };
-
-
-  describe('shortDots filter', function () {
-
-    beforeEach(function () {
-      init();
-    });
-
-    it('should have a uriescape filter', function () {
-      expect(filter).to.not.be(null);
-    });
-
-    it('should shorten foo.bar.baz to f.b.baz when shortDots:enable is true', function () {
-      config.set('shortDots:enable', true);
-      expect(filter('foo.bar.baz')).to.be('f.b.baz');
-    });
-
-    it('should not shorten when shortDots:enable is false', function () {
-      config.set('shortDots:enable', false);
-      expect(filter('foo.bar.baz')).to.be('foo.bar.baz');
-    });
-
-    it('should not shorten floating point numbers in any case', function () {
-      config.set('shortDots:enable', false);
-      expect(filter(12345.6789)).to.be(12345.6789);
-      config.set('shortDots:enable', true);
-      expect(filter(12345.6789)).to.be(12345.6789);
-    });
-
-
-  });
-
-});
diff --git a/test/unit/specs/filters/start_from.js b/test/unit/specs/filters/start_from.js
deleted file mode 100644
index 3bb08373e0317..0000000000000
--- a/test/unit/specs/filters/start_from.js
+++ /dev/null
@@ -1,40 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-
-  // Load the kibana app dependencies.
-  require('angular-route');
-  require('filters/start_from');
-
-  var filter;
-
-  var init = function (expandable) {
-    // Load the application
-    module('kibana');
-
-    // Create the scope
-    inject(function ($filter) {
-      filter = $filter('startFrom');
-    });
-  };
-
-  describe('startFrom array filter', function () {
-
-    beforeEach(function () {
-      init();
-    });
-
-    it('should have a startFrom filter', function () {
-      expect(filter).to.not.be(null);
-    });
-
-    it('should return an empty array if passed undefined', function () {
-      expect(filter(undefined, 10)).to.eql([]);
-    });
-
-    it('should return an array with the first 3 elements removed', function () {
-      expect(filter([1, 2, 3, 4, 5, 6, 7, 8, 9], 3).length).to.be(6);
-    });
-
-  });
-
-});
diff --git a/test/unit/specs/filters/uriescape.js b/test/unit/specs/filters/uriescape.js
deleted file mode 100644
index a100d9f30a5f4..0000000000000
--- a/test/unit/specs/filters/uriescape.js
+++ /dev/null
@@ -1,38 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-
-  // Load the kibana app dependencies.
-  require('angular-route');
-  require('plugins/discover/index');
-
-  var filter;
-
-  var init = function (expandable) {
-    // Load the application
-    module('kibana');
-
-    // Create the scope
-    inject(function ($filter) {
-      filter = $filter('uriescape');
-    });
-  };
-
-
-  describe('uriescape filter', function () {
-
-    beforeEach(function () {
-      init();
-    });
-
-    it('should have a uriescape filter', function () {
-      expect(filter).to.not.be(null);
-    });
-
-    it('should encodeURIComponent a string', function () {
-      expect(filter('this and that')).to.be('this%20and%20that');
-    });
-
-  });
-
-});
diff --git a/test/unit/specs/index_patterns/flatten_hit.js b/test/unit/specs/index_patterns/flatten_hit.js
deleted file mode 100644
index 548222bf40a2e..0000000000000
--- a/test/unit/specs/index_patterns/flatten_hit.js
+++ /dev/null
@@ -1,141 +0,0 @@
-define(function (require) {
-  describe('IndexPattern#flattenHit()', function () {
-
-    var _ = require('lodash');
-
-    var flattenHit;
-    var config;
-    var hit;
-    var flat;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function (Private, $injector) {
-      var indexPattern = {
-        fields: {
-          byName: {
-            'message': { type: 'string' },
-            'geo.coordinates': { type: 'geo_point' },
-            'geo.dest': { type: 'string' },
-            'geo.src': { type: 'string' },
-            'bytes': { type: 'number' },
-            '@timestamp': { type: 'date' },
-            'team': { type: 'nested' },
-            'team.name': { type: 'string' },
-            'team.role': { type: 'string' },
-            'user': { type: 'conflict' },
-            'user.name': { type: 'string' },
-            'user.id': { type: 'conflict' },
-            'delta': { type: 'number', scripted: true }
-          }
-        }
-      };
-
-      flattenHit = Private(require('components/index_patterns/_flatten_hit'))(indexPattern).uncached;
-      config = $injector.get('config');
-
-      hit = {
-        _source: {
-          message: 'Hello World',
-          geo: {
-            coordinates: { lat: 33.4500, lon: 112.0667 },
-            dest: 'US',
-            src: 'IN'
-          },
-          bytes: 10039103,
-          '@timestamp': (new Date()).toString(),
-          tags: [{ text: 'foo' }, { text: 'bar' }],
-          groups: ['loners'],
-          noMapping: true,
-          team: [
-            { name: 'foo', role: 'leader' },
-            { name: 'bar', role: 'follower' },
-            { name: 'baz', role: 'party boy' },
-          ],
-          user: { name: 'smith', id: 123 }
-        },
-        fields: {
-          delta: [42],
-          random: [0.12345]
-        }
-      };
-
-      flat = flattenHit(hit);
-    }));
-
-    it('flattens keys as far down as the mapping goes', function () {
-      expect(flat).to.have.property('geo.coordinates', hit._source.geo.coordinates);
-      expect(flat).to.not.have.property('geo.coordinates.lat');
-      expect(flat).to.not.have.property('geo.coordinates.lon');
-      expect(flat).to.have.property('geo.dest', 'US');
-      expect(flat).to.have.property('geo.src', 'IN');
-      expect(flat).to.have.property('@timestamp', hit._source['@timestamp']);
-      expect(flat).to.have.property('message', 'Hello World');
-      expect(flat).to.have.property('bytes', 10039103);
-    });
-
-    it('flattens keys not in the mapping', function () {
-      expect(flat).to.have.property('noMapping', true);
-      expect(flat).to.have.property('groups');
-      expect(flat.groups).to.eql(['loners']);
-    });
-
-    it('flattens conflicting types in the mapping', function () {
-      expect(flat).to.not.have.property('user');
-      expect(flat).to.have.property('user.name', hit._source.user.name);
-      expect(flat).to.have.property('user.id', hit._source.user.id);
-    });
-
-    it('preserves objects in arrays', function () {
-      expect(flat).to.have.property('tags', hit._source.tags);
-    });
-
-    it('does not enter into nested fields', function () {
-      expect(flat).to.have.property('team', hit._source.team);
-      expect(flat).to.not.have.property('team.name');
-      expect(flat).to.not.have.property('team.role');
-      expect(flat).to.not.have.property('team[0]');
-      expect(flat).to.not.have.property('team.0');
-    });
-
-    it('unwraps script fields', function () {
-      expect(flat).to.have.property('delta', 42);
-    });
-
-    it('assumes that all fields are "computed fields"', function () {
-      expect(flat).to.have.property('random', 0.12345);
-    });
-
-    it('ignores fields that start with an _ and are not in the metaFields', function () {
-      config.set('metaFields', ['_metaKey']);
-      hit.fields._notMetaKey = [100];
-      flat = flattenHit(hit);
-      expect(flat).to.not.have.property('_notMetaKey');
-    });
-
-    it('includes underscore-prefixed keys that are in the metaFields', function () {
-      config.set('metaFields', ['_metaKey']);
-      hit.fields._metaKey = [100];
-      flat = flattenHit(hit);
-      expect(flat).to.have.property('_metaKey', 100);
-    });
-
-    it('adapts to changes in the metaFields', function () {
-      hit.fields._metaKey = [100];
-
-      config.set('metaFields', ['_metaKey']);
-      flat = flattenHit(hit);
-      expect(flat).to.have.property('_metaKey', 100);
-
-      config.set('metaFields', []);
-      flat = flattenHit(hit);
-      expect(flat).to.not.have.property('_metaKey');
-    });
-
-    it('handles fields that are not arrays, like _timestamp', function () {
-      hit.fields._metaKey = 20000;
-      config.set('metaFields', ['_metaKey']);
-      flat = flattenHit(hit);
-      expect(flat).to.have.property('_metaKey', 20000);
-    });
-  });
-});
diff --git a/test/unit/specs/index_patterns/intervals.js b/test/unit/specs/index_patterns/intervals.js
deleted file mode 100644
index 5862e153a361f..0000000000000
--- a/test/unit/specs/index_patterns/intervals.js
+++ /dev/null
@@ -1,66 +0,0 @@
-define(function (require) {
-  var moment = require('moment');
-  describe('Index Patterns', function () {
-    describe('interval.toIndexList()', function () {
-
-      var intervals;
-      beforeEach(module('kibana'));
-      beforeEach(inject(function (Private) {
-        intervals = Private(require('components/index_patterns/_intervals'));
-      }));
-
-      it('should return correct indices for hourly [logstash-]YYYY.MM.DD.HH', function () {
-        var start = moment.utc('2014-01-01T07:00:00Z');
-        var end = moment.utc('2014-01-01T08:30:00Z');
-        var interval = { name: 'hours', startOf: 'hour', display: 'Hourly' };
-        var list = intervals.toIndexList('[logstash-]YYYY.MM.DD.HH', interval, start, end);
-        expect(list).to.contain('logstash-2014.01.01.07');
-        expect(list).to.contain('logstash-2014.01.01.08');
-      });
-
-      it('should return correct indices for daily [logstash-]YYYY.MM.DD', function () {
-        var start = moment(1418244231248);
-        var end = moment(1418849261281);
-        var interval = { name: 'days', startOf: 'day', display: 'Daily' };
-        var list = intervals.toIndexList('[logstash-]YYYY.MM.DD', interval, start, end);
-        expect(list).to.contain('logstash-2014.12.10');
-        expect(list).to.contain('logstash-2014.12.11');
-        expect(list).to.contain('logstash-2014.12.12');
-        expect(list).to.contain('logstash-2014.12.13');
-        expect(list).to.contain('logstash-2014.12.14');
-        expect(list).to.contain('logstash-2014.12.15');
-        expect(list).to.contain('logstash-2014.12.16');
-        expect(list).to.contain('logstash-2014.12.17');
-      });
-
-      it('should return correct indices for weekly [logstash-]GGGG.WW', function () {
-        var start = moment.utc(1418244231248);
-        var end = moment.utc(1418849261281);
-        var interval = { name: 'weeks', startOf: 'isoWeek', display: 'Weekly' };
-        var list = intervals.toIndexList('[logstash-]GGGG.WW', interval, start, end);
-        expect(list).to.contain('logstash-2014.50');
-        expect(list).to.contain('logstash-2014.51');
-      });
-
-      it('should return correct indices for monthly [logstash-]YYYY.MM', function () {
-        var start = moment.utc('2014-12-01');
-        var end = moment.utc('2015-02-01');
-        var interval = { name: 'months', startOf: 'month', display: 'Monthly' };
-        var list = intervals.toIndexList('[logstash-]YYYY.MM', interval, start, end);
-        expect(list).to.contain('logstash-2014.12');
-        expect(list).to.contain('logstash-2015.01');
-        expect(list).to.contain('logstash-2015.02');
-      });
-
-      it('should return correct indices for yearly [logstash-]YYYY', function () {
-        var start = moment.utc('2014-12-01');
-        var end = moment.utc('2015-02-01');
-        var interval = { name: 'years', startOf: 'year', display: 'Yearly' };
-        var list = intervals.toIndexList('[logstash-]YYYY', interval, start, end);
-        expect(list).to.contain('logstash-2014');
-        expect(list).to.contain('logstash-2015');
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/plugins/markdown_vis/markdown_vis_controller.js b/test/unit/specs/plugins/markdown_vis/markdown_vis_controller.js
deleted file mode 100644
index 9b9797320029e..0000000000000
--- a/test/unit/specs/plugins/markdown_vis/markdown_vis_controller.js
+++ /dev/null
@@ -1,25 +0,0 @@
-define(function (require) {
-  describe('markdown vis controller', function () {
-    var $scope, $el;
-
-    beforeEach(module('kibana/markdown_vis'));
-    beforeEach(inject(function ($rootScope, $controller) {
-      $scope = $rootScope.$new();
-      $controller('KbnMarkdownVisController', {$scope: $scope});
-      $scope.$digest();
-    }));
-
-    it('should set html from markdown params', function () {
-      expect($scope).to.not.have.property('html');
-      $scope.vis = {
-        params: {
-          markdown: 'This is a test of the [markdown](http://daringfireball.net/projects/markdown) vis.'
-        }
-      };
-      $scope.$digest();
-
-      expect($scope).to.have.property('html');
-      expect($scope.html.toString().indexOf('<a href')).to.be.greaterThan(-1);
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/plugins/metric_vis/metric_vis_controller.js b/test/unit/specs/plugins/metric_vis/metric_vis_controller.js
deleted file mode 100644
index 3898281850715..0000000000000
--- a/test/unit/specs/plugins/metric_vis/metric_vis_controller.js
+++ /dev/null
@@ -1,61 +0,0 @@
-define(function (require) {
-  describe('metric vis', function () {
-    var $scope;
-
-    var formatter = function (value) {
-      return value.toFixed(3);
-    };
-
-    beforeEach(module('kibana/metric_vis'));
-    beforeEach(inject(function ($rootScope, $controller) {
-      $scope = $rootScope.$new();
-      $controller('KbnMetricVisController', {$scope: $scope});
-      $scope.$digest();
-    }));
-
-    it('should set the metric label and value', function () {
-      $scope.processTableGroups({
-        tables: [{
-          columns: [{title: 'Count'}],
-          rows: [[4301021]],
-          aggConfig: function () {
-            return {
-              fieldFormatter: function () {
-                return formatter;
-              }
-            };
-          }
-        }]
-      });
-
-      expect($scope.metrics.length).to.be(1);
-      expect($scope.metrics[0].label).to.be('Count');
-      expect($scope.metrics[0].value).to.be('4301021.000');
-    });
-
-    it('should support multi-value metrics', function () {
-      $scope.processTableGroups({
-        tables: [{
-          columns: [
-            {title: '1st percentile of bytes'},
-            {title: '99th percentile of bytes'}
-          ],
-          rows: [[182, 445842.4634666484]],
-          aggConfig: function () {
-            return {
-              fieldFormatter: function () {
-                return formatter;
-              }
-            };
-          }
-        }]
-      });
-
-      expect($scope.metrics.length).to.be(2);
-      expect($scope.metrics[0].label).to.be('1st percentile of bytes');
-      expect($scope.metrics[0].value).to.be('182.000');
-      expect($scope.metrics[1].label).to.be('99th percentile of bytes');
-      expect($scope.metrics[1].value).to.be('445842.463');
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/plugins/settings/sections/advanced/lib/get_val_type.js b/test/unit/specs/plugins/settings/sections/advanced/lib/get_val_type.js
deleted file mode 100644
index 1d0f4a258fa26..0000000000000
--- a/test/unit/specs/plugins/settings/sections/advanced/lib/get_val_type.js
+++ /dev/null
@@ -1,36 +0,0 @@
-define(function (require) {
-  var getValType = require('plugins/settings/sections/advanced/lib/get_val_type');
-  describe('Settings', function () {
-    describe('Advanced', function () {
-      describe('getValType(def, val)', function () {
-        it('should be a function', function () {
-          expect(getValType).to.be.a(Function);
-        });
-
-        it('should return the explicitly defined type of a setting', function () {
-          expect(getValType({type: 'string'})).to.be('string');
-          expect(getValType({type: 'json'})).to.be('json');
-          expect(getValType({type: 'string', value: 5})).to.be('string');
-        });
-
-        it('should return array if the value is an Array and there is no defined type', function () {
-          expect(getValType({type: 'string'}, [1, 2, 3])).to.be('string');
-          expect(getValType({type: 'json', value: [1, 2, 3]})).to.be('json');
-
-          expect(getValType({value: 'someString'}, [1, 2, 3])).to.be('array');
-          expect(getValType({value: [1, 2, 3]}, 'someString')).to.be('array');
-
-        });
-
-        it('should return the type of the default value if there is no type and it is not an array', function () {
-          expect(getValType({value: 'someString'})).to.be('string');
-          expect(getValType({value: 'someString'}, 42)).to.be('string');
-        });
-
-        it('should return the type of the value if the default value is null', function () {
-          expect(getValType({value: null}, 'someString')).to.be('string');
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/plugins/table_vis/_table_vis.js b/test/unit/specs/plugins/table_vis/_table_vis.js
deleted file mode 100644
index 865aeb47cd9c5..0000000000000
--- a/test/unit/specs/plugins/table_vis/_table_vis.js
+++ /dev/null
@@ -1,133 +0,0 @@
-define(function (require) {
-  return ['Integration', function () {
-    var $ = require('jquery');
-    var _ = require('lodash');
-    var sinon = require('test_utils/auto_release_sinon');
-
-    var $rootScope;
-    var TableGroup;
-    var $compile;
-    var $scope;
-    var $el;
-    var Vis;
-    var indexPattern;
-    var fixtures;
-
-    beforeEach(module('kibana', 'kibana/table_vis'));
-    beforeEach(inject(function (Private, $injector) {
-      $rootScope = $injector.get('$rootScope');
-      $compile = $injector.get('$compile');
-      fixtures = require('fixtures/fake_hierarchical_data');
-      TableGroup = Private(require('components/agg_response/tabify/_table_group'));
-      Vis = Private(require('components/vis/vis'));
-      indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-    }));
-
-    // basically a parameterized beforeEach
-    function init(vis, esResponse) {
-      vis.aggs.forEach(function (agg, i) { agg.id = 'agg_' + (i + 1); });
-
-      $rootScope.vis = vis;
-      $rootScope.esResponse = esResponse;
-      $el = $('<visualize vis="vis" es-resp="esResponse">');
-      $compile($el)($rootScope);
-      $rootScope.$apply();
-
-      $scope = $el.isolateScope();
-    }
-
-    function OneRangeVis(params) {
-      return new Vis(indexPattern, {
-        type: 'table',
-        params: params || {},
-        aggs: [
-          { type: 'count', schema: 'metric' },
-          {
-            type: 'range',
-            schema: 'bucket',
-            params: {
-              field: 'bytes',
-              ranges: [
-                { from: 0, to: 1000 },
-                { from: 1000, to: 2000 }
-              ]
-            }
-          }
-        ]
-      });
-    }
-
-    function ThreeTermVis(params) {
-      return new Vis(indexPattern, {
-        type: 'table',
-        params: params,
-        aggs: [
-          { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-          {
-            type: 'terms',
-            schema: 'split',
-            params: {
-              field: 'extension'
-            }
-          },
-          {
-            type: 'terms',
-            schema: 'bucket',
-            params: {
-              field: 'geo.src'
-            }
-          },
-          {
-            type: 'terms',
-            schema: 'bucket',
-            params: {
-              field: 'machine.os'
-            }
-          }
-        ]
-      });
-    }
-
-    it('passes the table groups to the kbnAggTableGroup directive', function () {
-      init(OneRangeVis(), fixtures.oneRangeBucket);
-
-      var $atg = $el.find('kbn-agg-table-group').first();
-      expect($atg.size()).to.be(1);
-      expect($atg.attr('group')).to.be('tableGroups');
-      expect($atg.isolateScope().group).to.be($atg.scope().tableGroups);
-    });
-
-    it('displays an error if the search had no hits', function () {
-      init(OneRangeVis(), { hits: { total: 0, hits: [] }});
-
-      expect($el.find('kbn-agg-table-group').size()).to.be(0);
-
-      var $err = $el.find('.table-vis-error');
-      expect($err.size()).to.be(1);
-      expect($err.text().trim()).to.be('No results found');
-    });
-
-    it('displays an error if the search hits, but didn\'t create any rows', function () {
-      var visParams = {
-        showPartialRows: false,
-        metricsAtAllLevels: true
-      };
-
-      var resp = _.cloneDeep(fixtures.threeTermBuckets);
-      resp.aggregations.agg_2.buckets.forEach(function (extensionBucket) {
-        extensionBucket.agg_3.buckets.forEach(function (countryBucket) {
-          // clear all the machine os buckets
-          countryBucket.agg_4.buckets = [];
-        });
-      });
-
-      init(ThreeTermVis(visParams), resp);
-
-      expect($el.find('kbn-agg-table-group').size()).to.be(0);
-
-      var $err = $el.find('.table-vis-error');
-      expect($err.size()).to.be(1);
-      expect($err.text().trim()).to.be('No results found');
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/plugins/table_vis/_table_vis_controller.js b/test/unit/specs/plugins/table_vis/_table_vis_controller.js
deleted file mode 100644
index de85b06606577..0000000000000
--- a/test/unit/specs/plugins/table_vis/_table_vis_controller.js
+++ /dev/null
@@ -1,170 +0,0 @@
-define(function (require) {
-  return ['Controller', function () {
-    var $ = require('jquery');
-    var _ = require('lodash');
-    var sinon = require('test_utils/auto_release_sinon');
-
-    var $rootScope;
-    var TableGroup;
-    var $compile;
-    var Private;
-    var $scope;
-    var $el;
-    var Vis;
-    var fixtures;
-
-    beforeEach(module('kibana', 'kibana/table_vis'));
-    beforeEach(inject(function ($injector) {
-      Private = $injector.get('Private');
-      $rootScope = $injector.get('$rootScope');
-      $compile = $injector.get('$compile');
-      fixtures = require('fixtures/fake_hierarchical_data');
-      TableGroup = Private(require('components/agg_response/tabify/_table_group'));
-      Vis = Private(require('components/vis/vis'));
-    }));
-
-    function OneRangeVis(params) {
-      return new Vis(
-        Private(require('fixtures/stubbed_logstash_index_pattern')),
-        {
-          type: 'table',
-          params: params || {},
-          aggs: [
-            { type: 'count', schema: 'metric' },
-            {
-              type: 'range',
-              schema: 'bucket',
-              params: {
-                field: 'bytes',
-                ranges: [
-                  { from: 0, to: 1000 },
-                  { from: 1000, to: 2000 }
-                ]
-              }
-            }
-          ]
-        }
-      );
-    }
-
-    // basically a parameterized beforeEach
-    function initController(vis) {
-      vis.aggs.forEach(function (agg, i) { agg.id = 'agg_' + (i + 1); });
-
-      $rootScope.vis = vis;
-      $rootScope.newScope = function (scope) { $scope = scope; };
-
-      $el = $('<div>')
-        .attr('ng-controller', 'KbnTableVisController')
-        .attr('ng-init', 'newScope(this)');
-
-      $compile($el)($rootScope);
-    }
-
-    // put a response into the controller
-    function attachEsResponseToScope(resp) {
-      $rootScope.esResponse = resp || fixtures.oneRangeBucket;
-      $rootScope.$apply();
-    }
-
-    // remove the response from the controller
-    function removeEsResponseFromScope() {
-      delete $rootScope.esResponse;
-      $rootScope.$apply();
-    }
-
-    it('exposes #tableGroups and #hasSomeRows when a response is attached to scope', function () {
-      initController(OneRangeVis());
-
-      expect(!$scope.tableGroups).to.be.ok();
-      expect(!$scope.hasSomeRows).to.be.ok();
-
-      attachEsResponseToScope(fixtures.oneRangeBucket);
-
-      expect($scope.hasSomeRows).to.be(true);
-      expect($scope.tableGroups).to.have.property('tables');
-      expect($scope.tableGroups.tables).to.have.length(1);
-      expect($scope.tableGroups.tables[0].columns).to.have.length(2);
-      expect($scope.tableGroups.tables[0].rows).to.have.length(2);
-    });
-
-    it('clears #tableGroups and #hasSomeRows when the response is removed', function () {
-      initController(OneRangeVis());
-
-      attachEsResponseToScope(fixtures.oneRangeBucket);
-      removeEsResponseFromScope();
-
-      expect(!$scope.hasSomeRows).to.be.ok();
-      expect(!$scope.tableGroups).to.be.ok();
-    });
-
-    it('sets #hasSomeRows properly if the table group is empty', function () {
-      initController(OneRangeVis());
-
-      // modify the data to not have any buckets
-      var resp = _.cloneDeep(fixtures.oneRangeBucket);
-      resp.aggregations.agg_2.buckets = {};
-
-      attachEsResponseToScope(resp);
-
-      expect($scope.hasSomeRows).to.be(false);
-      expect(!$scope.tableGroups).to.be.ok();
-    });
-
-    it('passes partialRows:true to tabify based on the vis params', function () {
-      // spy on the tabify private module
-      var tabifyPm = require('components/agg_response/tabify/tabify');
-      var spiedTabify = sinon.spy(Private(tabifyPm));
-      Private.stub(tabifyPm, spiedTabify);
-
-      var vis = OneRangeVis({ showPartialRows: true });
-      initController(vis);
-      attachEsResponseToScope(fixtures.oneRangeBucket);
-
-      expect(spiedTabify).to.have.property('callCount', 1);
-      expect(spiedTabify.firstCall.args[2]).to.have.property('partialRows', true);
-    });
-
-    it('passes partialRows:false to tabify based on the vis params', function () {
-      // spy on the tabify private module
-      var tabifyPm = require('components/agg_response/tabify/tabify');
-      var spiedTabify = sinon.spy(Private(tabifyPm));
-      Private.stub(tabifyPm, spiedTabify);
-
-      var vis = OneRangeVis({ showPartialRows: false });
-      initController(vis);
-      attachEsResponseToScope(fixtures.oneRangeBucket);
-
-      expect(spiedTabify).to.have.property('callCount', 1);
-      expect(spiedTabify.firstCall.args[2]).to.have.property('partialRows', false);
-    });
-
-    it('passes partialRows:true to tabify based on the vis params', function () {
-      // spy on the tabify private module
-      var tabifyPm = require('components/agg_response/tabify/tabify');
-      var spiedTabify = sinon.spy(Private(tabifyPm));
-      Private.stub(tabifyPm, spiedTabify);
-
-      var vis = OneRangeVis({ showPartialRows: true });
-      initController(vis);
-      attachEsResponseToScope(fixtures.oneRangeBucket);
-
-      expect(spiedTabify).to.have.property('callCount', 1);
-      expect(spiedTabify.firstCall.args[2]).to.have.property('partialRows', true);
-    });
-
-    it('passes partialRows:false to tabify based on the vis params', function () {
-      // spy on the tabify private module
-      var tabifyPm = require('components/agg_response/tabify/tabify');
-      var spiedTabify = sinon.spy(Private(tabifyPm));
-      Private.stub(tabifyPm, spiedTabify);
-
-      var vis = OneRangeVis({ showPartialRows: false });
-      initController(vis);
-      attachEsResponseToScope(fixtures.oneRangeBucket);
-
-      expect(spiedTabify).to.have.property('callCount', 1);
-      expect(spiedTabify.firstCall.args[2]).to.have.property('partialRows', false);
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/plugins/table_vis/index.js b/test/unit/specs/plugins/table_vis/index.js
deleted file mode 100644
index c92857b11b08b..0000000000000
--- a/test/unit/specs/plugins/table_vis/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-define(function (require) {
-  describe('Table Vis', function () {
-    describe(require('specs/plugins/table_vis/_table_vis_controller'));
-    describe(require('specs/plugins/table_vis/_table_vis'));
-  });
-});
diff --git a/test/unit/specs/plugins/visualize/editor/agg.js b/test/unit/specs/plugins/visualize/editor/agg.js
deleted file mode 100644
index 726aaa486b314..0000000000000
--- a/test/unit/specs/plugins/visualize/editor/agg.js
+++ /dev/null
@@ -1,89 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var $ = require('jquery');
-  var _ = require('lodash');
-
-
-  require('plugins/visualize/editor/agg');
-
-
-  describe('Vis-Editor-Agg plugin directive', function () {
-    var $parentScope = {};
-    var $scope, $elem;
-
-    function makeConfig(which) {
-      var schemaMap = {
-        radius: {
-          title: 'Dot Size',
-          min: 0,
-          max: 1
-        },
-        metric: {
-          title: 'Y-Axis',
-          min: 1,
-          max: Infinity
-        }
-      };
-      var typeOptions = ['count', 'avg', 'sum', 'min', 'max', 'cardinality'];
-      which = which || 'metric';
-
-      var schema = schemaMap[which];
-
-      return {
-        min: schema.min,
-        max: schema.max,
-        name: which,
-        title: schema.title,
-        group: 'metrics',
-        aggFilter: typeOptions,
-        // AggParams object
-        params: []
-      };
-    }
-
-    beforeEach(module('kibana'));
-    beforeEach(function () {
-
-      $parentScope.agg = {
-        id: 1,
-        params: {},
-        schema: makeConfig()
-      };
-      $parentScope.groupName = 'metrics';
-      $parentScope.group = [{
-        id: '1',
-        schema: makeConfig()
-      }, {
-        id: '2',
-        schema: makeConfig('radius')
-      }];
-    });
-    beforeEach(inject(function ($rootScope, $compile) {
-      // share the scope
-      _.defaults($parentScope, $rootScope, Object.getPrototypeOf($rootScope));
-
-      // make the element
-      $elem = angular.element(
-        '<ng-form vis-editor-agg></ng-form>'
-      );
-
-      // compile the html
-      $compile($elem)($parentScope);
-
-      // Digest everything
-      $elem.scope().$digest();
-
-      // give us a scope to work with
-      $scope = $elem.isolateScope();
-    }));
-
-    it('should only add the close button if there is more than the minimum', function () {
-      expect($parentScope.canRemove($parentScope.agg)).to.be(false);
-      $parentScope.group.push({
-        id: '3',
-        schema: makeConfig()
-      });
-      expect($parentScope.canRemove($parentScope.agg)).to.be(true);
-    });
-  });
-});
diff --git a/test/unit/specs/registry/index.js b/test/unit/specs/registry/index.js
deleted file mode 100644
index 5e3717f551e51..0000000000000
--- a/test/unit/specs/registry/index.js
+++ /dev/null
@@ -1,114 +0,0 @@
-define(function (require) {
-  describe('Registry', function () {
-    var _ = require('lodash');
-    var sinon = require('test_utils/auto_release_sinon');
-    var registry = require('registry/_registry');
-    var Private;
-    var IndexedArray;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function ($injector) {
-      Private = $injector.get('Private');
-    }));
-
-    it('is technically a function', function () {
-      var reg = registry();
-      expect(reg).to.be.a('function');
-    });
-
-    describe('#register', function () {
-      it('accepts a Private module', function () {
-        var reg = registry();
-        var mod = function SomePrivateModule() {};
-
-        reg.register(mod);
-        // modules are not exposed, so this is the most that we can test
-      });
-    });
-
-    describe('as a module', function () {
-      it('exposes the list of registered modules', function () {
-        var reg = registry();
-        var mod = function SomePrivateModule(Private) {
-          this.PrivateModuleLoader = Private;
-        };
-
-        reg.register(mod);
-        var modules = Private(reg);
-        expect(modules).to.have.length(1);
-        expect(modules[0]).to.have.property('PrivateModuleLoader', Private);
-      });
-    });
-
-    describe('spec', function () {
-      it('executes with the module list as "this", and can override it', function () {
-        var i = 0;
-        var self;
-
-        var reg = registry({
-          constructor: function () {
-            return { mods: (self = this) };
-          }
-        });
-
-        var modules = Private(reg);
-        expect(modules).to.be.an('object');
-        expect(modules).to.have.property('mods', self);
-      });
-    });
-
-    describe('spec.name', function () {
-      it('sets the displayName of the registry and the name param on the final instance', function () {
-        var reg = registry({
-          name: 'visTypes'
-        });
-
-        expect(reg).to.have.property('displayName', '[registry visTypes]');
-        expect(Private(reg)).to.have.property('name', 'visTypes');
-      });
-    });
-
-    describe('spec.constructor', function () {
-      it('executes before the modules are returned', function () {
-        var i = 0;
-        var reg = registry({
-          constructor: function () {
-            i = i + 1;
-          }
-        });
-
-        var modules = Private(reg);
-        expect(i).to.be(1);
-      });
-
-      it('executes with the module list as "this", and can override it', function () {
-        var i = 0;
-        var self;
-
-        var reg = registry({
-          constructor: function () {
-            return { mods: (self = this) };
-          }
-        });
-
-        var modules = Private(reg);
-        expect(modules).to.be.an('object');
-        expect(modules).to.have.property('mods', self);
-      });
-    });
-
-    describe('spec[any]', function () {
-      it('mixes the extra properties into the module list', function () {
-        var reg = registry({
-          someMethod: function () {
-            return this;
-          }
-        });
-
-        var modules = Private(reg);
-        expect(modules).to.have.property('someMethod');
-        expect(modules.someMethod()).to.be(modules);
-      });
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/services/debounce.js b/test/unit/specs/services/debounce.js
deleted file mode 100644
index 0b38a15a1e047..0000000000000
--- a/test/unit/specs/services/debounce.js
+++ /dev/null
@@ -1,84 +0,0 @@
-define(function (require) {
-  var sinon = require('test_utils/auto_release_sinon');
-
-  var debounce;
-  var $timeout;
-  var $timeoutSpy;
-
-  function init() {
-    module('kibana');
-
-    inject(function ($injector, _$timeout_) {
-      $timeout = _$timeout_;
-      $timeoutSpy = sinon.spy($timeout);
-
-      debounce = $injector.get('debounce');
-    });
-  }
-
-  describe('debounce service', function () {
-    var spy;
-    beforeEach(function () {
-      spy = sinon.spy(function () {});
-      init();
-    });
-
-    describe('API', function () {
-      it('should have a cancel method', function () {
-        var bouncer = debounce(function () {}, 100);
-        expect(bouncer).to.have.property('cancel');
-      });
-    });
-
-    describe('delayed execution', function () {
-      it('should delay execution', function () {
-        var bouncer = debounce(spy, 100);
-        bouncer();
-        expect(spy.callCount).to.be(0);
-        $timeout.flush();
-        expect(spy.callCount).to.be(1);
-      });
-
-      it('should fire on leading edge', function () {
-        var bouncer = debounce(spy, 100, { leading: true });
-        bouncer();
-        expect(spy.callCount).to.be(1);
-        $timeout.flush();
-        expect(spy.callCount).to.be(2);
-      });
-
-      it('should only fire on leading edge', function () {
-        var bouncer = debounce(spy, 100, { leading: true, trailing: false });
-        bouncer();
-        expect(spy.callCount).to.be(1);
-        $timeout.flush();
-        expect(spy.callCount).to.be(1);
-      });
-
-      it('should reset delayed execution', function (done) {
-        var cancelSpy = sinon.spy($timeout, 'cancel');
-        var bouncer = debounce(spy, 100);
-        bouncer();
-        setTimeout(function () {
-          bouncer();
-          expect(spy.callCount).to.be(0);
-          $timeout.flush();
-          expect(spy.callCount).to.be(1);
-          expect(cancelSpy.callCount).to.be(1);
-          done();
-        }, 1);
-      });
-    });
-
-    describe('cancel', function () {
-      it('should cancel the $timeout', function () {
-        var cancelSpy = sinon.spy($timeout, 'cancel');
-        var bouncer = debounce(spy, 100);
-        bouncer();
-        bouncer.cancel();
-        expect(cancelSpy.callCount).to.be(1);
-        $timeout.verifyNoPendingTasks(); // throws if pending timeouts
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/services/persisted_log.js b/test/unit/specs/services/persisted_log.js
deleted file mode 100644
index 3a420e0cebd3f..0000000000000
--- a/test/unit/specs/services/persisted_log.js
+++ /dev/null
@@ -1,115 +0,0 @@
-define(function (require) {
-  var sinon = require('sinon/sinon');
-
-  var storage;
-  var config;
-  var PersistedLog;
-
-  var historyName = 'testHistory';
-  var historyLimit = 10;
-  var payload = [
-    { first: 'clark', last: 'kent' },
-    { first: 'peter', last: 'parker' },
-    { first: 'bruce', last: 'wayne' }
-  ];
-
-  require('components/persisted_log/persisted_log');
-
-  function init() {
-    module('kibana/persisted_log', function ($provide) {
-      // mock storage service
-      $provide.service('localStorage', function () {
-        this.get = sinon.stub();
-        this.set = sinon.stub();
-        this.remove = sinon.spy();
-        this.clear = sinon.spy();
-      });
-    });
-
-    inject(function ($injector) {
-      storage = $injector.get('localStorage');
-      PersistedLog = $injector.get('PersistedLog');
-    });
-  }
-
-  describe('PersistedLog', function () {
-    beforeEach(function () {
-      init();
-    });
-
-    describe('expected API', function () {
-      it('has expected methods', function () {
-        var log = new PersistedLog(historyName);
-
-        expect(log.add).to.be.a('function');
-        expect(log.get).to.be.a('function');
-      });
-    });
-
-    describe('internal functionality', function () {
-      it('reads from storage', function () {
-        var log = new PersistedLog(historyName);
-
-        expect(storage.get.calledOnce).to.be(true);
-        expect(storage.get.calledWith(historyName)).to.be(true);
-      });
-
-      it('writes to storage', function () {
-        var log = new PersistedLog(historyName);
-        var newItem = { first: 'diana', last: 'prince' };
-
-        var data = log.add(newItem);
-
-        expect(storage.set.calledOnce).to.be(true);
-        expect(data).to.eql([newItem]);
-      });
-    });
-
-    describe('persisting data', function () {
-      it('fetches records from storage', function () {
-        storage.get.returns(payload);
-        var log = new PersistedLog(historyName);
-
-        var items = log.get();
-        expect(items.length).to.equal(3);
-        expect(items).to.eql(payload);
-      });
-
-      it('prepends new records', function () {
-        storage.get.returns(payload.slice(0));
-        var log = new PersistedLog(historyName);
-        var newItem = { first: 'selina', last: 'kyle' };
-
-        var items = log.add(newItem);
-        expect(items.length).to.equal(payload.length + 1);
-        expect(items[0]).to.eql(newItem);
-      });
-    });
-
-    describe('stack options', function () {
-      it('should observe the maxLength option', function () {
-        var bulkData = [];
-
-        for (var i = 0; i < historyLimit; i++) {
-          bulkData.push(['record ' + i]);
-        }
-        storage.get.returns(bulkData);
-
-        var log = new PersistedLog(historyName, { maxLength: historyLimit });
-        log.add(['new array 1']);
-        var items = log.add(['new array 2']);
-
-        expect(items.length).to.equal(historyLimit);
-      });
-
-      it('should observe the filterDuplicates option', function () {
-        storage.get.returns(payload.slice(0));
-        var log = new PersistedLog(historyName, { filterDuplicates: true });
-        var newItem = payload[1];
-
-        var items = log.add(newItem);
-        expect(items.length).to.equal(payload.length);
-      });
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/services/private.js b/test/unit/specs/services/private.js
deleted file mode 100644
index a27ba223c6ab5..0000000000000
--- a/test/unit/specs/services/private.js
+++ /dev/null
@@ -1,106 +0,0 @@
-define(function (require) {
-  describe('Private module loader', function () {
-
-    var Private;
-
-    beforeEach(module('kibana'));
-    beforeEach(inject(function ($injector) {
-      Private = $injector.get('Private');
-    }));
-
-    it('accepts a provider that will be called to init a module', function () {
-      var football = {};
-      function Provider() {
-        return football;
-      }
-
-      var instance = Private(Provider);
-      expect(instance).to.be(football);
-    });
-
-    it('injects angular dependencies into the Provider', function () {
-      function Provider(Private) {
-        return Private;
-      }
-
-      var instance = Private(Provider);
-      expect(instance).to.be(Private);
-    });
-
-    it('detects circular dependencies', function () {
-      expect(function () {
-        function Provider1() {
-          var p3 = Private(Provider3);
-        }
-
-        function Provider2() {
-          var p3 = Private(Provider3);
-        }
-
-        function Provider3() {
-          var p1 = Private(Provider3);
-        }
-
-        var p1 = Private(Provider1);
-      }).to.throwException(/circular/i);
-    });
-
-    it('allways provides the same instance form the Provider', function () {
-      function Provider() {
-        return {};
-      }
-
-      expect(Private(Provider)).to.be(Private(Provider));
-    });
-
-    describe('#stub', function () {
-      it('accepts a replacement instance for a Provider', function () {
-        var replaced = {};
-        var replacement = {};
-
-        function Provider() {
-          return replaced;
-        }
-
-        var instance = Private(Provider);
-        expect(instance).to.be(replaced);
-
-        Private.stub(Provider, replacement);
-
-        var instance2 = Private(Provider);
-        expect(instance2).to.be(replacement);
-
-        Private.stub(Provider, replaced);
-
-        var instance3 = Private(Provider);
-        expect(instance3).to.be(replaced);
-      });
-    });
-
-    describe('#swap', function () {
-      it('accepts a new Provider that should replace an existing Provider', function () {
-        function Provider1() {
-          return {};
-        }
-
-        function Provider2() {
-          return {};
-        }
-
-        var instance1 = Private(Provider1);
-        expect(instance1).to.be.an('object');
-
-        Private.swap(Provider1, Provider2);
-
-        var instance2 = Private(Provider1);
-        expect(instance2).to.be.an('object');
-        expect(instance2).to.not.be(instance1);
-
-        Private.swap(Provider1, Provider1);
-
-        var instance3 = Private(Provider1);
-        expect(instance3).to.be(instance1);
-      });
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/services/storage.js b/test/unit/specs/services/storage.js
deleted file mode 100644
index 3a8461bf3fd8f..0000000000000
--- a/test/unit/specs/services/storage.js
+++ /dev/null
@@ -1,106 +0,0 @@
-define(function (require) {
-  var sinon = require('sinon/sinon');
-
-  var storage;
-  var $window;
-  var payload = { first: 'john', last: 'smith' };
-
-  require('components/storage/storage');
-
-  function init() {
-    module('kibana/storage', function ($provide) {
-      // mock $window.localStorage for storage
-      $provide.value('$window', {
-        localStorage: {
-          getItem: sinon.stub(),
-          setItem: sinon.spy(),
-          removeItem: sinon.spy(),
-          clear: sinon.spy()
-        }
-      });
-    });
-
-    inject(function ($injector) {
-      storage = $injector.get('localStorage');
-      $window = $injector.get('$window');
-    });
-  }
-
-  describe('StorageService', function () {
-    beforeEach(function () {
-      init();
-    });
-
-    describe('expected API', function () {
-      it('should have expected methods', function () {
-        expect(storage.get).to.be.a('function');
-        expect(storage.set).to.be.a('function');
-        expect(storage.remove).to.be.a('function');
-        expect(storage.clear).to.be.a('function');
-      });
-    });
-
-    describe('call behavior', function () {
-      it('should call getItem on the store', function () {
-        storage.get('name');
-
-        expect($window.localStorage.getItem.callCount).to.equal(1);
-      });
-
-      it('should call setItem on the store', function () {
-        storage.set('name', 'john smith');
-
-        expect($window.localStorage.setItem.callCount).to.equal(1);
-      });
-
-      it('should call removeItem on the store', function () {
-        storage.remove('name');
-
-        expect($window.localStorage.removeItem.callCount).to.equal(1);
-      });
-
-      it('should call clear on the store', function () {
-        storage.clear();
-
-        expect($window.localStorage.clear.callCount).to.equal(1);
-      });
-    });
-
-    describe('json data', function () {
-      it('should parse JSON when reading from the store', function () {
-        var getItem = $window.localStorage.getItem;
-        getItem.returns(JSON.stringify(payload));
-
-        var data = storage.get('name');
-        expect(data).to.eql(payload);
-      });
-
-      it('should write JSON string to the store', function () {
-        var setItem = $window.localStorage.setItem;
-        var key = 'name';
-        var value = payload;
-
-        storage.set(key, value);
-
-        var call = setItem.getCall(0);
-        expect(call.args[0]).to.equal(key);
-        expect(call.args[1]).to.equal(JSON.stringify(value));
-      });
-    });
-
-    describe('expected responses', function () {
-      it('should return null when not exists', function () {
-        var data = storage.get('notexists');
-        expect(data).to.equal(null);
-      });
-
-      it('should return null when invalid JSON', function () {
-        var getItem = $window.localStorage.getItem;
-        getItem.returns('not: json');
-
-        var data = storage.get('name');
-        expect(data).to.equal(null);
-      });
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/services/url.js b/test/unit/specs/services/url.js
deleted file mode 100644
index 37707ed992bfb..0000000000000
--- a/test/unit/specs/services/url.js
+++ /dev/null
@@ -1,474 +0,0 @@
-define(function (require) {
-  var sinon = require('test_utils/auto_release_sinon');
-  var faker = require('faker');
-  var _ = require('lodash');
-  var MockState = require('fixtures/mock_state');
-
-  // global vars, injected and mocked in init()
-  var kbnUrl;
-  var $route;
-  var $location;
-  var $rootScope;
-  var globalStateMock;
-  var appState;
-
-  require('components/url/url');
-
-  function init() {
-    module('kibana/url', 'kibana', function ($provide) {
-      $provide.service('$route', function () {
-        return {
-          reload: _.noop
-        };
-      });
-
-      appState = { destroy: sinon.stub() };
-      $provide.service('getAppState', function () {
-        return function () {
-          return appState;
-        };
-      });
-
-      $provide.service('globalState', function () {
-        globalStateMock = new MockState();
-        globalStateMock.removeFromUrl = function (url) {
-          return url;
-        };
-
-        return globalStateMock;
-      });
-    });
-
-    inject(function ($injector) {
-      $route = $injector.get('$route');
-      $location = $injector.get('$location');
-      $rootScope = $injector.get('$rootScope');
-      kbnUrl = $injector.get('kbnUrl');
-    });
-  }
-
-  describe('kbnUrl', function () {
-
-    beforeEach(function () {
-      init();
-    });
-
-    describe('forcing reload', function () {
-      it('schedules a listener for $locationChangeSuccess on the $rootScope', function () {
-        $location.url('/url');
-        $route.current = {
-          $$route: {
-            regex: /.*/
-          }
-        };
-
-        sinon.stub($rootScope, '$on');
-
-        expect($rootScope.$on.callCount).to.be(0);
-        kbnUrl.change('/url');
-        sinon.assert.calledOnce(appState.destroy);
-        expect($rootScope.$on.callCount).to.be(1);
-        expect($rootScope.$on.firstCall.args[0]).to.be('$locationChangeSuccess');
-      });
-
-      it('handler unbinds the listener and calls reload', function () {
-        $location.url('/url');
-        $route.current = {
-          $$route: {
-            regex: /.*/
-          }
-        };
-
-        var unbind = sinon.stub();
-        sinon.stub($rootScope, '$on').returns(unbind);
-        $route.reload = sinon.stub();
-
-        expect($rootScope.$on.callCount).to.be(0);
-        kbnUrl.change('/url');
-        expect($rootScope.$on.callCount).to.be(1);
-
-        var handler = $rootScope.$on.firstCall.args[1];
-        handler();
-        expect(unbind.callCount).to.be(1);
-        expect($route.reload.callCount).to.be(1);
-      });
-
-      it('reloads requested before the first are ignored', function () {
-        $location.url('/url');
-        $route.current = {
-          $$route: {
-            regex: /.*/
-          }
-        };
-        $route.reload = sinon.stub();
-
-        sinon.stub($rootScope, '$on').returns(sinon.stub());
-
-        expect($rootScope.$on.callCount).to.be(0);
-        kbnUrl.change('/url');
-        expect($rootScope.$on.callCount).to.be(1);
-
-        // don't call the first handler
-
-        kbnUrl.change('/url');
-        expect($rootScope.$on.callCount).to.be(1);
-      });
-
-      it('one reload can happen once the first has completed', function () {
-        $location.url('/url');
-        $route.current = {
-          $$route: {
-            regex: /.*/
-          }
-        };
-        $route.reload = sinon.stub();
-
-        sinon.stub($rootScope, '$on').returns(sinon.stub());
-
-        expect($rootScope.$on.callCount).to.be(0);
-        kbnUrl.change('/url');
-        expect($rootScope.$on.callCount).to.be(1);
-
-        // call the first handler
-        $rootScope.$on.firstCall.args[1]();
-        expect($route.reload.callCount).to.be(1);
-
-        expect($rootScope.$on.callCount).to.be(1);
-        kbnUrl.change('/url');
-        expect($rootScope.$on.callCount).to.be(2);
-      });
-    });
-
-    describe('change', function () {
-      it('should set $location.url', function () {
-        sinon.stub($location, 'url');
-
-        expect($location.url.callCount).to.be(0);
-        kbnUrl.change('/some-url');
-        expect($location.url.callCount).to.be(1);
-      });
-
-      it('should uri encode replaced params', function () {
-        var url = '/some/path/';
-        var params = { replace: faker.Lorem.words(3).join(' ') };
-        var check = encodeURIComponent(params.replace);
-        sinon.stub($location, 'url');
-
-        kbnUrl.change(url + '{{replace}}', params);
-
-        expect($location.url.firstCall.args[0]).to.be(url + check);
-      });
-
-      it('should parse angular expression in substitutions and uri encode the results', function () {
-        // build url by piecing together these parts
-        var urlParts = ['/', '/', '?', '&', '#'];
-        // make sure it can parse templates with weird spacing
-        var wrappers = [ ['{{', '}}'], ['{{ ', ' }}'], ['{{', '  }}'], ['{{    ', '}}'], ['{{    ', '         }}']];
-        // make sure filters are evaluated via angular expressions
-        var objIndex = 4; // used to case one replace as an object
-        var filters = ['', 'uppercase', '', 'uppercase', 'rison'];
-
-        // the words (template keys) used must all be unique
-        var words = _.uniq(faker.Lorem.words(10)).slice(0, urlParts.length).map(function (word, i) {
-          if (filters[i].length) {
-            return word + '|' + filters[i];
-          }
-          return word;
-        });
-
-        var replacements = faker.Lorem.words(urlParts.length).map(function (word, i) {
-          // make selected replacement into an object
-          if (i === objIndex) {
-            return { replace: word };
-          }
-
-          return word;
-        });
-
-        // build the url and test url
-        var url = '';
-        var testUrl = '';
-        urlParts.forEach(function (part, i) {
-          url += part + wrappers[i][0] + words[i] + wrappers[i][1];
-          var locals = {};
-          locals[words[i].split('|')[0]] = replacements[i];
-          testUrl += part + encodeURIComponent($rootScope.$eval(words[i], locals));
-        });
-
-        // create the locals replacement object
-        var params = {};
-        replacements.forEach(function (replacement, i) {
-          var word = words[i].split('|')[0];
-          params[word] = replacement;
-        });
-
-        sinon.stub($location, 'url');
-
-        kbnUrl.change(url, params);
-
-        expect($location.url.firstCall.args[0]).to.not.be(url);
-        expect($location.url.firstCall.args[0]).to.be(testUrl);
-      });
-
-      it('should handle dot notation', function () {
-        var url = '/some/thing/{{that.is.substituted}}';
-
-        kbnUrl.change(url, {
-          that: {
-            is: {
-              substituted: 'test'
-            }
-          }
-        });
-
-        expect($location.url()).to.be('/some/thing/test');
-      });
-
-      it('should throw when params are missing', function () {
-        var url = '/{{replace_me}}';
-        var params = {};
-
-        try {
-          kbnUrl.change(url, params);
-          throw new Error('this should not run');
-        } catch (err) {
-          expect(err).to.be.an(Error);
-          expect(err.message).to.match(/replace_me/);
-        }
-      });
-
-      it('should throw when filtered params are missing', function () {
-        var url = '/{{replace_me|number}}';
-        var params = {};
-
-        try {
-          kbnUrl.change(url, params);
-          throw new Error('this should not run');
-        } catch (err) {
-          expect(err).to.be.an(Error);
-          expect(err.message).to.match(/replace_me\|number/);
-        }
-      });
-
-      it('should change the entire url', function () {
-        var path = '/test/path';
-        var search = {search: 'test'};
-        var hash = 'hash';
-        var newPath = '/new/location';
-
-        $location.path(path).search(search).hash(hash);
-
-        // verify the starting state
-        expect($location.path()).to.be(path);
-        expect($location.search()).to.eql(search);
-        expect($location.hash()).to.be(hash);
-
-        kbnUrl.change(newPath);
-
-        // verify the ending state
-        expect($location.path()).to.be(newPath);
-        expect($location.search()).to.eql({});
-        expect($location.hash()).to.be('');
-      });
-    });
-
-    describe('changePath', function () {
-      it('should change just the path', function () {
-        var path = '/test/path';
-        var search = {search: 'test'};
-        var hash = 'hash';
-        var newPath = '/new/location';
-
-        $location.path(path).search(search).hash(hash);
-
-        // verify the starting state
-        expect($location.path()).to.be(path);
-        expect($location.search()).to.eql(search);
-        expect($location.hash()).to.be(hash);
-
-        kbnUrl.changePath(newPath);
-
-        // verify the ending state
-        expect($location.path()).to.be(newPath);
-        expect($location.search()).to.eql(search);
-        expect($location.hash()).to.be(hash);
-      });
-    });
-
-    describe('redirect', function () {
-      it('should change the entire url', function () {
-        var path = '/test/path';
-        var search = {search: 'test'};
-        var hash = 'hash';
-        var newPath = '/new/location';
-
-        $location.path(path).search(search).hash(hash);
-
-        // verify the starting state
-        expect($location.path()).to.be(path);
-        expect($location.search()).to.eql(search);
-        expect($location.hash()).to.be(hash);
-
-        kbnUrl.redirect(newPath);
-
-        // verify the ending state
-        expect($location.path()).to.be(newPath);
-        expect($location.search()).to.eql({});
-        expect($location.hash()).to.be('');
-      });
-
-      it('should replace the current history entry', function () {
-        sinon.stub($location, 'replace');
-        $location.url('/some/path');
-
-        expect($location.replace.callCount).to.be(0);
-        kbnUrl.redirect('/new/path/');
-        expect($location.replace.callCount).to.be(1);
-      });
-
-      it('should call replace on $location', function () {
-        sinon.stub(kbnUrl, '_shouldAutoReload').returns(false);
-        sinon.stub($location, 'replace');
-
-        expect($location.replace.callCount).to.be(0);
-        kbnUrl.redirect('/poop');
-        expect($location.replace.callCount).to.be(1);
-      });
-    });
-
-    describe('redirectPath', function () {
-      it('should only change the path', function () {
-        var path = '/test/path';
-        var search = {search: 'test'};
-        var hash = 'hash';
-        var newPath = '/new/location';
-
-        $location
-          .path(path)
-          .search(search)
-          .hash(hash);
-
-        // verify the starting state
-        expect($location.path()).to.be(path);
-        expect($location.search()).to.eql(search);
-        expect($location.hash()).to.be(hash);
-
-        kbnUrl.redirectPath(newPath);
-
-        // verify the ending state
-        expect($location.path()).to.be(newPath);
-        expect($location.search()).to.eql(search);
-        expect($location.hash()).to.be(hash);
-      });
-
-      it('should call replace on $location', function () {
-        sinon.stub(kbnUrl, '_shouldAutoReload').returns(false);
-        sinon.stub($location, 'replace');
-
-        expect($location.replace.callCount).to.be(0);
-        kbnUrl.redirectPath('/poop');
-        expect($location.replace.callCount).to.be(1);
-      });
-    });
-
-    describe('_shouldAutoReload', function () {
-      var next;
-      var prev;
-
-      beforeEach(function () {
-        $route.current = {
-          $$route: {
-            regexp: /^\/is-current-route\/(\d+)/,
-            reloadOnSearch: true
-          }
-        };
-
-        prev = { path: '/is-current-route/1', search: {} };
-        next = { path: '/is-current-route/1', search: {} };
-      });
-
-      it('returns false if the passed url doesn\'t match the current route', function () {
-        next.path = '/not current';
-        expect(kbnUrl._shouldAutoReload(next, prev)).to.be(false);
-      });
-
-      describe('if the passed url does match the route', function () {
-        describe('and the route reloads on search', function () {
-          describe('and the path is the same', function () {
-            describe('and the search params are the same', function () {
-              it('returns true', function () {
-                expect(kbnUrl._shouldAutoReload(next, prev)).to.be(true);
-              });
-            });
-            describe('but the search params are different', function () {
-              it('returns false', function () {
-                next.search = {};
-                prev.search = { q: 'search term' };
-                expect(kbnUrl._shouldAutoReload(next, prev)).to.be(false);
-              });
-            });
-          });
-
-          describe('and the path is different', function () {
-            beforeEach(function () {
-              next.path = '/not-same';
-            });
-
-            describe('and the search params are the same', function () {
-              it('returns false', function () {
-                expect(kbnUrl._shouldAutoReload(next, prev)).to.be(false);
-              });
-            });
-            describe('but the search params are different', function () {
-              it('returns false', function () {
-                next.search = {};
-                prev.search = { q: 'search term' };
-                expect(kbnUrl._shouldAutoReload(next, prev)).to.be(false);
-              });
-            });
-          });
-        });
-
-        describe('but the route does not reload on search', function () {
-          beforeEach(function () {
-            $route.current.$$route.reloadOnSearch = false;
-          });
-
-          describe('and the path is the same', function () {
-            describe('and the search params are the same', function () {
-              it('returns true', function () {
-                expect(kbnUrl._shouldAutoReload(next, prev)).to.be(true);
-              });
-            });
-            describe('but the search params are different', function () {
-              it('returns true', function () {
-                next.search = {};
-                prev.search = { q: 'search term' };
-                expect(kbnUrl._shouldAutoReload(next, prev)).to.be(true);
-              });
-            });
-          });
-
-          describe('and the path is different', function () {
-            beforeEach(function () {
-              next.path = '/not-same';
-            });
-
-            describe('and the search params are the same', function () {
-              it('returns false', function () {
-                expect(kbnUrl._shouldAutoReload(next, prev)).to.be(false);
-              });
-            });
-            describe('but the search params are different', function () {
-              it('returns false', function () {
-                next.search = {};
-                prev.search = { q: 'search term' };
-                expect(kbnUrl._shouldAutoReload(next, prev)).to.be(false);
-              });
-            });
-          });
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/state_management/app_state.js b/test/unit/specs/state_management/app_state.js
deleted file mode 100644
index f4391b4c04e97..0000000000000
--- a/test/unit/specs/state_management/app_state.js
+++ /dev/null
@@ -1,58 +0,0 @@
-define(function (require) {
-  var sinon = require('test_utils/auto_release_sinon');
-  require('components/state_management/app_state');
-
-  describe('State Management', function () {
-    var $rootScope, AppState;
-
-    beforeEach(function () {
-      module('kibana');
-
-      inject(function (_$rootScope_, _$location_, Private) {
-        $rootScope = _$rootScope_;
-        AppState = Private(require('components/state_management/app_state'));
-      });
-    });
-
-    describe('App State', function () {
-      var appState;
-
-      beforeEach(function () {
-        appState = new AppState();
-      });
-
-      it('should have _urlParam of _a', function () {
-        expect(appState).to.have.property('_urlParam');
-        expect(appState._urlParam).to.equal('_a');
-      });
-
-      it('should use passed in params', function () {
-        var params = {
-          test: true,
-          mock: false
-        };
-
-        appState = new AppState(params);
-        expect(appState).to.have.property('_defaults');
-
-        Object.keys(params).forEach(function (key) {
-          expect(appState._defaults).to.have.property(key);
-          expect(appState._defaults[key]).to.equal(params[key]);
-        });
-      });
-
-      it('should have a destroy method', function () {
-        expect(appState).to.have.property('destroy');
-      });
-
-      it('should be destroyed on $routeChangeStart', function () {
-        var destroySpy = sinon.spy(appState, 'destroy');
-        var url = '/test/path';
-
-        $rootScope.$emit('$routeChangeStart');
-
-        expect(destroySpy.callCount).to.be(1);
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/state_management/global_state.js b/test/unit/specs/state_management/global_state.js
deleted file mode 100644
index 7e9afddbe2fed..0000000000000
--- a/test/unit/specs/state_management/global_state.js
+++ /dev/null
@@ -1,34 +0,0 @@
-define(function (require) {
-  var sinon = require('sinon/sinon');
-  require('components/state_management/global_state');
-
-  describe('State Management', function () {
-    var $rootScope, $location, state;
-
-    beforeEach(function () {
-      module('kibana');
-
-      inject(function (_$location_, globalState) {
-        $location = _$location_;
-        state = globalState;
-      });
-    });
-
-    describe('Global State', function () {
-      it('should use previous state when not in URL', function () {
-        // set satte via URL
-        $location.search({ _g: '(foo:(bar:baz))' });
-        state.fetch();
-        expect(state.toObject()).to.eql({ foo: { bar: 'baz' } });
-
-        $location.search({ _g: '(fizz:buzz)' });
-        state.fetch();
-        expect(state.toObject()).to.eql({ fizz: 'buzz' });
-
-        $location.search({});
-        state.fetch();
-        expect(state.toObject()).to.eql({ fizz: 'buzz' });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/state_management/state.js b/test/unit/specs/state_management/state.js
deleted file mode 100644
index 2156d9a04f918..0000000000000
--- a/test/unit/specs/state_management/state.js
+++ /dev/null
@@ -1,160 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var sinon = require('sinon/sinon');
-  require('services/private');
-
-  describe('State Management', function () {
-    var $rootScope, $location, State, Events;
-
-    beforeEach(function () {
-      module('kibana');
-
-      inject(function (_$rootScope_, _$location_, Private) {
-        $location = _$location_;
-        $rootScope = _$rootScope_;
-        State = Private(require('components/state_management/state'));
-        Events = Private(require('factories/events'));
-      });
-    });
-
-    describe('Provider', function () {
-      it('should reset the state to the defaults', function () {
-        var state = new State('_s', { message: ['test'] });
-        state.reset();
-        var search = $location.search();
-        expect(search).to.have.property('_s');
-        expect(search._s).to.equal('(message:!(test))');
-        expect(state.message).to.eql(['test']);
-      });
-
-      it('should apply the defaults upon initialization', function () {
-        var state = new State('_s', { message: 'test' });
-        expect(state).to.have.property('message', 'test');
-      });
-
-      it('should inherit from Events', function () {
-        var state = new State();
-        expect(state).to.be.an(Events);
-      });
-
-      it('should emit an event if reset with changes', function (done) {
-        var state = new State('_s', { message: 'test' });
-        state.on('reset_with_changes', function (keys) {
-          expect(keys).to.eql(['message']);
-          done();
-        });
-        state.save();
-        state.message = 'foo';
-        state.reset();
-        $rootScope.$apply();
-      });
-
-      it('should not emit an event if reset without changes', function () {
-        var state = new State('_s', { message: 'test' });
-        state.on('reset_with_changes', function () {
-          expect().fail();
-        });
-        state.save();
-        state.message = 'test';
-        state.reset();
-        $rootScope.$apply();
-      });
-    });
-
-    describe('Search', function () {
-      it('should save to $location.search()', function () {
-        var state = new State('_s', { test: 'foo' });
-        state.save();
-        var search = $location.search();
-        expect(search).to.have.property('_s');
-        expect(search._s).to.equal('(test:foo)');
-      });
-
-      it('should emit an event if changes are saved', function (done) {
-        var state = new State();
-        state.on('save_with_changes', function (keys) {
-          expect(keys).to.eql(['test']);
-          done();
-        });
-        state.test = 'foo';
-        state.save();
-        var search = $location.search();
-        $rootScope.$apply();
-      });
-    });
-
-    describe('Fetch', function () {
-      it('should emit an event if changes are fetched', function (done) {
-        var state = new State();
-        state.on('fetch_with_changes', function (keys) {
-          expect(keys).to.eql(['foo']);
-          done();
-        });
-        $location.search({ _s: '(foo:bar)' });
-        state.fetch();
-        expect(state).to.have.property('foo', 'bar');
-        $rootScope.$apply();
-      });
-
-      it('should have events that attach to scope', function (done) {
-        var state = new State();
-        state.on('test', function (message) {
-          expect(message).to.equal('foo');
-          done();
-        });
-        state.emit('test', 'foo');
-        $rootScope.$apply();
-      });
-
-      it('should fire listeners for #onUpdate() on #fetch()', function (done) {
-        var state = new State();
-        state.on('fetch_with_changes', function (keys) {
-          expect(keys).to.eql(['foo']);
-          done();
-        });
-        $location.search({ _s: '(foo:bar)' });
-        state.fetch();
-        expect(state).to.have.property('foo', 'bar');
-        $rootScope.$apply();
-      });
-
-      it('should apply defaults to fetches', function () {
-        var state = new State('_s', { message: 'test' });
-        $location.search({ _s: '(foo:bar)' });
-        state.fetch();
-        expect(state).to.have.property('foo', 'bar');
-        expect(state).to.have.property('message', 'test');
-      });
-
-      it('should call fetch when $routeUpdate is fired on $rootScope', function () {
-        var state = new State();
-        var spy = sinon.spy(state, 'fetch');
-        $rootScope.$emit('$routeUpdate', 'test');
-        sinon.assert.calledOnce(spy);
-      });
-
-      it('should clear state when missing form URL', function () {
-        var stateObj;
-        var state = new State();
-
-        // set satte via URL
-        $location.search({ _s: '(foo:(bar:baz))' });
-        state.fetch();
-        stateObj = state.toObject();
-        expect(stateObj).to.eql({ foo: { bar: 'baz' } });
-
-        // ensure changing URL changes state
-        $location.search({ _s: '(one:two)' });
-        state.fetch();
-        stateObj = state.toObject();
-        expect(stateObj).to.eql({ one: 'two' });
-
-        // remove search, state should be empty
-        $location.search({});
-        state.fetch();
-        stateObj = state.toObject();
-        expect(stateObj).to.eql({});
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/utils/SimpleEmitter.js b/test/unit/specs/utils/SimpleEmitter.js
deleted file mode 100644
index aa9dba18bfbd7..0000000000000
--- a/test/unit/specs/utils/SimpleEmitter.js
+++ /dev/null
@@ -1,156 +0,0 @@
-define(function (require) {
-  describe('SimpleEmitter class', function () {
-    var SimpleEmitter = require('utils/SimpleEmitter');
-    var sinon = require('test_utils/auto_release_sinon');
-    var emitter;
-
-    beforeEach(function () {
-      emitter = new SimpleEmitter();
-    });
-
-    it('constructs an event emitter', function () {
-      expect(emitter).to.have.property('on');
-      expect(emitter).to.have.property('off');
-      expect(emitter).to.have.property('emit');
-      expect(emitter).to.have.property('listenerCount');
-      expect(emitter).to.have.property('removeAllListeners');
-    });
-
-    describe('#listenerCount', function () {
-      it('counts all event listeners without any arg', function () {
-        expect(emitter.listenerCount()).to.be(0);
-        emitter.on('a', function () {});
-        expect(emitter.listenerCount()).to.be(1);
-        emitter.on('b', function () {});
-        expect(emitter.listenerCount()).to.be(2);
-      });
-
-      it('limits to the event that is passed in', function () {
-        expect(emitter.listenerCount()).to.be(0);
-        emitter.on('a', function () {});
-        expect(emitter.listenerCount('a')).to.be(1);
-        emitter.on('a', function () {});
-        expect(emitter.listenerCount('a')).to.be(2);
-        emitter.on('b', function () {});
-        expect(emitter.listenerCount('a')).to.be(2);
-        expect(emitter.listenerCount('b')).to.be(1);
-        expect(emitter.listenerCount()).to.be(3);
-      });
-    });
-
-    describe('#on', function () {
-      it('registers a handler', function () {
-        var handler = sinon.stub();
-        emitter.on('a', handler);
-        expect(emitter.listenerCount('a')).to.be(1);
-
-        expect(handler.callCount).to.be(0);
-        emitter.emit('a');
-        expect(handler.callCount).to.be(1);
-      });
-
-      it('allows multiple event handlers for the same event', function () {
-        emitter.on('a', function () {});
-        emitter.on('a', function () {});
-        expect(emitter.listenerCount('a')).to.be(2);
-      });
-
-      it('allows the same function to be registered multiple times', function () {
-        var handler = function () {};
-        emitter.on('a', handler);
-        expect(emitter.listenerCount()).to.be(1);
-        emitter.on('a', handler);
-        expect(emitter.listenerCount()).to.be(2);
-      });
-    });
-
-    describe('#off', function () {
-      it('removes a listener if it was registered', function () {
-        var handler = sinon.stub();
-        expect(emitter.listenerCount()).to.be(0);
-        emitter.on('a', handler);
-        expect(emitter.listenerCount('a')).to.be(1);
-        emitter.off('a', handler);
-        expect(emitter.listenerCount('a')).to.be(0);
-      });
-
-      it('clears all listeners if no handler is passed', function () {
-        emitter.on('a', function () {});
-        emitter.on('a', function () {});
-        expect(emitter.listenerCount()).to.be(2);
-        emitter.off('a');
-        expect(emitter.listenerCount()).to.be(0);
-      });
-
-      it('does not mind if the listener is not registered', function () {
-        emitter.off('a', function () {});
-      });
-
-      it('does not mind if the event has no listeners', function () {
-        emitter.off('a');
-      });
-    });
-
-    describe('#emit', function () {
-      it('calls the handlers in the order they were defined', function () {
-        var i = 0;
-        var incr = function () { return ++i; };
-        var one = sinon.spy(incr);
-        var two = sinon.spy(incr);
-        var three = sinon.spy(incr);
-        var four = sinon.spy(incr);
-
-        emitter
-        .on('a', one)
-        .on('a', two)
-        .on('a', three)
-        .on('a', four)
-        .emit('a');
-
-        expect(one).to.have.property('callCount', 1);
-        expect(one.returned(1)).to.be.ok();
-
-        expect(two).to.have.property('callCount', 1);
-        expect(two.returned(2)).to.be.ok();
-
-        expect(three).to.have.property('callCount', 1);
-        expect(three.returned(3)).to.be.ok();
-
-        expect(four).to.have.property('callCount', 1);
-        expect(four.returned(4)).to.be.ok();
-      });
-
-      it('always emits the handlers that were initially registered', function () {
-
-        var destructive = sinon.spy(function () {
-          emitter.removeAllListeners();
-          expect(emitter.listenerCount()).to.be(0);
-        });
-        var stub = sinon.stub();
-
-        emitter.on('run', destructive).on('run', stub).emit('run');
-
-        expect(destructive).to.have.property('callCount', 1);
-        expect(stub).to.have.property('callCount', 1);
-      });
-
-      it('applies all arguments except the first', function () {
-        emitter
-        .on('a', function (a, b, c) {
-          expect(a).to.be('foo');
-          expect(b).to.be('bar');
-          expect(c).to.be('baz');
-        })
-        .emit('a', 'foo', 'bar', 'baz');
-      });
-
-      it('uses the SimpleEmitter as the this context', function () {
-        emitter
-        .on('a', function () {
-          expect(this).to.be(emitter);
-        })
-        .emit('a');
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/utils/add_word_breaks.js b/test/unit/specs/utils/add_word_breaks.js
deleted file mode 100644
index 3d334aa83d406..0000000000000
--- a/test/unit/specs/utils/add_word_breaks.js
+++ /dev/null
@@ -1,26 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var addWordBreaks = require('utils/add_word_breaks');
-
-  describe('addWordBreaks', function () {
-
-    var fixtures = [
-      ['aaaaaaaaaaaaaaaaaaaa', 'aaaaaaaaaaa<wbr>aaaaaaaaa'],
-      ['aaaa aaaaaaaaaaaaaaa', 'aaaa aaaaaaaaaaa<wbr>aaaa'],
-      ['aaaa;aaaaaaaaaaaaaaa', 'aaaa;aaaaaaaaaaa<wbr>aaaa'],
-      ['aaaa:aaaaaaaaaaaaaaa', 'aaaa:aaaaaaaaaaa<wbr>aaaa'],
-      ['aaaa,aaaaaaaaaaaaaaa', 'aaaa,aaaaaaaaaaa<wbr>aaaa'],
-      ['aaaa aaaa', 'aaaa aaaa'],
-      ['aaaa <mark>aaaa</mark>aaaaaaaaaaaa', 'aaaa <mark>aaaa</mark>aaaaaaaaaaa<wbr>a'],
-      ['aaaa&quot;aaaaaaaaaaaa', 'aaaa&quot;aaaaaaaaaaa<wbr>a']
-    ];
-
-    _.each(fixtures, function (fixture) {
-      var msg = 'should convert ' + fixture[0] + ' to ' + fixture[1];
-      it(msg, function () {
-        var results = addWordBreaks(fixture[0], 10);
-        expect(results).to.be(fixture[1]);
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/utils/cidr_mask.js b/test/unit/specs/utils/cidr_mask.js
deleted file mode 100644
index 9f62af5f7a0e9..0000000000000
--- a/test/unit/specs/utils/cidr_mask.js
+++ /dev/null
@@ -1,78 +0,0 @@
-define(function (require) {
-  var CidrMask = require('utils/cidr_mask');
-
-  describe('CidrMask', function () {
-    it('should throw errors with invalid CIDR masks', function () {
-      expect(function () {
-        new CidrMask();
-      }).to.throwError();
-
-      expect(function () {
-        new CidrMask('');
-      }).to.throwError();
-
-      expect(function () {
-        new CidrMask('hello, world');
-      }).to.throwError();
-
-      expect(function () {
-        new CidrMask('0.0.0.0');
-      }).to.throwError();
-
-      expect(function () {
-        new CidrMask('0.0.0.0/0');
-      }).to.throwError();
-
-      expect(function () {
-        new CidrMask('0.0.0.0/33');
-      }).to.throwError();
-
-      expect(function () {
-        new CidrMask('256.0.0.0/32');
-      }).to.throwError();
-
-      expect(function () {
-        new CidrMask('0.0.0.0/32/32');
-      }).to.throwError();
-
-      expect(function () {
-        new CidrMask('1.2.3/1');
-      }).to.throwError();
-    });
-
-    it('should correctly grab IP address and prefix length', function () {
-      var mask = new CidrMask('0.0.0.0/1');
-      expect(mask.initialAddress.toString()).to.be('0.0.0.0');
-      expect(mask.prefixLength).to.be(1);
-
-      mask = new CidrMask('128.0.0.1/31');
-      expect(mask.initialAddress.toString()).to.be('128.0.0.1');
-      expect(mask.prefixLength).to.be(31);
-    });
-
-    it('should calculate a range of IP addresses', function () {
-      var mask = new CidrMask('0.0.0.0/1');
-      var range = mask.getRange();
-      expect(range.from.toString()).to.be('0.0.0.0');
-      expect(range.to.toString()).to.be('127.255.255.255');
-
-      mask = new CidrMask('1.2.3.4/2');
-      range = mask.getRange();
-      expect(range.from.toString()).to.be('0.0.0.0');
-      expect(range.to.toString()).to.be('63.255.255.255');
-
-      mask = new CidrMask('67.129.65.201/27');
-      range = mask.getRange();
-      expect(range.from.toString()).to.be('67.129.65.192');
-      expect(range.to.toString()).to.be('67.129.65.223');
-    });
-
-    it('toString()', function () {
-      var mask = new CidrMask('.../1');
-      expect(mask.toString()).to.be('0.0.0.0/1');
-
-      mask = new CidrMask('128.0.0.1/31');
-      expect(mask.toString()).to.be('128.0.0.1/31');
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/utils/datemath.js b/test/unit/specs/utils/datemath.js
deleted file mode 100644
index a8f9cca153212..0000000000000
--- a/test/unit/specs/utils/datemath.js
+++ /dev/null
@@ -1,155 +0,0 @@
-define(function (require) {
-  var datemath = require('utils/datemath');
-  var moment = require('moment');
-  var _ = require('lodash');
-  var sinon = require('sinon/sinon');
-
-  describe('datemath', function () {
-    // Test each of these intervals when testing relative time
-    var spans = ['s', 'm', 'h', 'd', 'w', 'M', 'y'];
-    var anchor =  '2014-01-01T06:06:06.666Z';
-    var unix = moment(anchor).valueOf();
-    var format = 'YYYY-MM-DDTHH:mm:ss.SSSZ';
-    var clock;
-
-    describe('errors', function () {
-      it('should return undefined if passed something falsy', function () {
-        expect(datemath.parse()).to.be(undefined);
-      });
-
-      it('should return undefined if I pass an operator besides [+-/]', function () {
-        expect(datemath.parse('now&1d')).to.be(undefined);
-      });
-
-      it('should return undefined if I pass a unit besides' + spans.toString(), function () {
-        expect(datemath.parse('now+5f')).to.be(undefined);
-      });
-
-      it('should return undefined if rounding unit is not 1', function () {
-        expect(datemath.parse('now/2y')).to.be(undefined);
-        expect(datemath.parse('now/0.5y')).to.be(undefined);
-      });
-
-      it('should not go into an infinite loop when missing a unit', function () {
-        expect(datemath.parse('now-0')).to.be(undefined);
-        expect(datemath.parse('now-00')).to.be(undefined);
-        expect(datemath.parse('now-000')).to.be(undefined);
-      });
-
-    });
-
-    describe('objects and strings', function () {
-      var mmnt, date, string, now;
-
-      beforeEach(function () {
-        clock = sinon.useFakeTimers(unix);
-        now = moment();
-        mmnt = moment(anchor);
-        date = mmnt.toDate();
-        string = mmnt.format(format);
-      });
-
-      afterEach(function () {
-        clock.restore();
-      });
-
-      it('should return the same moment if passed a moment', function () {
-        expect(datemath.parse(mmnt)).to.eql(mmnt);
-      });
-
-      it('should return a moment if passed a date', function () {
-        expect(datemath.parse(date).format(format)).to.eql(mmnt.format(format));
-      });
-
-      it('should return a moment if passed an ISO8601 string', function () {
-        expect(datemath.parse(string).format(format)).to.eql(mmnt.format(format));
-      });
-
-      it('should return the current time if passed now', function () {
-        expect(datemath.parse('now').format(format)).to.eql(now.format(format));
-      });
-    });
-
-    describe('subtraction', function () {
-      var now, anchored;
-
-      beforeEach(function () {
-        clock = sinon.useFakeTimers(unix);
-        now = moment();
-        anchored = moment(anchor);
-      });
-
-      afterEach(function () {
-        clock.restore();
-      });
-
-      _.each(spans, function (span) {
-        var nowEx = 'now-5' + span;
-        var thenEx =  anchor + '||-5' + span;
-
-        it('should return 5' + span + ' ago', function () {
-          expect(datemath.parse(nowEx).format(format)).to.eql(now.subtract(5, span).format(format));
-        });
-
-        it('should return 5' + span + ' before ' + anchor, function () {
-          expect(datemath.parse(thenEx).format(format)).to.eql(anchored.subtract(5, span).format(format));
-        });
-      });
-    });
-
-    describe('addition', function () {
-      var now, anchored;
-
-      beforeEach(function () {
-        clock = sinon.useFakeTimers(unix);
-        now = moment();
-        anchored = moment(anchor);
-      });
-
-      afterEach(function () {
-        clock.restore();
-      });
-
-      _.each(spans, function (span) {
-        var nowEx = 'now+5' + span;
-        var thenEx =  anchor + '||+5' + span;
-
-        it('should return 5' + span + ' from now', function () {
-          expect(datemath.parse(nowEx).format()).to.eql(now.add(5, span).format());
-        });
-
-        it('should return 5' + span + ' after ' + anchor, function () {
-          expect(datemath.parse(thenEx).format()).to.eql(anchored.add(5, span).format());
-        });
-      });
-
-    });
-
-    describe('rounding', function () {
-      var now, anchored;
-
-      beforeEach(function () {
-        clock = sinon.useFakeTimers(unix);
-        now = moment();
-        anchored = moment(anchor);
-      });
-
-      afterEach(function () {
-        clock.restore();
-      });
-
-      _.each(spans, function (span) {
-        it('should round now to the beginning of the ' + span, function () {
-          expect(datemath.parse('now/' + span).format(format)).to.eql(now.startOf(span).format(format));
-        });
-
-        it('should round now to the end of the ' + span, function () {
-          expect(datemath.parse('now/' + span, true).format(format)).to.eql(now.endOf(span).format(format));
-        });
-      });
-
-    });
-
-  });
-
-});
\ No newline at end of file
diff --git a/test/unit/specs/utils/diff_object.js b/test/unit/specs/utils/diff_object.js
deleted file mode 100644
index be1b653e5e269..0000000000000
--- a/test/unit/specs/utils/diff_object.js
+++ /dev/null
@@ -1,76 +0,0 @@
-define(function (require) {
-  var diff = require('utils/diff_object');
-  var _ = require('lodash');
-
-  describe('utils/diff_object', function () {
-
-    it('should list the removed keys', function () {
-      var target = { test: 'foo' };
-      var source = { foo: 'test' };
-      var results = diff(target, source);
-      expect(results).to.have.property('removed');
-      expect(results.removed).to.eql(['test']);
-    });
-
-    it('should list the changed keys', function () {
-      var target = { foo: 'bar' };
-      var source = { foo: 'test' };
-      var results = diff(target, source);
-      expect(results).to.have.property('changed');
-      expect(results.changed).to.eql(['foo']);
-    });
-
-    it('should list the added keys', function () {
-      var target = { };
-      var source = { foo: 'test' };
-      var results = diff(target, source);
-      expect(results).to.have.property('added');
-      expect(results.added).to.eql(['foo']);
-    });
-
-    it('should list all the keys that are change or removed', function () {
-      var target = { foo: 'bar', test: 'foo' };
-      var source = { foo: 'test' };
-      var results = diff(target, source);
-      expect(results).to.have.property('keys');
-      expect(results.keys).to.eql(['foo', 'test']);
-    });
-
-    it('should ignore functions', function () {
-      var target = { foo: 'bar', test: 'foo' };
-      var source = { foo: 'test', fn: _.noop };
-      diff(target, source);
-      expect(target).to.not.have.property('fn');
-    });
-
-    it('should ignore underscores', function () {
-      var target = { foo: 'bar', test: 'foo' };
-      var source = { foo: 'test', _private: 'foo' };
-      diff(target, source);
-      expect(target).to.not.have.property('_private');
-    });
-
-    it('should ignore dollar signs', function () {
-      var target = { foo: 'bar', test: 'foo' };
-      var source = { foo: 'test', $private: 'foo' };
-      diff(target, source);
-      expect(target).to.not.have.property('$private');
-    });
-
-    it('should not list any changes for similar objects', function () {
-      var target = { foo: 'bar', test: 'foo' };
-      var source = { foo: 'bar', test: 'foo', $private: 'foo' };
-      var results = diff(target, source);
-      expect(results.changed).to.be.empty();
-    });
-
-    it('should only change keys that actually changed', function () {
-      var obj = { 'message': 'foo' };
-      var target = { obj: obj, message: 'foo' };
-      var source = { obj: _.cloneDeep(obj), message: 'test' };
-      var results = diff(target, source);
-      expect(target.obj).to.be(obj);
-    });
-
-  });
-});
diff --git a/test/unit/specs/utils/diff_time_picker_vals.js b/test/unit/specs/utils/diff_time_picker_vals.js
deleted file mode 100644
index 72534b2cc2345..0000000000000
--- a/test/unit/specs/utils/diff_time_picker_vals.js
+++ /dev/null
@@ -1,111 +0,0 @@
-define(function (require) {
-  var moment = require('moment');
-
-  require('angular').module('DiffTimePickerValues', ['kibana']);
-
-  describe('Diff Time Picker Values', function () {
-    var diffTimePickerValues;
-
-    beforeEach(module('DiffTimePickerValues'));
-    beforeEach(inject(function (Private) {
-      diffTimePickerValues = Private(require('utils/diff_time_picker_vals'));
-    }));
-
-    it('accepts two undefined values', function () {
-      var diff = diffTimePickerValues(undefined, undefined);
-      expect(diff).to.be(false);
-    });
-
-    describe('datemath ranges', function () {
-      it('knows a match', function () {
-        var diff = diffTimePickerValues(
-          {
-            to: 'now',
-            from: 'now-7d'
-          },
-          {
-            to: 'now',
-            from: 'now-7d'
-          }
-        );
-
-        expect(diff).to.be(false);
-      });
-      it('knows a difference', function () {
-        var diff = diffTimePickerValues(
-          {
-            to: 'now',
-            from: 'now-7d'
-          },
-          {
-            to: 'now',
-            from: 'now-1h'
-          }
-        );
-
-        expect(diff).to.be(true);
-      });
-    });
-
-    describe('a datemath range, and a moment range', function () {
-      it('is always different', function () {
-        var diff = diffTimePickerValues(
-          {
-            to: moment(),
-            from: moment()
-          },
-          {
-            to: 'now',
-            from: 'now-1h'
-          }
-        );
-
-        expect(diff).to.be(true);
-      });
-    });
-
-    describe('moment ranges', function () {
-      it('uses the time value of moments for comparison', function () {
-        var to = moment();
-        var from = moment().add(1, 'day');
-
-        var diff = diffTimePickerValues(
-          {
-            to: to.clone(),
-            from: from.clone()
-          },
-          {
-            to: to.clone(),
-            from: from.clone()
-          }
-        );
-
-        expect(diff).to.be(false);
-      });
-
-      it('fails if any to or from is different', function () {
-        var to = moment();
-        var from = moment().add(1, 'day');
-        var from2 = moment().add(2, 'day');
-
-        var diff = diffTimePickerValues(
-          {
-            to: to.clone(),
-            from: from.clone()
-          },
-          {
-            to: to.clone(),
-            from: from2.clone()
-          }
-        );
-
-        expect(diff).to.be(true);
-      });
-    });
-
-    it('does not fall apart with unusual values', function () {
-      var diff = diffTimePickerValues({}, {});
-      expect(diff).to.be(false);
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/utils/indexed_array/_inflector.js b/test/unit/specs/utils/indexed_array/_inflector.js
deleted file mode 100644
index ef64ab85cb9c7..0000000000000
--- a/test/unit/specs/utils/indexed_array/_inflector.js
+++ /dev/null
@@ -1,47 +0,0 @@
-define(function (require) {
-  return function () {
-    var inflector = require('utils/indexed_array/_inflector');
-
-    describe('Inflector', function () {
-      it('returns a function', function () {
-        var getter = inflector();
-        expect(getter).to.be.a('function');
-      });
-
-      describe('fn', function () {
-        it('prepends a prefix', function () {
-          var inflect = inflector('my');
-
-          expect(inflect('Family')).to.be('myFamily');
-          expect(inflect('family')).to.be('myFamily');
-          expect(inflect('fAmIlY')).to.be('myFAmIlY');
-        });
-
-        it('adds both a prefix and suffix', function () {
-          var inflect = inflector('foo', 'Bar');
-
-          expect(inflect('box')).to.be('fooBoxBar');
-          expect(inflect('box.car.MAX')).to.be('fooBoxCarMaxBar');
-          expect(inflect('BaZzY')).to.be('fooBaZzYBar');
-        });
-
-        it('ignores prefix if it is already at the end of the inflected string', function () {
-          var inflect = inflector('foo', 'Bar');
-          expect(inflect('fooBox')).to.be('fooBoxBar');
-          expect(inflect('FooBox')).to.be('FooBoxBar');
-        });
-
-        it('ignores postfix if it is already at the end of the inflected string', function () {
-          var inflect = inflector('foo', 'Bar');
-          expect(inflect('bar')).to.be('fooBar');
-          expect(inflect('showBoxBar')).to.be('fooShowBoxBar');
-        });
-
-        it('works with "name"', function () {
-          var inflect = inflector('in', 'Order');
-          expect(inflect('name')).to.be('inNameOrder');
-        });
-      });
-    });
-  };
-});
\ No newline at end of file
diff --git a/test/unit/specs/utils/indexed_array/_path_getter.js b/test/unit/specs/utils/indexed_array/_path_getter.js
deleted file mode 100644
index 68e2dc1544a51..0000000000000
--- a/test/unit/specs/utils/indexed_array/_path_getter.js
+++ /dev/null
@@ -1,33 +0,0 @@
-define(function (require) {
-  return function () {
-    var pathGetter = require('utils/indexed_array/_path_getter');
-
-    describe('Path Getter', function () {
-      it('returns a function', function () {
-        var getter = pathGetter('some.nonexistant.property');
-        expect(getter).to.be.a('function');
-      });
-
-      describe('... Getter', function () {
-        it('gets values from the object it is passed', function () {
-          var getter = pathGetter('some.nested.prop');
-          var val = getter({ some: { nested: { prop: 42 }}});
-          expect(val).to.be(42);
-        });
-
-        it('works just as well if we specify just a prop', function () {
-          var getter = pathGetter('name');
-          var val = getter({ name: 'Master Smitty Johnston III' });
-          expect(val).to.be('Master Smitty Johnston III');
-        });
-
-        it('returns undefined if the object does not exist', function () {
-          var getter = pathGetter('no.spelllllllling.writer');
-          var val = getter({ spelled: { right: 5 } });
-          expect(val).to.be(undefined);
-        });
-
-      });
-    });
-  };
-});
\ No newline at end of file
diff --git a/test/unit/specs/utils/indexed_array/index.js b/test/unit/specs/utils/indexed_array/index.js
deleted file mode 100644
index d3221fb2a8bca..0000000000000
--- a/test/unit/specs/utils/indexed_array/index.js
+++ /dev/null
@@ -1,154 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var IndexedArray = require('utils/indexed_array/index');
-
-  // this is generally a data-structure that IndexedArray is good for managing
-  var users = [
-    { name: 'John', id: 69, username: 'beast', group: 'admins' },
-    { name: 'Anon', id:  0, username: 'shhhh', group: 'secret' },
-    { name: 'Fern', id: 42, username: 'kitty', group: 'editor' },
-    { name: 'Mary', id: 55, username: 'sheep', group: 'editor' }
-  ];
-
-  // this is how we used to accomplish this, before IndexedArray
-  users.byName = _.indexBy(users, 'name');
-  users.byUsername = _.indexBy(users, 'username');
-  users.byGroup = _.groupBy(users, 'group');
-  users.inIdOrder = _.sortBy(users, 'id');
-
-  // then things started becoming unruly... so IndexedArray!
-
-  describe('IndexedArray', function () {
-    describe('Basics', function () {
-      var reg;
-
-      beforeEach(function () {
-        reg = new IndexedArray();
-      });
-
-      it('Extends Array', function () {
-        expect(reg).to.be.a(Array);
-      });
-
-      it('fails basic lodash check', function () {
-        expect(_.isArray(reg)).to.be(false);
-      });
-
-      it('clones to an object', function () {
-        expect(_.isPlainObject(_.clone(reg))).to.be(true);
-        expect(_.isArray(_.clone(reg))).to.be(false);
-      });
-    });
-
-    describe('Indexing', function () {
-      it('provides the initial set', function () {
-        var reg = new IndexedArray({
-          initialSet: [1, 2, 3]
-        });
-
-        expect(reg).to.have.length(3);
-
-        reg.forEach(function (v, i) {
-          expect(v).to.eql(i + 1);
-        });
-      });
-
-      it('indexes the initial set', function () {
-        var reg = new IndexedArray({
-          index: ['username'],
-          initialSet: users
-        });
-
-        expect(reg).to.have.property('byUsername');
-        expect(reg.byUsername).to.eql(users.byUsername);
-      });
-
-      it('updates indices after values are added', function () {
-        // split up the user list, and add it in chunks
-        var firstUser = users.slice(0, 1).pop();
-        var otherUsers = users.slice(1);
-
-        // start off with all but the first
-        var reg = new IndexedArray({
-          group: ['group'],
-          order: ['id'],
-          initialSet: otherUsers
-        });
-
-        // add the first
-        reg.push(firstUser);
-
-        // end up with the same structure that is in the users fixture
-        expect(reg.byGroup).to.eql(users.byGroup);
-        expect(reg.inIdOrder).to.eql(users.inIdOrder);
-      });
-
-      it('updates indices after values are removed', function () {
-        // start off with all
-        var reg = new IndexedArray({
-          group: ['group'],
-          order: ['id'],
-          initialSet: users
-        });
-
-        // remove the last
-        reg.pop();
-
-        var expectedCount = users.length - 1;
-        // indexed lists should be updated
-        expect(reg).to.have.length(expectedCount);
-
-        var sumOfGroups = _.reduce(reg.byGroup, function (note, group) {
-          return note + group.length;
-        }, 0);
-        expect(sumOfGroups).to.eql(expectedCount);
-      });
-
-      it('removes items based on a predicate', function () {
-        var reg = new IndexedArray({
-          group: ['group'],
-          order: ['id'],
-          initialSet: users
-        });
-
-        reg.remove({name: 'John'});
-
-        expect(_.eq(reg.raw, reg.slice(0))).to.be(true);
-        expect(reg.length).to.be(3);
-        expect(reg[0].name).to.be('Anon');
-      });
-
-      it('updates indices after values are re-ordered', function () {
-        var rawUsers = users.slice(0);
-
-        // collect and shuffle the ids available
-        var ids = [];
-        _.times(rawUsers.length, function (i) { ids.push(i); });
-        ids = _.shuffle(ids);
-
-        // move something here
-        var toI = ids.shift();
-        // from here
-        var fromI = ids.shift();
-        // do the move
-        var move = function (arr) { arr.splice(toI, 0, arr.splice(fromI, 1)[0]); };
-
-        var reg = new IndexedArray({
-          index: ['username'],
-          initialSet: rawUsers
-        });
-
-        var index = reg.byUsername;
-
-        move(reg);
-
-        expect(reg.byUsername).to.eql(index);
-        expect(reg.byUsername).to.not.be(index);
-      });
-    });
-
-    require('specs/utils/indexed_array/_inflector')();
-
-    require('specs/utils/indexed_array/_path_getter')();
-  });
-});
diff --git a/test/unit/specs/utils/ipv4_address.js b/test/unit/specs/utils/ipv4_address.js
deleted file mode 100644
index 51b051cf0545a..0000000000000
--- a/test/unit/specs/utils/ipv4_address.js
+++ /dev/null
@@ -1,58 +0,0 @@
-define(function (require) {
-  var Ipv4Address = require('utils/ipv4_address');
-
-  describe('Ipv4Address', function () {
-    it('should throw errors with invalid IP addresses', function () {
-      expect(function () {
-        new Ipv4Address();
-      }).to.throwError();
-
-      expect(function () {
-        new Ipv4Address('');
-      }).to.throwError();
-
-      expect(function () {
-        new Ipv4Address('hello, world');
-      }).to.throwError();
-
-      expect(function () {
-        new Ipv4Address('0.0.0');
-      }).to.throwError();
-
-      expect(function () {
-        new Ipv4Address('256.0.0.0');
-      }).to.throwError();
-
-      expect(function () {
-        new Ipv4Address('-1.0.0.0');
-      }).to.throwError();
-
-      expect(function () {
-        new Ipv4Address(Number.MAX_SAFE_INTEGER);
-      }).to.throwError();
-    });
-
-    it('should allow creation with an integer or string', function () {
-      expect(new Ipv4Address(2116932386).toString()).to.be(new Ipv4Address('126.45.211.34').toString());
-    });
-
-    it('should correctly calculate the decimal representation of an IP address', function () {
-      var ipAddress = new Ipv4Address('0.0.0.0');
-      expect(ipAddress.valueOf()).to.be(0);
-
-      ipAddress = new Ipv4Address('0.0.0.1');
-      expect(ipAddress.valueOf()).to.be(1);
-
-      ipAddress = new Ipv4Address('126.45.211.34');
-      expect(ipAddress.valueOf()).to.be(2116932386);
-    });
-
-    it('toString()', function () {
-      var ipAddress = new Ipv4Address('0.000.00000.1');
-      expect(ipAddress.toString()).to.be('0.0.0.1');
-
-      ipAddress = new Ipv4Address('123.123.123.123');
-      expect(ipAddress.toString()).to.be('123.123.123.123');
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/utils/mixins/_move.js b/test/unit/specs/utils/mixins/_move.js
deleted file mode 100644
index cde68882ea2ea..0000000000000
--- a/test/unit/specs/utils/mixins/_move.js
+++ /dev/null
@@ -1,163 +0,0 @@
-define(function (require) {
-  return ['_.move', function () {
-    var _ = require('lodash');
-
-    it('accepts previous from->to syntax', function () {
-      var list = [
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        8,
-        1,
-        1,
-      ];
-
-      expect(list[3]).to.be(1);
-      expect(list[8]).to.be(8);
-
-      _.move(list, 8, 3);
-
-      expect(list[8]).to.be(1);
-      expect(list[3]).to.be(8);
-    });
-
-    it('moves an object up based on a function callback', function () {
-      var list = [
-        1,
-        1,
-        1,
-        1,
-        0,
-        1,
-        0,
-        1,
-        1,
-        1,
-        1,
-      ];
-
-      expect(list[4]).to.be(0);
-      expect(list[5]).to.be(1);
-      expect(list[6]).to.be(0);
-
-      _.move(list, 5, false, function (v) {
-        return v === 0;
-      });
-
-      expect(list[4]).to.be(1);
-      expect(list[5]).to.be(0);
-      expect(list[6]).to.be(0);
-    });
-
-    it('moves an object down based on a function callback', function () {
-      var list = [
-        1,
-        1,
-        1,
-        1,
-        0,
-        1,
-        0,
-        1,
-        1,
-        1,
-        1,
-      ];
-
-      expect(list[4]).to.be(0);
-      expect(list[5]).to.be(1);
-      expect(list[6]).to.be(0);
-
-      _.move(list, 5, true, function (v) {
-        return v === 0;
-      });
-
-      expect(list[4]).to.be(0);
-      expect(list[5]).to.be(0);
-      expect(list[6]).to.be(1);
-    });
-
-    it('moves an object up based on a where callback', function () {
-      var list = [
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 0 },
-        { v: 1 },
-        { v: 0 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-      ];
-
-      expect(list[4]).to.have.property('v', 0);
-      expect(list[5]).to.have.property('v', 1);
-      expect(list[6]).to.have.property('v', 0);
-
-      _.move(list, 5, false, { v: 0 });
-
-      expect(list[4]).to.have.property('v', 1);
-      expect(list[5]).to.have.property('v', 0);
-      expect(list[6]).to.have.property('v', 0);
-    });
-
-
-    it('moves an object up based on a where callback', function () {
-      var list = [
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 0 },
-        { v: 1 },
-        { v: 0 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-      ];
-
-      expect(list[4]).to.have.property('v', 0);
-      expect(list[5]).to.have.property('v', 1);
-      expect(list[6]).to.have.property('v', 0);
-
-      _.move(list, 5, true, { v: 0 });
-
-      expect(list[4]).to.have.property('v', 0);
-      expect(list[5]).to.have.property('v', 0);
-      expect(list[6]).to.have.property('v', 1);
-    });
-
-    it('moves an object down based on a pluck callback', function () {
-      var list = [
-        { id: 0, normal: true },
-        { id: 1, normal: true },
-        { id: 2, normal: true },
-        { id: 3, normal: true },
-        { id: 4, normal: true },
-        { id: 5, normal: false },
-        { id: 6, normal: true },
-        { id: 7, normal: true },
-        { id: 8, normal: true },
-        { id: 9, normal: true }
-      ];
-
-      expect(list[4]).to.have.property('id', 4);
-      expect(list[5]).to.have.property('id', 5);
-      expect(list[6]).to.have.property('id', 6);
-
-      _.move(list, 5, true, 'normal');
-
-      expect(list[4]).to.have.property('id', 4);
-      expect(list[5]).to.have.property('id', 6);
-      expect(list[6]).to.have.property('id', 5);
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/utils/mixins/_organize_by.js b/test/unit/specs/utils/mixins/_organize_by.js
deleted file mode 100644
index 15cb93b9047d8..0000000000000
--- a/test/unit/specs/utils/mixins/_organize_by.js
+++ /dev/null
@@ -1,49 +0,0 @@
-define(function (require) {
-  return ['_.organize', function () {
-    var _ = require('lodash');
-
-    it('it works', function () {
-      var col = [
-        {
-          name: 'one',
-          roles: ['user', 'admin', 'owner']
-        },
-        {
-          name: 'two',
-          roles: ['user']
-        },
-        {
-          name: 'three',
-          roles: ['user']
-        },
-        {
-          name: 'four',
-          roles: ['user', 'admin']
-        }
-      ];
-
-      var resp = _.organizeBy(col, 'roles');
-      expect(resp).to.have.property('user');
-      expect(resp.user).to.have.length(4);
-
-      expect(resp).to.have.property('admin');
-      expect(resp.admin).to.have.length(2);
-
-      expect(resp).to.have.property('owner');
-      expect(resp.owner).to.have.length(1);
-    });
-
-    it('behaves just like groupBy in normal scenarios', function () {
-      var col = [
-        { name: 'one' },
-        { name: 'two' },
-        { name: 'three' },
-        { name: 'four' }
-      ];
-
-      var orgs = _.organizeBy(col, 'name');
-      var groups = _.groupBy(col, 'name');
-      expect(orgs).to.eql(groups);
-    });
-  }];
-});
\ No newline at end of file
diff --git a/test/unit/specs/utils/mixins/_push_all.js b/test/unit/specs/utils/mixins/_push_all.js
deleted file mode 100644
index 16b5365c25b52..0000000000000
--- a/test/unit/specs/utils/mixins/_push_all.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(function (require) {
-  return ['_.pushAll', function () {
-    var _ = require('lodash');
-
-    it('pushes an entire array into another', function () {
-      var a = [1, 2, 3, 4];
-      var b = [5, 6, 7, 8];
-
-      var output = _.pushAll(b, a);
-      expect(output).to.be(a);
-      expect(a).to.eql([1, 2, 3, 4, 5, 6, 7, 8]);
-      expect(b).to.eql([5, 6, 7, 8]);
-    });
-  }];
-});
diff --git a/test/unit/specs/utils/mixins/index.js b/test/unit/specs/utils/mixins/index.js
deleted file mode 100644
index c8634a5a4591f..0000000000000
--- a/test/unit/specs/utils/mixins/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-define(function (require) {
-  describe('lodash mixins', function () {
-    describe(require('specs/utils/mixins/_move'));
-    describe(require('specs/utils/mixins/_organize_by'));
-    describe(require('specs/utils/mixins/_push_all'));
-  });
-});
diff --git a/test/unit/specs/utils/obj_define.js b/test/unit/specs/utils/obj_define.js
deleted file mode 100644
index d818552db3da8..0000000000000
--- a/test/unit/specs/utils/obj_define.js
+++ /dev/null
@@ -1,135 +0,0 @@
-define(function (require) {
-
-  describe('ObjDefine Utility', function () {
-    var ObjDefine = require('utils/obj_define');
-
-    function flatten(obj) {
-      return JSON.parse(JSON.stringify(obj));
-    }
-
-    describe('#writ', function () {
-      it('creates writeable properties', function () {
-        var def = new ObjDefine();
-        def.writ('name', 'foo');
-
-        var obj = def.create();
-        expect(obj).to.have.property('name', 'foo');
-
-        obj.name = 'bar';
-        expect(obj).to.have.property('name', 'bar');
-      });
-
-      it('exports the property to JSON', function () {
-        var def = new ObjDefine();
-        def.writ('name', 'foo');
-        expect(flatten(def.create())).to.have.property('name', 'foo');
-      });
-
-      it('does not export property to JSON it it\'s undefined or null', function () {
-        var def = new ObjDefine();
-        def.writ('name');
-        expect(flatten(def.create())).to.not.have.property('name');
-
-        def.writ('name', null);
-        expect(flatten(def.create())).to.not.have.property('name');
-      });
-
-      it('switched to exporting if a value is written', function () {
-        var def = new ObjDefine();
-        def.writ('name');
-
-        var obj = def.create();
-        expect(flatten(obj)).to.not.have.property('name');
-
-        obj.name = null;
-        expect(flatten(obj)).to.not.have.property('name');
-
-        obj.name = 'foo';
-        expect(flatten(obj)).to.have.property('name', 'foo');
-      });
-
-      it('setting a writ value to null prevents it from exporting', function () {
-        var def = new ObjDefine();
-        def.writ('name', 'foo');
-
-        var obj = def.create();
-        expect(flatten(obj)).to.have.property('name', 'foo');
-
-        obj.name = null;
-        expect(flatten(obj)).to.not.have.property('name');
-      });
-
-    });
-
-    describe('#fact', function () {
-      it('creates an immutable field', function () {
-        var def = new ObjDefine();
-        var val = 'foo';
-        var notval = 'bar';
-        def.fact('name', val);
-        var obj = def.create();
-
-
-        obj.name = notval; // UPDATE SHOULD BE IGNORED
-        expect(obj).to.have.property('name', val);
-      });
-
-      it('exports the fact to JSON', function () {
-        var def = new ObjDefine();
-        def.fact('name', 'foo');
-        expect(flatten(def.create())).to.have.property('name', 'foo');
-      });
-    });
-
-    describe('#comp', function () {
-      it('creates an immutable field', function () {
-        var def = new ObjDefine();
-        var val = 'foo';
-        var notval = 'bar';
-        def.comp('name', val);
-        var obj = def.create();
-
-
-        obj.name = notval; // UPDATE SHOULD BE IGNORED
-        expect(obj).to.have.property('name', val);
-      });
-
-      it('does not export the computed value to JSON', function () {
-        var def = new ObjDefine();
-        def.comp('name', 'foo');
-        expect(flatten(def.create())).to.not.have.property('name');
-      });
-    });
-
-
-    describe('#create', function () {
-      it('creates object that inherits from the prototype', function () {
-        function SomeClass() {}
-
-        var def = new ObjDefine(null, SomeClass.prototype);
-        var obj = def.create();
-
-        expect(obj).to.be.a(SomeClass);
-      });
-
-      it('uses the defaults for property values', function () {
-        var def = new ObjDefine({ name: 'bar' });
-        def.fact('name');
-
-        var obj = def.create();
-
-        expect(obj).to.have.property('name', 'bar');
-      });
-
-      it('ignores default values that are not defined propertyes', function () {
-        var def = new ObjDefine({ name: 'foo', name2: 'bar' });
-        var obj = def.create();
-
-        expect(obj).to.not.have.property('name');
-        expect(obj).to.not.have.property('name2');
-      });
-    });
-
-  });
-
-});
diff --git a/test/unit/specs/utils/ordinal_suffix.js b/test/unit/specs/utils/ordinal_suffix.js
deleted file mode 100644
index 8e462c6bc0f2e..0000000000000
--- a/test/unit/specs/utils/ordinal_suffix.js
+++ /dev/null
@@ -1,52 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var addOrdinalSuffix = require('utils/ordinal_suffix');
-
-  describe('ordinal suffix util', function () {
-    var checks = {
-      1: 'st',
-      2: 'nd',
-      3: 'rd',
-      4: 'th',
-      5: 'th',
-      6: 'th',
-      7: 'th',
-      8: 'th',
-      9: 'th',
-      10: 'th',
-      11: 'th',
-      12: 'th',
-      13: 'th',
-      14: 'th',
-      15: 'th',
-      16: 'th',
-      17: 'th',
-      18: 'th',
-      19: 'th',
-      20: 'th',
-      21: 'st',
-      22: 'nd',
-      23: 'rd',
-      24: 'th',
-      25: 'th',
-      26: 'th',
-      27: 'th',
-      28: 'th',
-      29: 'th',
-      30: 'th'
-    };
-
-    _.forOwn(checks, function (expected, num) {
-      var int = parseInt(num, 10);
-      var float = int + Math.random();
-
-      it('knowns ' + int, function () {
-        expect(addOrdinalSuffix(num)).to.be(num + '' + expected);
-      });
-
-      it('knows ' + float, function () {
-        expect(addOrdinalSuffix(num)).to.be(num + '' + expected);
-      });
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/utils/parse_interval.js b/test/unit/specs/utils/parse_interval.js
deleted file mode 100644
index 08a8c6d8fcc25..0000000000000
--- a/test/unit/specs/utils/parse_interval.js
+++ /dev/null
@@ -1,72 +0,0 @@
-define(function (require) {
-  var parseInterval = require('utils/parse_interval');
-
-  describe('parseInterval', function () {
-    it('should correctly parse an interval containing unit and value', function () {
-      var duration = parseInterval('1d');
-      expect(duration.as('d')).to.be(1);
-
-      duration = parseInterval('2y');
-      expect(duration.as('y')).to.be(2);
-
-      duration = parseInterval('5M');
-      expect(duration.as('M')).to.be(5);
-
-      duration = parseInterval('5m');
-      expect(duration.as('m')).to.be(5);
-
-      duration = parseInterval('100s');
-      expect(duration.as('s')).to.be(100);
-
-      duration = parseInterval('23d');
-      expect(duration.as('d')).to.be(23);
-
-      duration = parseInterval('52w');
-      expect(duration.as('w')).to.be(52);
-    });
-
-    it('should correctly parse fractional intervals containing unit and value', function () {
-      var duration = parseInterval('1.5w');
-      expect(duration.as('w')).to.be(1.5);
-
-      duration = parseInterval('2.35y');
-      expect(duration.as('y')).to.be(2.35);
-    });
-
-    it('should correctly bubble up intervals which are less than 1', function () {
-      var duration = parseInterval('0.5y');
-      expect(duration.as('d')).to.be(183);
-
-      duration = parseInterval('0.5d');
-      expect(duration.as('h')).to.be(12);
-    });
-
-    it('should correctly parse a unit in an interval only', function () {
-      var duration = parseInterval('d');
-      expect(duration.as('d')).to.be(1);
-
-      duration = parseInterval('m');
-      expect(duration.as('m')).to.be(1);
-
-      duration = parseInterval('y');
-      expect(duration.as('y')).to.be(1);
-
-      duration = parseInterval('M');
-      expect(duration.as('M')).to.be(1);
-    });
-
-    it('should return null for an invalid interval', function () {
-      var duration = parseInterval('');
-      expect(duration).to.not.be.ok();
-
-      duration = parseInterval(null);
-      expect(duration).to.not.be.ok();
-
-      duration = parseInterval('234asdf');
-      expect(duration).to.not.be.ok();
-
-      duration = parseInterval('ms');
-      expect(duration).to.not.be.ok();
-    });
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/utils/range.js b/test/unit/specs/utils/range.js
deleted file mode 100644
index eedd10c4b94db..0000000000000
--- a/test/unit/specs/utils/range.js
+++ /dev/null
@@ -1,110 +0,0 @@
-define(function (require) {
-  describe('Range parsing utility', function () {
-    var _ = require('lodash');
-    var parse = require('utils/range');
-
-    it('throws an error for inputs that are not formatted properly', function () {
-      expect(function () {
-        parse('');
-      }).to.throwException(TypeError);
-
-      expect(function () {
-        parse('p10202');
-      }).to.throwException(TypeError);
-
-      expect(function () {
-        parse('{0,100}');
-      }).to.throwException(TypeError);
-
-      expect(function () {
-        parse('[0,100');
-      }).to.throwException(TypeError);
-
-      expect(function () {
-        parse(')0,100(');
-      }).to.throwException(TypeError);
-    });
-
-    var tests = {
-      '[ 0 , 100 ]': {
-        props: {
-          min: 0,
-          max: 100,
-          minInclusive: true,
-          maxInclusive: true
-        },
-        within: [
-          [0, true],
-          [0.0000001, true],
-          [1, true],
-          [99.99999, true],
-          [100, true]
-        ]
-      },
-      '(26.3   ,   42]': {
-        props: {
-          min: 26.3,
-          max: 42,
-          minInclusive: false,
-          maxInclusive: true
-        },
-        within: [
-          [26.2999999, false],
-          [26.3000001, true],
-          [30, true],
-          [41, true],
-          [42, true]
-        ]
-      },
-      '(-50,50)': {
-        props: {
-          min: -50,
-          max: 50,
-          minInclusive: false,
-          maxInclusive: false
-        },
-        within: [
-          [-50, false],
-          [-49.99999, true],
-          [0, true],
-          [49.99999, true],
-          [50, false]
-        ]
-      },
-      '(Infinity, -Infinity)': {
-        props: {
-          min: -Infinity,
-          max: Infinity,
-          minInclusive: false,
-          maxInclusive: false
-        },
-        within: [
-          [0, true],
-          [-0.0000001, true],
-          [-1, true],
-          [-10000000000, true],
-          [-Infinity, false],
-          [Infinity, false],
-        ]
-      }
-    };
-
-    _.forOwn(tests, function (spec, str) {
-
-      describe(str, function () {
-        var range = parse(str);
-
-        it('creation', function () {
-          expect(range).to.eql(spec.props);
-        });
-
-        spec.within.forEach(function (tup) {
-          it('#within(' + tup[0] + ')', function () {
-            expect(range.within(tup[0])).to.be(tup[1]);
-          });
-        });
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/utils/routes/_get_route_provider.js b/test/unit/specs/utils/routes/_get_route_provider.js
deleted file mode 100644
index cbd06a0966ce3..0000000000000
--- a/test/unit/specs/utils/routes/_get_route_provider.js
+++ /dev/null
@@ -1,26 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var sinon = require('test_utils/auto_release_sinon');
-
-  /**
-   * Wrap a test function with the logic required to get the routeProvider
-   * @param  {Function} fn [description]
-   * @return {[type]}      [description]
-   */
-  return function getRouteProvider() {
-    var $routeProvider;
-
-    angular.module('_Temp_Module_', ['ngRoute'])
-    .config(['$routeProvider', function (_r) {
-      $routeProvider = _r;
-    }]);
-
-    module('_Temp_Module_');
-    inject(function () {});
-
-    sinon.stub($routeProvider, 'otherwise');
-    sinon.stub($routeProvider, 'when');
-
-    return $routeProvider;
-  };
-});
\ No newline at end of file
diff --git a/test/unit/specs/utils/routes/_work_queue.js b/test/unit/specs/utils/routes/_work_queue.js
deleted file mode 100644
index 2d8fbc625a229..0000000000000
--- a/test/unit/specs/utils/routes/_work_queue.js
+++ /dev/null
@@ -1,95 +0,0 @@
-define(function (require) {
-
-  var _ = require('lodash');
-  var WorkQueue = require('utils/routes/_work_queue');
-  var sinon = require('test_utils/auto_release_sinon');
-  require('services/promises');
-  require('angular').module('UtilsRouteWorkQueueTests', ['kibana']);
-
-  return function () {
-    describe('work queue', function () {
-      var queue;
-      var Promise;
-
-      beforeEach(module('UtilsRouteWorkQueueTests'));
-      beforeEach(inject(function (_Promise_) {
-        Promise = _Promise_;
-      }));
-      beforeEach(function () { queue = new WorkQueue(); });
-      afterEach(function () { queue.empty(); });
-
-      describe('#push', function () {
-        it('adds to the interval queue', function () {
-          queue.push(Promise.defer());
-          expect(queue).to.have.length(1);
-        });
-      });
-
-      describe('#resolveWhenFull', function () {
-        it('resolves requests waiting for the queue to fill when appropriate', function () {
-          var size = _.random(5, 50);
-          queue.limit = size;
-
-          var whenFull = Promise.defer();
-          sinon.stub(whenFull, 'resolve');
-          queue.resolveWhenFull(whenFull);
-
-          // push all but one into the queue
-          _.times(size - 1, function () {
-            queue.push(Promise.defer());
-          });
-
-          expect(whenFull.resolve.callCount).to.be(0);
-          queue.push(Promise.defer());
-          expect(whenFull.resolve.callCount).to.be(1);
-
-          queue.empty();
-        });
-      });
-
-      /**
-       * Fills the queue with a random number of work defers, but stubs all defer methods
-       * with the same stub and passed it back.
-       *
-       * @param  {function} then - called with then(size, stub) so that the test
-       *                         can manipulate the filled queue
-       */
-      function fillWithStubs(then) {
-        var size = _.random(5, 50);
-        var stub = sinon.stub();
-
-        _.times(size, function () {
-          var d = Promise.defer();
-          // overwrite the defer methods with the stub
-          d.resolve = stub;
-          d.reject = stub;
-          queue.push(d);
-        });
-
-        then(size, stub);
-      }
-
-      describe('#doWork', function () {
-        it('flushes the queue and resolves all promises', function () {
-          fillWithStubs(function (size, stub) {
-            expect(queue).to.have.length(size);
-            queue.doWork();
-            expect(queue).to.have.length(0);
-            expect(stub.callCount).to.be(size);
-          });
-        });
-      });
-
-      describe('#empty()', function () {
-        it('empties the internal queue WITHOUT resolving any promises', function () {
-          fillWithStubs(function (size, stub) {
-            expect(queue).to.have.length(size);
-            queue.empty();
-            expect(queue).to.have.length(0);
-            expect(stub.callCount).to.be(0);
-          });
-        });
-      });
-    });
-  };
-});
\ No newline at end of file
diff --git a/test/unit/specs/utils/routes/_wrap_route_with_prep.js b/test/unit/specs/utils/routes/_wrap_route_with_prep.js
deleted file mode 100644
index 5de58c1e9fe40..0000000000000
--- a/test/unit/specs/utils/routes/_wrap_route_with_prep.js
+++ /dev/null
@@ -1,90 +0,0 @@
-define(function (require) {
-  var RouteManager = require('routes').RouteManager;
-  var getRouteProvider = require('./_get_route_provider');
-  var wrapRouteWithPrep = require('utils/routes/_wrap_route_with_prep');
-  var Promise = require('bluebird');
-  var _ = require('lodash');
-  var stub = require('test_utils/auto_release_sinon').stub;
-
-  require('services/private');
-
-  var routes;
-
-  return function () {
-    describe('wrapRouteWithPrep fn', function () {
-      require('test_utils/no_digest_promises').activateForSuite();
-
-      beforeEach(function () {
-        routes = new RouteManager();
-      });
-
-      var SchedulingTest = function (opts) {
-        opts = opts || {};
-
-        var delaySetup = opts.delayUserWork ? 0 : 50;
-        var delayUserWork = opts.delayUserWork ? 50 : 0;
-
-        return function () {
-          module('kibana', 'kibana/notify');
-          var setupComplete = false;
-          var userWorkComplete = false;
-          var route;
-          var Private;
-          var Promise;
-          var $injector;
-
-          inject(function ($rootScope, _Private_, _Promise_, _$injector_) {
-            Private = _Private_;
-            Promise = _Promise_;
-            $injector = _$injector_;
-          });
-
-          var setup = Private(require('utils/routes/_setup'));
-          stub(setup, 'routeSetupWork', function () {
-            return new Promise(function (resolve, reject) {
-              setTimeout(function () {
-                setupComplete = true;
-                resolve();
-              }, delaySetup);
-            });
-          });
-
-          routes
-            .when('/', {
-              resolve: {
-                test: function () {
-                  expect(setupComplete).to.be(true);
-                  userWorkComplete = true;
-                }
-              }
-            })
-            .config({
-              when: function (p, _r) { route = _r; }
-            });
-
-          return new Promise(function (resolve, reject) {
-            setTimeout(function () {
-              Promise.all(_.map(route.resolve, function (fn) {
-                return $injector.invoke(fn);
-              }))
-              .then(function () {
-                expect(setupComplete).to.be(true);
-                expect(userWorkComplete).to.be(true);
-              })
-              .then(resolve, reject);
-
-            }, delayUserWork);
-          });
-        };
-      };
-
-      it('always waits for setup to complete before calling user work', new SchedulingTest());
-
-      it('does not call user work when setup fails', new SchedulingTest({ failSetup: true }));
-
-      it('calls all user work even if it is not initialized until after setup is complete', new SchedulingTest({
-        delayUserWork: false
-      }));
-    });
-  };
-});
\ No newline at end of file
diff --git a/test/unit/specs/utils/routes/index.js b/test/unit/specs/utils/routes/index.js
deleted file mode 100644
index 65431a2383aac..0000000000000
--- a/test/unit/specs/utils/routes/index.js
+++ /dev/null
@@ -1,103 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var RouteManager = require('routes').RouteManager;
-  var routes; // will contain an new instance of RouteManager for each test
-  var getRouteProvider = require('./_get_route_provider');
-  var chainableMethods = [
-    { name: 'when', args: ['', {}] },
-    { name: 'otherwise', args: [{}] },
-    { name: 'defaults', args: [/regexp/, {}] }
-  ];
-
-  describe('Custom Route Management', function () {
-    beforeEach(function () {
-      routes = new RouteManager();
-    });
-
-    it('should have chainable methods: ' + _.pluck(chainableMethods, 'name').join(', '), function () {
-      chainableMethods.forEach(function (meth) {
-        expect(routes[meth.name].apply(routes, _.clone(meth.args))).to.be(routes);
-      });
-    });
-
-    describe('#otherwise', function () {
-      it('should forward the last otherwise route', function () {
-        var $rp = getRouteProvider();
-        var otherRoute = {};
-        routes.otherwise({});
-        routes.otherwise(otherRoute);
-
-        routes.config($rp);
-
-        expect($rp.otherwise.callCount).to.be(1);
-        expect($rp.otherwise.getCall(0).args[0]).to.be(otherRoute);
-      });
-    });
-
-    describe('#when', function () {
-      it('should merge the additions into the when() defined routes', function () {
-        var $rp = getRouteProvider();
-        routes.when('/some/route');
-        routes.when('/some/other/route');
-
-        // add the addition resolve to every route
-        routes.defaults(/.*/, {
-          resolve: {
-            addition: function () {}
-          }
-        });
-
-        routes.config($rp);
-
-        // should have run once for each when route
-        expect($rp.when.callCount).to.be(2);
-        expect($rp.otherwise.callCount).to.be(0);
-
-        // every route should have the "addition" resolve
-        expect($rp.when.getCall(0).args[1].resolve.addition).to.be.a('function');
-        expect($rp.when.getCall(1).args[1].resolve.addition).to.be.a('function');
-      });
-    });
-
-    describe('#config', function () {
-      it('should add defined routes to the global $routeProvider service in order', function () {
-        var $rp = getRouteProvider();
-        var args = [
-          ['/one', {}],
-          ['/two', {}]
-        ];
-
-        args.forEach(function (a) {
-          routes.when(a[0], a[1]);
-        });
-
-        routes.config($rp);
-
-        expect($rp.when.callCount).to.be(args.length);
-        _.times(args.length, function (i) {
-          var call = $rp.when.getCall(i);
-          var a = args.shift();
-
-          expect(call.args[0]).to.be(a[0]);
-          expect(call.args[1]).to.be(a[1]);
-        });
-      });
-
-      it('sets route.reloadOnSearch to false by default', function () {
-        var $rp = getRouteProvider();
-        routes.when('/nothing-set');
-        routes.when('/no-reload', { reloadOnSearch: false });
-        routes.when('/always-reload', { reloadOnSearch: true });
-        routes.config($rp);
-
-        expect($rp.when.callCount).to.be(3);
-        expect($rp.when.firstCall.args[1]).to.have.property('reloadOnSearch', false);
-        expect($rp.when.secondCall.args[1]).to.have.property('reloadOnSearch', false);
-        expect($rp.when.lastCall.args[1]).to.have.property('reloadOnSearch', true);
-      });
-    });
-
-    require('specs/utils/routes/_work_queue')();
-    require('specs/utils/routes/_wrap_route_with_prep')();
-  });
-});
diff --git a/test/unit/specs/utils/sequencer.js b/test/unit/specs/utils/sequencer.js
deleted file mode 100644
index 1029f41089a15..0000000000000
--- a/test/unit/specs/utils/sequencer.js
+++ /dev/null
@@ -1,101 +0,0 @@
-define(function (require) {
-  describe('sequencer util', function () {
-    var _ = require('lodash');
-    var sequencer = require('utils/sequencer');
-
-    var args = [
-      { min: 500, max: 7500, length: 1500 },
-      { min: 50, max: 500, length: 1000 },
-      { min: 5, max: 50, length: 100 }
-    ];
-
-    function eachSeqFor(method, fn) {
-      args.forEach(function (args) {
-        fn(method(args.min, args.max, args.length), args);
-      });
-    }
-
-    function getSlopes(seq, count) {
-      return _.chunk(seq, Math.ceil(seq.length / count)).map(function (chunk) {
-        return (_.last(chunk) - _.first(chunk)) / chunk.length;
-      });
-    }
-
-    // using expect() here causes massive GC runs because seq can be +1000 elements
-    function expectedChange(seq, up) {
-      up = !!up;
-
-      if (seq.length < 2) {
-        throw new Error('unable to reach change without at least two elements');
-      }
-
-      seq.forEach(function (n, i) {
-        if (i > 0 && (seq[i - 1] < n) !== up) {
-          throw new Error('expected values to ' + (up ? 'increase' : 'decrease'));
-        }
-      });
-    }
-
-    function generalTests(seq, args) {
-      it('obeys the min arg', function () {
-        expect(Math.min.apply(Math, seq)).to.be(args.min);
-      });
-
-      it('obeys the max arg', function () {
-        expect(Math.max.apply(Math, seq)).to.be(args.max);
-      });
-
-      it('obeys the length arg', function () {
-        expect(seq).to.have.length(args.length);
-      });
-
-      it('always creates increasingly larger values', function () {
-        expectedChange(seq, true);
-      });
-    }
-
-    describe('#createEaseIn', function () {
-      eachSeqFor(sequencer.createEaseIn, function (seq, args) {
-        describe('with args: ' + JSON.stringify(args), function () {
-          generalTests(seq, args);
-
-          it('produces increasing slopes', function () {
-            expectedChange(getSlopes(seq, 2), true);
-            expectedChange(getSlopes(seq, 4), true);
-            expectedChange(getSlopes(seq, 6), true);
-          });
-        });
-      });
-    });
-
-    describe('#createEaseOut', function () {
-      eachSeqFor(sequencer.createEaseOut, function (seq, args) {
-        describe('with args: ' + JSON.stringify(args), function () {
-          generalTests(seq, args);
-
-          it('produces decreasing slopes', function () {
-            expectedChange(getSlopes(seq, 2), false);
-            expectedChange(getSlopes(seq, 4), false);
-            expectedChange(getSlopes(seq, 6), false);
-          });
-
-          // Flipped version of previous test to ensure that expectedChange()
-          // and friends are behaving properly
-          it('doesn\'t produce increasing slopes', function () {
-            expect(function () {
-              expectedChange(getSlopes(seq, 2), true);
-            }).to.throwError();
-
-            expect(function () {
-              expectedChange(getSlopes(seq, 4), true);
-            }).to.throwError();
-
-            expect(function () {
-              expectedChange(getSlopes(seq, 6), true);
-            }).to.throwError();
-          });
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/utils/slugify_id.js b/test/unit/specs/utils/slugify_id.js
deleted file mode 100644
index 8ccc49f1f9783..0000000000000
--- a/test/unit/specs/utils/slugify_id.js
+++ /dev/null
@@ -1,39 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var slugifyId = require('utils/slugify_id');
-
-  describe('slugifyId()', function () {
-
-    var fixtures = [
-      ['test/test', 'test-slash-test'],
-      ['test?test', 'test-questionmark-test'],
-      ['test=test', 'test-equal-test'],
-      ['test&test', 'test-ampersand-test'],
-      ['test / test', 'test-slash-test'],
-      ['test ? test', 'test-questionmark-test'],
-      ['test = test', 'test-equal-test'],
-      ['test & test', 'test-ampersand-test'],
-      ['test / ^test', 'test-slash-^test'],
-      ['test ?  test', 'test-questionmark-test'],
-      ['test =  test', 'test-equal-test'],
-      ['test &  test', 'test-ampersand-test'],
-      ['test/test/test', 'test-slash-test-slash-test'],
-      ['test?test?test', 'test-questionmark-test-questionmark-test'],
-      ['test&test&test', 'test-ampersand-test-ampersand-test'],
-      ['test=test=test', 'test-equal-test-equal-test']
-    ];
-
-    _.each(fixtures, function (fixture) {
-      var msg = 'should convert ' + fixture[0] + ' to ' + fixture[1];
-      it(msg, function () {
-        var results = slugifyId(fixture[0]);
-        expect(results).to.be(fixture[1]);
-      });
-    });
-
-    it('should do nothing if the id is undefined', function () {
-      expect(slugifyId(undefined)).to.be(undefined);
-    });
-
-  });
-});
diff --git a/test/unit/specs/utils/versionmath.js b/test/unit/specs/utils/versionmath.js
deleted file mode 100644
index 825f93e5bbdca..0000000000000
--- a/test/unit/specs/utils/versionmath.js
+++ /dev/null
@@ -1,130 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var versionmath = require('utils/versionmath');
-  var versions = [
-    '1.1.12',
-    '1.1.12',
-    '1.1.12',
-    '1.1.12',
-    '0.90.0',
-    '0.90.1',
-    '1.0.0',
-    '1.0',
-    '1.2.3',
-    '2.0.0',
-    '2.0.1',
-    '2.3.1'
-  ];
-
-  describe('version math (0.90.0 - 2.3.1)', function () {
-    var methods = 'max,min,eq,is,lt,lte,gt,gte'.split(',');
-    describe('methods', function () {
-      it('should have ' + methods.join(', ') + ' methods', function () {
-        _.each(methods, function (method) {
-          expect(versionmath[method]).to.be.a(Function);
-        });
-      });
-    });
-
-    describe('min & max', function () {
-      it('has a max of 2.3.1', function () {
-        expect(versionmath.max(versions)).to.be('2.3.1');
-      });
-
-      it('has a min of 0.90.0', function () {
-        expect(versionmath.min(versions)).to.be('0.90.0');
-      });
-    });
-
-    describe('eq / lowest version', function () {
-      it('should be true for  0.90.0', function () {
-        expect(versionmath.eq('0.90.0', versions)).to.be(true);
-      });
-
-      it('should be false for 1.0', function () {
-        expect(versionmath.eq('1.0', versions)).to.be(false);
-      });
-    });
-
-    describe('gt / lowest version', function () {
-      it('is > 0.20.3', function () {
-        expect(versionmath.gt('0.20.3', versions)).to.be(true);
-      });
-
-      it('is not > 0.90.0', function () {
-        expect(versionmath.gt('0.90.0', versions)).to.be(false);
-      });
-
-      it('is not > 1.0.0', function () {
-        expect(versionmath.gt('1.0.0', versions)).to.be(false);
-      });
-    });
-
-    describe('gte / lowest version', function () {
-      it('is >= 0.20.3', function () {
-        expect(versionmath.gte('0.20.3', versions)).to.be(true);
-      });
-
-      it('is >= 0.90.0', function () {
-        expect(versionmath.gte('0.90.0', versions)).to.be(true);
-      });
-
-      it('is not >= 1.0.0', function () {
-        expect(versionmath.gte('1.0.0', versions)).to.be(false);
-      });
-    });
-
-    describe('lt / highest version', function () {
-      it('is not < 0.20.3', function () {
-        expect(versionmath.lt('0.20.3', versions)).to.be(false);
-      });
-
-      it('is not < 2.3.1', function () {
-        expect(versionmath.lt('2.3.1', versions)).to.be(false);
-      });
-
-      it('is < 2.5', function () {
-        expect(versionmath.lt('2.5', versions)).to.be(true);
-      });
-    });
-
-    describe('lte / highest version', function () {
-      it('is not =< 0.20.3', function () {
-        expect(versionmath.lte('0.20.3', versions)).to.be(false);
-      });
-
-      it('is =< 2.3.1', function () {
-        expect(versionmath.lte('2.3.1', versions)).to.be(true);
-      });
-
-      it('is =< 2.5', function () {
-        expect(versionmath.lte('2.5', versions)).to.be(true);
-      });
-    });
-
-    describe('is', function () {
-      it('exactly, <, <=, >, >=', function () {
-        expect(versionmath.is('0.90.0', versions)).to.be(true);
-        expect(versionmath.is('0.20.0', versions)).to.be(false);
-
-        expect(versionmath.is('>0.20.0', versions)).to.be(true);
-        expect(versionmath.is('>0.90.0', versions)).to.be(false);
-        expect(versionmath.is('>0.90.1', versions)).to.be(false);
-
-        expect(versionmath.is('>=0.20.0', versions)).to.be(true);
-        expect(versionmath.is('>=0.90.0', versions)).to.be(true);
-        expect(versionmath.is('>=0.90.1', versions)).to.be(false);
-
-        expect(versionmath.is('<2.5', versions)).to.be(true);
-        expect(versionmath.is('<2.3.1', versions)).to.be(false);
-        expect(versionmath.is('<0.90.1', versions)).to.be(false);
-
-        expect(versionmath.is('<=2.5', versions)).to.be(true);
-        expect(versionmath.is('<=2.3.1', versions)).to.be(true);
-        expect(versionmath.is('<=0.90.1', versions)).to.be(false);
-      });
-    });
-
-  });
-
-});
\ No newline at end of file
diff --git a/test/unit/specs/vislib/components/color.js b/test/unit/specs/vislib/components/color.js
deleted file mode 100644
index 943c7cdb1bb56..0000000000000
--- a/test/unit/specs/vislib/components/color.js
+++ /dev/null
@@ -1,242 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-
-  angular.module('ColorUtilService', ['kibana']);
-  angular.module('SeedColorUtilService', ['kibana']);
-  angular.module('ColorObjUtilService', ['kibana']);
-  angular.module('ColorPaletteUtilService', ['kibana']);
-  angular.module('MappedColorService', ['kibana']);
-
-  describe('Vislib Color Module Test Suite', function () {
-    var seedColors;
-    var MappedColors, mappedColors;
-
-    describe('Color (main)', function () {
-      var getColors;
-      var arr = ['good', 'better', 'best', 'never', 'let', 'it', 'rest'];
-      var arrayOfNumbers = [1, 2, 3, 4, 5];
-      var arrayOfUndefinedValues = [undefined, undefined, undefined];
-      var arrayOfObjects = [{}, {}, {}];
-      var arrayOfBooleans = [true, false, true];
-      var arrayOfNullValues = [null, null, null];
-      var emptyObject = {};
-      var nullValue = null;
-      var notAValue;
-      var color;
-
-      beforeEach(function () {
-        module('ColorUtilService');
-      });
-
-      beforeEach(function () {
-        inject(function (d3, Private) {
-          seedColors = Private(require('components/vislib/components/color/seed_colors'));
-          getColors = Private(require('components/vislib/components/color/color'));
-          MappedColors = Private(require('components/vislib/components/color/mapped_colors'));
-          mappedColors = new MappedColors();
-          color = getColors(arr);
-        });
-      });
-
-      it('should throw an error if input is not an array', function () {
-        expect(function () {
-          getColors(200);
-        }).to.throwError();
-
-        expect(function () {
-          getColors('help');
-        }).to.throwError();
-
-        expect(function () {
-          getColors(true);
-        }).to.throwError();
-
-        expect(function () {
-          getColors(notAValue);
-        }).to.throwError();
-
-        expect(function () {
-          getColors(nullValue);
-        }).to.throwError();
-
-        expect(function () {
-          getColors(emptyObject);
-        }).to.throwError();
-      });
-
-      it('should throw an error if array is not composed of numbers, strings, or ' +
-        'undefined values', function () {
-        expect(function () {
-          getColors(arrayOfObjects);
-        }).to.throwError();
-
-        expect(function () {
-          getColors(arrayOfBooleans);
-        }).to.throwError();
-
-        expect(function () {
-          getColors(arrayOfNullValues);
-        }).to.throwError();
-      });
-
-      it('should not throw an error if input is an array of strings, numbers, or' +
-        ' undefined values', function () {
-        expect(function () {
-          getColors(arr);
-        }).to.not.throwError();
-
-        expect(function () {
-          getColors(arrayOfNumbers);
-        }).to.not.throwError();
-
-        expect(function () {
-          getColors(arrayOfUndefinedValues);
-        }).to.not.throwError();
-      });
-
-      it('should be a function', function () {
-        expect(typeof getColors).to.be('function');
-      });
-
-      it('should return a function', function () {
-        expect(typeof color).to.be('function');
-      });
-
-      it('should return the first hex color in the seed colors array', function () {
-        expect(color(arr[0])).to.be(seedColors[0]);
-      });
-
-      it('should return the value from the mapped colors', function () {
-        expect(color(arr[1])).to.be(mappedColors.get(arr[1]));
-      });
-    });
-
-    describe('Seed Colors', function () {
-
-      beforeEach(function () {
-        module('SeedColorUtilService');
-      });
-
-      it('should return an array', function () {
-        expect(seedColors instanceof Array).to.be(true);
-      });
-
-    });
-
-    describe('Mapped Colors', function () {
-
-      beforeEach(function () {
-        module('MappedColorService');
-      });
-
-      beforeEach(function () {
-        inject(function (d3, Private) {
-          MappedColors = Private(require('components/vislib/components/color/mapped_colors'));
-          mappedColors = new MappedColors();
-        });
-      });
-
-      it('should clear all the keys from the map table', function () {
-        mappedColors.reset();
-        expect(mappedColors.count()).to.be(0);
-      });
-
-      it('should return the color for the added value', function () {
-        mappedColors.reset();
-        mappedColors.add('value1', '#somecolor');
-        expect(mappedColors.get('value1')).to.be('#somecolor');
-      });
-
-      it('should return the count of mapped keys', function () {
-        mappedColors.reset();
-        mappedColors.add('value1', '#color1');
-        mappedColors.add('value2', '#color2');
-        expect(mappedColors.count()).to.be(2);
-      });
-
-      it('should return all the colors in the map', function () {
-        mappedColors.reset();
-        mappedColors.add('value1', '#colors1');
-        mappedColors.add('value3', '#newColor');
-        expect(mappedColors.all()).to.eql(['#colors1', '#newColor']);
-      });
-    });
-
-    describe('Color Palette', function () {
-      var num1 = 45;
-      var num2 = 72;
-      var num3 = 90;
-      var string = 'Welcome';
-      var bool = true;
-      var nullValue = null;
-      var emptyArr = [];
-      var emptyObject = {};
-      var notAValue;
-      var createColorPalette;
-      var colorPalette;
-
-      beforeEach(function () {
-        module('ColorPaletteUtilService');
-      });
-
-      beforeEach(function () {
-        inject(function (d3, Private) {
-          seedColors = Private(require('components/vislib/components/color/seed_colors'));
-          createColorPalette = Private(require('components/vislib/components/color/color_palette'));
-          colorPalette = createColorPalette(num1);
-        });
-      });
-
-      it('should throw an error if input is not a number', function () {
-        expect(function () {
-          createColorPalette(string);
-        }).to.throwError();
-
-        expect(function () {
-          createColorPalette(bool);
-        }).to.throwError();
-
-        expect(function () {
-          createColorPalette(nullValue);
-        }).to.throwError();
-
-        expect(function () {
-          createColorPalette(emptyArr);
-        }).to.throwError();
-
-        expect(function () {
-          createColorPalette(emptyObject);
-        }).to.throwError();
-
-        expect(function () {
-          createColorPalette(notAValue);
-        }).to.throwError();
-      });
-
-      it('should be a function', function () {
-        expect(typeof createColorPalette).to.be('function');
-      });
-
-      it('should return an array', function () {
-        expect(colorPalette instanceof Array).to.be(true);
-      });
-
-      it('should return an array of the same length as the input', function () {
-        expect(colorPalette.length).to.be(num1);
-      });
-
-      it('should return the seed color array when input length is 72', function () {
-        expect(createColorPalette(num2)[71]).to.be(seedColors[71]);
-      });
-
-      it('should return an array of the same length as the input when input is greater than 72', function () {
-        expect(createColorPalette(num3).length).to.be(num3);
-      });
-
-      it('should create new darker colors when input is greater than 72', function () {
-        expect(createColorPalette(num3)[72]).not.to.equal(seedColors[0]);
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/vislib/components/labels.js b/test/unit/specs/vislib/components/labels.js
deleted file mode 100644
index b194b4f71f076..0000000000000
--- a/test/unit/specs/vislib/components/labels.js
+++ /dev/null
@@ -1,456 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-
-  angular.module('LabelUtilService', ['kibana']);
-  angular.module('GetArrayUtilService', ['kibana']);
-  angular.module('UniqLabelUtilService', ['kibana']);
-  angular.module('GetSeriesUtilService', ['kibana']);
-
-  var getLabels;
-  var seriesLabels;
-  var rowsLabels;
-  var seriesArr;
-  var rowsArr;
-  var uniqLabels;
-  var error;
-
-  var seriesData = {
-    'label': '',
-    'series': [
-      {
-        'label': '100',
-        'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-      }
-    ]
-  };
-
-  var rowsData = {
-    'rows': [
-      {
-        'label': 'a',
-        'series': [
-          {
-            'label': '100',
-            'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-          }
-        ]
-      },
-      {
-        'label': 'b',
-        'series': [
-          {
-            'label': '300',
-            'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-          }
-        ]
-      },
-      {
-        'label': 'c',
-        'series': [
-          {
-            'label': '100',
-            'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-          }
-        ]
-      },
-      {
-        'label': 'd',
-        'series': [
-          {
-            'label': '200',
-            'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-          }
-        ]
-      }
-    ]
-  };
-
-  var columnsData = {
-    'columns': [
-      {
-        'label': 'a',
-        'series': [
-          {
-            'label': '100',
-            'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-          }
-        ]
-      },
-      {
-        'label': 'b',
-        'series': [
-          {
-            'label': '300',
-            'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-          }
-        ]
-      },
-      {
-        'label': 'c',
-        'series': [
-          {
-            'label': '100',
-            'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-          }
-        ]
-      },
-      {
-        'label': 'd',
-        'series': [
-          {
-            'label': '200',
-            'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-          }
-        ]
-      }
-    ]
-  };
-
-  describe('Vislib Labels Module Test Suite', function () {
-
-    describe('Labels (main)', function () {
-      beforeEach(function () {
-        module('LabelUtilService');
-      });
-
-      beforeEach(function () {
-        inject(function (d3, Private) {
-          getLabels = Private(require('components/vislib/components/labels/labels'));
-          seriesLabels = getLabels(seriesData);
-          rowsLabels = getLabels(rowsData);
-          seriesArr = _.isArray(seriesLabels);
-          rowsArr = _.isArray(rowsLabels);
-          uniqLabels = _.chain(rowsData.rows)
-            .pluck('series')
-            .flattenDeep()
-            .pluck('label')
-            .uniq()
-            .value();
-        });
-      });
-
-      it('should be a function', function () {
-        expect(typeof getLabels).to.be('function');
-      });
-
-      it('should return an array if input is data.series', function () {
-        expect(seriesArr).to.be(true);
-      });
-
-      it('should return an array if input is data.rows', function () {
-        expect(rowsArr).to.be(true);
-      });
-
-      it('should throw an error if input is not an object', function () {
-        expect(function () {
-          getLabels('string not object');
-        }).to.throwError();
-      });
-
-      it('should return unique label values', function () {
-        expect(rowsLabels[0]).to.equal(uniqLabels[0]);
-        expect(rowsLabels[1]).to.equal(uniqLabels[1]);
-        expect(rowsLabels[2]).to.equal(uniqLabels[2]);
-      });
-
-    });
-
-    describe('Data array', function () {
-      var childrenObject = {
-        children: []
-      };
-      var seriesObject = {
-        series: []
-      };
-      var rowsObject = {
-        rows: []
-      };
-      var columnsObject = {
-        columns: []
-      };
-      var string = 'string';
-      var number = 23;
-      var boolean = false;
-      var emptyArray = [];
-      var nullValue = null;
-      var notAValue;
-      var dataArray;
-      var testSeries;
-      var testRows;
-
-      beforeEach(function () {
-        module('GetArrayUtilService');
-      });
-
-      beforeEach(function () {
-        inject(function (d3, Private) {
-          dataArray = Private(require('components/vislib/components/labels/data_array'));
-          seriesLabels = dataArray(seriesData);
-          rowsLabels = dataArray(rowsData);
-          testSeries = _.isArray(seriesLabels);
-          testRows = _.isArray(rowsLabels);
-        });
-      });
-
-      it('should throw an error if the input is not an object', function () {
-        expect(function () {
-          dataArray(string);
-        }).to.throwError();
-
-        expect(function () {
-          dataArray(number);
-        }).to.throwError();
-
-        expect(function () {
-          dataArray(boolean);
-        }).to.throwError();
-
-        expect(function () {
-          dataArray(emptyArray);
-        }).to.throwError();
-
-        expect(function () {
-          dataArray(nullValue);
-        }).to.throwError();
-
-        expect(function () {
-          dataArray(notAValue);
-        }).to.throwError();
-      });
-
-      it(
-        'should throw an error if property series, rows, or ' +
-        'columns is not present',
-        function () {
-          expect(function () {
-            dataArray(childrenObject);
-          }).to.throwError();
-        }
-      );
-
-      it(
-        'should not throw an error if object has property series, rows, or ' +
-        'columns',
-        function () {
-          expect(function () {
-            dataArray(seriesObject);
-          }).to.not.throwError();
-
-          expect(function () {
-            dataArray(rowsObject);
-          }).to.not.throwError();
-
-          expect(function () {
-            dataArray(columnsObject);
-          }).to.not.throwError();
-        }
-      );
-
-      it('should be a function', function () {
-        expect(typeof dataArray).to.equal('function');
-      });
-
-      it('should return an array of objects if input is data.series', function () {
-        expect(testSeries).to.equal(true);
-      });
-
-      it('should return an array of objects if input is data.rows', function () {
-        expect(testRows).to.equal(true);
-      });
-
-      it('should return an array of same length as input data.series', function () {
-        expect(seriesLabels.length).to.equal(seriesData.series.length);
-      });
-
-      it('should return an array of same length as input data.rows', function () {
-        expect(rowsLabels.length).to.equal(rowsData.rows.length);
-      });
-
-      it('should return an array of objects with obj.labels and obj.values', function () {
-        expect(seriesLabels[0].label).to.equal('100');
-        expect(seriesLabels[0].values[0].x).to.equal(0);
-        expect(seriesLabels[0].values[0].y).to.equal(1);
-      });
-
-    });
-
-    describe('Unique labels', function () {
-      var uniqLabels;
-      var arrObj = [
-        {'label': 'a'},
-        {'label': 'b'},
-        {'label': 'b'},
-        {'label': 'c'},
-        {'label': 'c'},
-        {'label': 'd'},
-        {'label': 'f'}
-      ];
-      var string = 'string';
-      var number = 24;
-      var boolean = false;
-      var nullValue = null;
-      var emptyObject = {};
-      var emptyArray = [];
-      var notAValue;
-      var uniq;
-      var testArr;
-
-      beforeEach(function () {
-        module('UniqLabelUtilService');
-      });
-
-      beforeEach(function () {
-        inject(function (d3, Private) {
-          uniqLabels = Private(require('components/vislib/components/labels/uniq_labels'));
-          uniq = uniqLabels(arrObj, function (d) { return d; });
-          testArr = _.isArray(uniq);
-        });
-      });
-
-      it('should throw an error if input is not an array', function () {
-        expect(function () {
-          uniqLabels(string);
-        }).to.throwError();
-
-        expect(function () {
-          uniqLabels(number);
-        }).to.throwError();
-
-        expect(function () {
-          uniqLabels(boolean);
-        }).to.throwError();
-
-        expect(function () {
-          uniqLabels(nullValue);
-        }).to.throwError();
-
-        expect(function () {
-          uniqLabels(emptyObject);
-        }).to.throwError();
-
-        expect(function () {
-          uniqLabels(notAValue);
-        }).to.throwError();
-      });
-
-      it('should not throw an error if the input is an array', function () {
-        expect(function () {
-          uniqLabels(emptyArray);
-        }).to.not.throwError();
-      });
-
-      it('should be a function', function () {
-        expect(typeof uniqLabels).to.be('function');
-      });
-
-      it('should return an array', function () {
-        expect(testArr).to.be(true);
-      });
-
-      it('should return array of 5 unique values', function () {
-        expect(uniq.length).to.be(5);
-      });
-
-    });
-
-    describe('Get series', function () {
-      var string = 'string';
-      var number = 24;
-      var boolean = false;
-      var nullValue = null;
-      var rowsObject = {
-        rows: []
-      };
-      var columnsObject = {
-        columns: []
-      };
-      var emptyObject = {};
-      var emptyArray = [];
-      var notAValue;
-      var getSeries;
-      var columnsLabels;
-      var rowsLabels;
-      var columnsArr;
-      var rowsArr;
-
-      beforeEach(function () {
-        module('GetSeriesUtilService');
-      });
-
-      beforeEach(function () {
-        inject(function (d3, Private) {
-          getSeries = Private(require('components/vislib/components/labels/flatten_series'));
-          columnsLabels = getSeries(columnsData);
-          rowsLabels = getSeries(rowsData);
-          columnsArr = _.isArray(columnsLabels);
-          rowsArr = _.isArray(rowsLabels);
-        });
-      });
-
-      it('should throw an error if input is not an object', function () {
-        expect(function () {
-          getSeries(string);
-        }).to.throwError();
-
-        expect(function () {
-          getSeries(number);
-        }).to.throwError();
-
-        expect(function () {
-          getSeries(boolean);
-        }).to.throwError();
-
-        expect(function () {
-          getSeries(nullValue);
-        }).to.throwError();
-
-        expect(function () {
-          getSeries(emptyArray);
-        }).to.throwError();
-
-        expect(function () {
-          getSeries(notAValue);
-        }).to.throwError();
-      });
-
-      it('should throw an if property rows or columns is not set on the object', function () {
-        expect(function () {
-          getSeries(emptyObject);
-        }).to.throwError();
-      });
-
-      it('should not throw an error if rows or columns set on object', function () {
-        expect(function () {
-          getSeries(rowsObject);
-        }).to.not.throwError();
-
-        expect(function () {
-          getSeries(columnsObject);
-        }).to.not.throwError();
-      });
-
-      it('should be a function', function () {
-        expect(typeof getSeries).to.be('function');
-      });
-
-      it('should return an array if input is data.columns', function () {
-        expect(columnsArr).to.be(true);
-      });
-
-      it('should return an array if input is data.rows', function () {
-        expect(rowsArr).to.be(true);
-      });
-
-      it('should return an array of the same length as as input data.columns', function () {
-        expect(columnsLabels.length).to.be(columnsData.columns.length);
-      });
-
-      it('should return an array of the same length as as input data.rows', function () {
-        expect(rowsLabels.length).to.be(rowsData.rows.length);
-      });
-
-    });
-
-  });
-});
diff --git a/test/unit/specs/vislib/components/tooltip/_positioning.js b/test/unit/specs/vislib/components/tooltip/_positioning.js
deleted file mode 100644
index 8aa7d701742b7..0000000000000
--- a/test/unit/specs/vislib/components/tooltip/_positioning.js
+++ /dev/null
@@ -1,229 +0,0 @@
-define(function (require) {
-  return function TooltipPositioningTestSuite() {
-    describe('positioning', function () {
-      var $ = require('jquery');
-      var _ = require('lodash');
-      var sinon = require('test_utils/auto_release_sinon');
-
-      var posTT = require('components/vislib/components/tooltip/_position_tooltip');
-      var positions = ['north', 'south', 'east', 'west'];
-      var bounds = ['top', 'left', 'bottom', 'right'];
-      var $window;
-      var $chart;
-      var $tooltip;
-      var $sizer;
-
-      function testEl(width, height, $children) {
-        var $el = $('<div>');
-
-        var size = {
-          width: _.random(width[0], width[1]),
-          height: _.random(height[0], height[1])
-        };
-
-        $el.css({
-          width: size.width,
-          height: size.height,
-          visibility: 'hidden'
-        })
-        .appendTo('body');
-
-        if ($children) {
-          $el.append($children);
-        }
-
-        $el.testSize = size;
-
-        return $el;
-      }
-
-      beforeEach(function () {
-        $window = testEl([500, 1000], [600, 800],
-          $chart = testEl([600, 750], [350, 550],
-            $tooltip = testEl([50, 100], [35, 75])
-          )
-        );
-
-        $sizer = $tooltip.clone().appendTo($window);
-      });
-
-      afterEach(function () {
-        $window.remove();
-        $window = $chart = $tooltip = $sizer = null;
-        posTT.removeClone();
-      });
-
-      function makeEvent(xPercent, yPercent) {
-        xPercent = xPercent || 0.5;
-        yPercent = yPercent || 0.5;
-
-        var base = $chart.offset();
-
-        return {
-          clientX: base.left + ($chart.testSize.width * xPercent),
-          clientY: base.top + ($chart.testSize.height * yPercent)
-        };
-      }
-
-      describe('getTtSize()', function () {
-        it('should measure the outer-size of the tooltip using an un-obstructed clone', function () {
-          var w = sinon.spy($.fn, 'outerWidth');
-          var h = sinon.spy($.fn, 'outerHeight');
-
-          posTT.getTtSize($tooltip.html(), $sizer);
-
-          [w, h].forEach(function (spy) {
-            expect(spy).to.have.property('callCount', 1);
-            var matchHtml = w.thisValues.filter(function ($t) {
-              return !$t.is($tooltip) && $t.html() === $tooltip.html();
-            });
-            expect(matchHtml).to.have.length(1);
-          });
-        });
-      });
-
-      describe('getBasePosition()', function () {
-        it('calculates the offset values for the four positions', function () {
-          var size = posTT.getTtSize($tooltip.html(), $sizer);
-          var pos = posTT.getBasePosition(size, makeEvent());
-
-          positions.forEach(function (p) {
-            expect(pos).to.have.property(p);
-          });
-
-          expect(pos.north).to.be.lessThan(pos.south);
-          expect(pos.east).to.be.greaterThan(pos.west);
-        });
-      });
-
-      describe('getBounds()', function () {
-        it('returns the offsets for the tlrb of the element', function () {
-          var cbounds = posTT.getBounds($chart);
-
-          bounds.forEach(function (b) {
-            expect(cbounds).to.have.property(b);
-          });
-
-          expect(cbounds.top).to.be.lessThan(cbounds.bottom);
-          expect(cbounds.left).to.be.lessThan(cbounds.right);
-        });
-      });
-
-      describe('getOverflow()', function () {
-        it('determines how much the base placement overflows the containing bounds in each direction', function () {
-          // size the tooltip very small so it won't collide with the edges
-          $tooltip.css({ width: 15, height: 15 });
-          $sizer.css({ width: 15, height: 15 });
-          var size = posTT.getTtSize($tooltip.html(), $sizer);
-          expect(size).to.have.property('width', 15);
-          expect(size).to.have.property('height', 15);
-
-          // position the element based on a mouse that is in the middle of the chart
-          var pos = posTT.getBasePosition(size, makeEvent(0.5, 0.5));
-
-          var overflow = posTT.getOverflow(size, pos, [$chart, $window]);
-          positions.forEach(function (p) {
-            expect(overflow).to.have.property(p);
-
-            // all positions should be less than 0 because the tooltip is so much smaller than the chart
-            expect(overflow[p]).to.be.lessThan(0);
-          });
-        });
-
-        it('identifies an overflow with a positive value in that direction', function () {
-          var size = posTT.getTtSize($tooltip.html(), $sizer);
-
-          // position the element based on a mouse that is in the bottom right hand courner of the chart
-          var pos = posTT.getBasePosition(size, makeEvent(0.99, 0.99));
-          var overflow = posTT.getOverflow(size, pos, [$chart, $window]);
-
-          positions.forEach(function (p) {
-            expect(overflow).to.have.property(p);
-
-            if (p === 'south' || p === 'east') {
-              expect(overflow[p]).to.be.greaterThan(0);
-            } else {
-              expect(overflow[p]).to.be.lessThan(0);
-            }
-          });
-        });
-      });
-
-      describe('positionTooltip() integration', function () {
-        it('returns nothing if the $chart or $tooltip are not passed in', function () {
-          expect(posTT() === void 0).to.be(true);
-          expect(posTT(null, null, null) === void 0).to.be(true);
-          expect(posTT(null, $(), $()) === void 0).to.be(true);
-        });
-
-        function check(xPercent, yPercent/*, prev, directions... */) {
-          var directions = _.drop(arguments, 2);
-          var event = makeEvent(xPercent, yPercent);
-          var placement = posTT({
-            $window: $window,
-            $chart: $chart,
-            $sizer: $sizer,
-            event: event,
-            $el: $tooltip,
-            prev: _.isObject(directions[0]) ? directions.shift() : null
-          });
-
-          expect(placement).to.have.property('top').and.property('left');
-
-          directions.forEach(function (dir) {
-            switch (dir) {
-            case 'top':
-              expect(placement.top).to.be.lessThan(event.clientY);
-              return;
-            case 'bottom':
-              expect(placement.top).to.be.greaterThan(event.clientY);
-              return;
-            case 'right':
-              expect(placement.left).to.be.greaterThan(event.clientX);
-              return;
-            case 'left':
-              expect(placement.left).to.be.lessThan(event.clientX);
-              return;
-            }
-          });
-
-          return placement;
-        }
-
-        describe('calculates placement of the tooltip properly', function () {
-          it('mouse is in the middle', function () {
-            check(0.50, 0.50, 'bottom', 'right');
-          });
-
-          it('mouse is in the top left', function () {
-            check(0.10, 0.10, 'bottom', 'right');
-          });
-
-          it('mouse is in the top right', function () {
-            check(0.99, 0.10, 'bottom', 'left');
-          });
-
-          it('mouse is in the bottom right', function () {
-            check(0.99, 0.99, 'top', 'left');
-          });
-
-          it('mouse is in the bottom left', function () {
-            check(0.10, 0.99, 'top', 'right');
-          });
-        });
-
-        describe('maintain the direction of the tooltip on reposition', function () {
-          it('mouse moves from the top right to the middle', function () {
-            var pos = check(0.99, 0.10, 'bottom', 'left');
-            check(0.50, 0.50, pos, 'bottom', 'left');
-          });
-
-          it('mouse moves from the bottom left to the middle', function () {
-            var pos = check(0.10, 0.99, 'top', 'right');
-            check(0.50, 0.50, pos, 'top', 'right');
-          });
-        });
-      });
-    });
-  };
-});
diff --git a/test/unit/specs/vislib/components/tooltip/_render.js b/test/unit/specs/vislib/components/tooltip/_render.js
deleted file mode 100644
index 5891944a18939..0000000000000
--- a/test/unit/specs/vislib/components/tooltip/_render.js
+++ /dev/null
@@ -1,56 +0,0 @@
-define(function (require) {
-  return function TooltipRenderingTestSuite() {
-    describe('render Method', function () {
-      var angular = require('angular');
-      var _ = require('lodash');
-      var $ = require('jquery');
-
-      angular.module('TooltipFactory', ['kibana']);
-
-      var vis;
-      var data;
-      var tooltips = [];
-
-      beforeEach(function () {
-        module('TooltipFactory');
-      });
-
-      beforeEach(function () {
-        inject(function (d3, Private) {
-          vis = Private(require('vislib_fixtures/_vis_fixture'))();
-          data = require('vislib_fixtures/mock_data/date_histogram/_series');
-          require('css!components/vislib/styles/main');
-
-          vis.render(data);
-          vis.handler.charts.forEach(function (chart) {
-            tooltips.push(chart.tooltip);
-          });
-        });
-      });
-
-      // Placeholder until we know better regarding garbage collection
-      afterEach(function () {
-        $(vis.el).remove();
-        vis = null;
-      });
-
-      var isObject;
-      var isFunction;
-
-      beforeEach(function () {
-        _.forEach(tooltips, function (tooltip) {
-          isObject = _.isObject(tooltip);
-          isFunction = _.isFunction(tooltip.render());
-        });
-      });
-
-      it('should be an object', function () {
-        expect(isObject).to.be(true);
-      });
-
-      it('should return a function', function () {
-        expect(isFunction).to.be(true);
-      });
-    });
-  };
-});
diff --git a/test/unit/specs/vislib/components/tooltip/index.js b/test/unit/specs/vislib/components/tooltip/index.js
deleted file mode 100644
index 0a5ff3188f6ac..0000000000000
--- a/test/unit/specs/vislib/components/tooltip/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-define(function (require) {
-  describe('Vislib Tooltip', function () {
-    require('specs/vislib/components/tooltip/_positioning')();
-    require('specs/vislib/components/tooltip/_render')();
-  });
-});
diff --git a/test/unit/specs/vislib/components/zero_injection.js b/test/unit/specs/vislib/components/zero_injection.js
deleted file mode 100644
index 5ae121d8b92bb..0000000000000
--- a/test/unit/specs/vislib/components/zero_injection.js
+++ /dev/null
@@ -1,708 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-
-  angular.module('ZeroInjectionUtilService', ['kibana']);
-  angular.module('FlattenDataObjectUtilService', ['kibana']);
-  angular.module('OrderedXKeysUtilService', ['kibana']);
-  angular.module('ReplaceIndexUtilService', ['kibana']);
-  angular.module('UniqueXValuesUtilService', ['kibana']);
-  angular.module('ZeroFillDataArrayUtilService', ['kibana']);
-  angular.module('ZeroFilledArrayUtilService', ['kibana']);
-
-  describe('Vislib Zero Injection Module Test Suite', function () {
-    var dateHistogramRows = {
-      'rows': [
-        {
-          'label': 'Top 5 @tags: success',
-          'ordered': {
-            'date': true,
-            'interval': 60000,
-            'min': 1418410540548,
-            'max': 1418410936568
-          },
-          'series': [
-            {
-              'label': 'jpg',
-              'values': [
-                { 'x': 1418410560000, 'y': 2 },
-                { 'x': 1418410620000, 'y': 4 },
-                { 'x': 1418410680000, 'y': 1 },
-                { 'x': 1418410740000, 'y': 5 },
-                { 'x': 1418410800000, 'y': 2 },
-                { 'x': 1418410860000, 'y': 3 },
-                { 'x': 1418410920000, 'y': 2 }
-              ]
-            },
-            {
-              'label': 'css',
-              'values': [
-                { 'x': 1418410560000, 'y': 1 },
-                { 'x': 1418410620000, 'y': 3 },
-                { 'x': 1418410680000, 'y': 1 },
-                { 'x': 1418410740000, 'y': 4 },
-                { 'x': 1418410800000, 'y': 2 }
-              ]
-            },
-            {
-              'label': 'gif',
-              'values': [
-                { 'x': 1418410500000, 'y': 1 },
-                { 'x': 1418410680000, 'y': 3 },
-                { 'x': 1418410740000, 'y': 2 }
-              ]
-            }
-          ]
-        },
-        {
-          'label': 'Top 5 @tags: info',
-          'ordered': {
-            'date': true,
-            'interval': 60000,
-            'min': 1418410540548,
-            'max': 1418410936568
-          },
-          'series': [
-            {
-              'label': 'jpg',
-              'values': [
-                { 'x': 1418410560000, 'y': 4 },
-                { 'x': 1418410620000, 'y': 2 },
-                { 'x': 1418410680000, 'y': 1 },
-                { 'x': 1418410740000, 'y': 5 },
-                { 'x': 1418410800000, 'y': 2 },
-                { 'x': 1418410860000, 'y': 3 },
-                { 'x': 1418410920000, 'y': 2 }
-              ]
-            },
-            {
-              'label': 'css',
-              'values': [
-                { 'x': 1418410620000, 'y': 3 },
-                { 'x': 1418410680000, 'y': 1 },
-                { 'x': 1418410740000, 'y': 4 },
-                { 'x': 1418410800000, 'y': 2 }
-              ]
-            },
-            {
-              'label': 'gif',
-              'values': [
-                { 'x': 1418410500000, 'y': 1 }
-              ]
-            }
-          ]
-        },
-        {
-          'label': 'Top 5 @tags: security',
-          'ordered': {
-            'date': true,
-            'interval': 60000,
-            'min': 1418410540548,
-            'max': 1418410936568
-          },
-          'series': [
-            {
-              'label': 'jpg',
-              'values': [
-                { 'x': 1418410560000, 'y': 1 },
-                { 'x': 1418410620000, 'y': 3 },
-                { 'x': 1418410920000, 'y': 2 }
-              ]
-            },
-            {
-              'label': 'gif',
-              'values': [
-                { 'x': 1418410680000, 'y': 3 },
-                { 'x': 1418410740000, 'y': 1 }
-              ]
-            }
-          ]
-        },
-        {
-          'label': 'Top 5 @tags: login',
-          'ordered': {
-            'date': true,
-            'interval': 60000,
-            'min': 1418410540548,
-            'max': 1418410936568
-          },
-          'series': [
-            {
-              'label': 'jpg',
-              'values': [
-                { 'x': 1418410740000, 'y': 1 }
-              ]
-            },
-            {
-              'label': 'css',
-              'values': [
-                { 'x': 1418410560000, 'y': 1 }
-              ]
-            }
-          ]
-        },
-        {
-          'label': 'Top 5 @tags: warning',
-          'ordered': {
-            'date': true,
-            'interval': 60000,
-            'min': 1418410540548,
-            'max': 1418410936568
-          },
-          'series': [
-            {
-              'label': 'jpg',
-              'values': [
-                { 'x': 1418410860000, 'y': 2 }
-              ]
-            }
-          ]
-        }
-      ]
-    };
-
-    var seriesData = {
-      series: [
-        {
-          label: '200',
-          values: [
-            {x: 'v1', y: 234},
-            {x: 'v2', y: 34},
-            {x: 'v3', y: 834},
-            {x: 'v4', y: 1234},
-            {x: 'v5', y: 4}
-          ]
-        }
-      ]
-    };
-
-    var multiSeriesData = {
-      series: [
-        {
-          label: '200',
-          values: [
-            {x: '1', y: 234},
-            {x: '2', y: 34},
-            {x: '3', y: 834},
-            {x: '4', y: 1234},
-            {x: '5', y: 4}
-          ]
-        },
-        {
-          label: '404',
-          values: [
-            {x: '1', y: 1234},
-            {x: '3', y: 234},
-            {x: '5', y: 34}
-          ]
-        },
-        {
-          label: '503',
-          values: [
-            {x: '3', y: 834}
-          ]
-        }
-      ]
-    };
-
-    var multiSeriesNumberedData = {
-      series: [
-        {
-          label: '200',
-          values: [
-            {x: 1, y: 234},
-            {x: 2, y: 34},
-            {x: 3, y: 834},
-            {x: 4, y: 1234},
-            {x: 5, y: 4}
-          ]
-        },
-        {
-          label: '404',
-          values: [
-            {x: 1, y: 1234},
-            {x: 3, y: 234},
-            {x: 5, y: 34}
-          ]
-        },
-        {
-          label: '503',
-          values: [
-            {x: 3, y: 834}
-          ]
-        }
-      ]
-    };
-
-    var childrenObject = {
-      children: []
-    };
-    var seriesObject = {
-      series: []
-    };
-    var rowsObject = {
-      rows: []
-    };
-    var columnsObject = {
-      columns: []
-    };
-    var emptyObject = {};
-    var str = 'string';
-    var number = 24;
-    var boolean = false;
-    var nullValue = null;
-    var emptyArray = [];
-    var notAValue;
-
-    describe('Zero Injection (main)', function () {
-      var injectZeros;
-      var sample1;
-      var sample2;
-      var sample3;
-
-      beforeEach(function () {
-        module('ZeroInjectionUtilService');
-      });
-
-      beforeEach(function () {
-        inject(function (Private) {
-          injectZeros = Private(require('components/vislib/components/zero_injection/inject_zeros'));
-          sample1 = injectZeros(seriesData);
-          sample2 = injectZeros(multiSeriesData);
-          sample3 = injectZeros(multiSeriesNumberedData);
-        });
-      });
-
-      it('should throw an error if the input is not an object', function () {
-        expect(function () {
-          injectZeros(str);
-        }).to.throwError();
-
-        expect(function () {
-          injectZeros(number);
-        }).to.throwError();
-
-        expect(function () {
-          injectZeros(boolean);
-        }).to.throwError();
-
-        expect(function () {
-          injectZeros(emptyArray);
-        }).to.throwError();
-
-        expect(function () {
-          injectZeros(nullValue);
-        }).to.throwError();
-
-        expect(function () {
-          injectZeros(notAValue);
-        }).to.throwError();
-      });
-
-      it('should throw an error if property series, rows, or columns is not ' +
-      'present', function () {
-
-        expect(function () {
-          injectZeros(childrenObject);
-        }).to.throwError();
-      });
-
-      it('should not throw an error if object has property series, rows, or ' +
-      'columns', function () {
-
-        expect(function () {
-          injectZeros(seriesObject);
-        }).to.not.throwError();
-
-        expect(function () {
-          injectZeros(rowsObject);
-        }).to.not.throwError();
-
-        expect(function () {
-          injectZeros(columnsObject);
-        }).to.not.throwError();
-      });
-
-      it('should be a function', function () {
-        expect(_.isFunction(injectZeros)).to.be(true);
-      });
-
-      it('should return an object with series[0].values', function () {
-        expect(_.isObject(sample1)).to.be(true);
-        expect(_.isObject(sample1.series[0].values)).to.be(true);
-      });
-
-      it('should return the same array of objects when the length of the series array is 1', function () {
-        expect(sample1.series[0].values[0].x).to.be(seriesData.series[0].values[0].x);
-        expect(sample1.series[0].values[1].x).to.be(seriesData.series[0].values[1].x);
-        expect(sample1.series[0].values[2].x).to.be(seriesData.series[0].values[2].x);
-        expect(sample1.series[0].values[3].x).to.be(seriesData.series[0].values[3].x);
-        expect(sample1.series[0].values[4].x).to.be(seriesData.series[0].values[4].x);
-      });
-
-      it('should inject zeros in the input array', function () {
-        expect(sample2.series[1].values[1].y).to.be(0);
-        expect(sample2.series[2].values[0].y).to.be(0);
-        expect(sample2.series[2].values[1].y).to.be(0);
-        expect(sample2.series[2].values[4].y).to.be(0);
-        expect(sample3.series[1].values[1].y).to.be(0);
-        expect(sample3.series[2].values[0].y).to.be(0);
-        expect(sample3.series[2].values[1].y).to.be(0);
-        expect(sample3.series[2].values[4].y).to.be(0);
-      });
-
-      it('should return values arrays with the same x values', function () {
-        expect(sample2.series[1].values[0].x).to.be(sample2.series[2].values[0].x);
-        expect(sample2.series[1].values[1].x).to.be(sample2.series[2].values[1].x);
-        expect(sample2.series[1].values[2].x).to.be(sample2.series[2].values[2].x);
-        expect(sample2.series[1].values[3].x).to.be(sample2.series[2].values[3].x);
-        expect(sample2.series[1].values[4].x).to.be(sample2.series[2].values[4].x);
-      });
-
-      it('should return values arrays of the same length', function () {
-        expect(sample2.series[0].values.length).to.be(sample2.series[1].values.length);
-        expect(sample2.series[0].values.length).to.be(sample2.series[2].values.length);
-        expect(sample2.series[1].values.length).to.be(sample2.series[2].values.length);
-      });
-    });
-
-    describe('Order X Values', function () {
-      var orderXValues;
-      var results;
-      var numberedResults;
-
-      beforeEach(function () {
-        module('OrderedXKeysUtilService');
-      });
-
-      beforeEach(function () {
-        inject(function (Private) {
-          orderXValues = Private(require('components/vislib/components/zero_injection/ordered_x_keys'));
-          results = orderXValues(multiSeriesData);
-          numberedResults = orderXValues(multiSeriesNumberedData);
-        });
-      });
-
-      it('should throw an error if input is not an object', function () {
-        expect(function () {
-          orderXValues(str);
-        }).to.throwError();
-
-        expect(function () {
-          orderXValues(number);
-        }).to.throwError();
-
-        expect(function () {
-          orderXValues(boolean);
-        }).to.throwError();
-
-        expect(function () {
-          orderXValues(nullValue);
-        }).to.throwError();
-
-        expect(function () {
-          orderXValues(emptyArray);
-        }).to.throwError();
-
-        expect(function () {
-          orderXValues(notAValue);
-        }).to.throwError();
-      });
-
-      it('should return a function', function () {
-        expect(_.isFunction(orderXValues)).to.be(true);
-      });
-
-      it('should return an array', function () {
-        expect(_.isArray(results)).to.be(true);
-      });
-
-      it('should return an array of values in the correct order', function () {
-        expect(results[0]).to.be('1');
-        expect(results[1]).to.be('2');
-        expect(results[2]).to.be('3');
-        expect(results[3]).to.be('4');
-        expect(results[4]).to.be('5');
-        expect(numberedResults[0]).to.be(1);
-        expect(numberedResults[1]).to.be(2);
-        expect(numberedResults[2]).to.be(3);
-        expect(numberedResults[3]).to.be(4);
-        expect(numberedResults[4]).to.be(5);
-      });
-    });
-
-    describe('Unique Keys', function () {
-      var uniqueKeys;
-      var results;
-
-      beforeEach(function () {
-        module('UniqueXValuesUtilService');
-      });
-
-      beforeEach(function () {
-        inject(function (Private) {
-          uniqueKeys = Private(require('components/vislib/components/zero_injection/uniq_keys'));
-          results = uniqueKeys(multiSeriesData);
-        });
-      });
-
-      it('should throw an error if input is not an object', function () {
-        expect(function () {
-          uniqueKeys(str);
-        }).to.throwError();
-
-        expect(function () {
-          uniqueKeys(number);
-        }).to.throwError();
-
-        expect(function () {
-          uniqueKeys(boolean);
-        }).to.throwError();
-
-        expect(function () {
-          uniqueKeys(nullValue);
-        }).to.throwError();
-
-        expect(function () {
-          uniqueKeys(emptyArray);
-        }).to.throwError();
-
-        expect(function () {
-          uniqueKeys(notAValue);
-        }).to.throwError();
-      });
-
-      it('should return a function', function () {
-        expect(_.isFunction(uniqueKeys)).to.be(true);
-      });
-
-      it('should return an object', function () {
-        expect(_.isObject(results)).to.be(true);
-      });
-
-      it('should return an object of unique keys', function () {
-        expect(_.uniq(_.keys(results)).length).to.be(_.keys(results).length);
-      });
-    });
-
-    describe('Flatten Data', function () {
-      var flattenData;
-      var results;
-
-      beforeEach(function () {
-        module('ReplaceIndexUtilService');
-      });
-
-      beforeEach(function () {
-        inject(function (Private) {
-          flattenData = Private(require('components/vislib/components/zero_injection/flatten_data'));
-          results = flattenData(multiSeriesData);
-        });
-      });
-
-      it('should return a function', function () {
-        expect(_.isFunction(flattenData)).to.be(true);
-      });
-
-      it('should return an array', function () {
-        expect(_.isArray(results)).to.be(true);
-      });
-
-      it('should return an array of objects', function () {
-        expect(_.isObject(results[0])).to.be(true);
-        expect(_.isObject(results[1])).to.be(true);
-        expect(_.isObject(results[2])).to.be(true);
-      });
-    });
-
-    describe('Zero Filled Array', function () {
-      var createZeroArray;
-      var arr1 = [1, 2, 3, 4, 5];
-      var arr2 = ['1', '2', '3', '4', '5'];
-      var results1;
-      var results2;
-
-      beforeEach(function () {
-        module('ZeroFilledArrayUtilService');
-      });
-
-      beforeEach(function () {
-        inject(function (Private) {
-          createZeroArray = Private(require('components/vislib/components/zero_injection/zero_filled_array'));
-          results1 = createZeroArray(arr1);
-          results2 = createZeroArray(arr2);
-        });
-      });
-
-      it('should throw an error if input is not an array', function () {
-        expect(function () {
-          createZeroArray(str);
-        }).to.throwError();
-
-        expect(function () {
-          createZeroArray(number);
-        }).to.throwError();
-
-        expect(function () {
-          createZeroArray(boolean);
-        }).to.throwError();
-
-        expect(function () {
-          createZeroArray(nullValue);
-        }).to.throwError();
-
-        expect(function () {
-          createZeroArray(emptyObject);
-        }).to.throwError();
-
-        expect(function () {
-          createZeroArray(notAValue);
-        }).to.throwError();
-      });
-
-      it('should return a function', function () {
-        expect(_.isFunction(createZeroArray)).to.be(true);
-      });
-
-      it('should return an array', function () {
-        expect(_.isArray(results1)).to.be(true);
-      });
-
-      it('should return an array of objects', function () {
-        expect(_.isObject(results1[0])).to.be(true);
-        expect(_.isObject(results1[1])).to.be(true);
-        expect(_.isObject(results1[2])).to.be(true);
-        expect(_.isObject(results1[3])).to.be(true);
-        expect(_.isObject(results1[4])).to.be(true);
-      });
-
-      it('should return an array of objects where each y value is 0', function () {
-        expect(results1[0].y).to.be(0);
-        expect(results1[1].y).to.be(0);
-        expect(results1[2].y).to.be(0);
-        expect(results1[3].y).to.be(0);
-        expect(results1[4].y).to.be(0);
-      });
-
-      it('should return an array of objects where each x values are numbers', function () {
-        expect(_.isNumber(results1[0].x)).to.be(true);
-        expect(_.isNumber(results1[1].x)).to.be(true);
-        expect(_.isNumber(results1[2].x)).to.be(true);
-        expect(_.isNumber(results1[3].x)).to.be(true);
-        expect(_.isNumber(results1[4].x)).to.be(true);
-      });
-
-      it('should return an array of objects where each x values are strings', function () {
-        expect(_.isString(results2[0].x)).to.be(true);
-        expect(_.isString(results2[1].x)).to.be(true);
-        expect(_.isString(results2[2].x)).to.be(true);
-        expect(_.isString(results2[3].x)).to.be(true);
-        expect(_.isString(results2[4].x)).to.be(true);
-      });
-    });
-
-    describe('Zero Filled Data Array', function () {
-      var zeroFillArray;
-      var xValueArr = [1, 2, 3, 4, 5];
-      var createZeroArray;
-      var arr1;
-      var arr2 = [ {x: 3, y: 834} ];
-      var results;
-
-      beforeEach(function () {
-        module('ZeroFillDataArrayUtilService');
-      });
-
-      beforeEach(function () {
-        inject(function (Private) {
-          zeroFillArray = Private(require('components/vislib/components/zero_injection/zero_fill_data_array'));
-          createZeroArray = Private(require('components/vislib/components/zero_injection/zero_filled_array'));
-          arr1 = createZeroArray(xValueArr);
-
-          // Takes zero array as 1st arg and data array as 2nd arg
-          results = zeroFillArray(arr1, arr2);
-        });
-      });
-
-      it('should throw an error if input are not arrays', function () {
-        expect(function () {
-          zeroFillArray(str, str);
-        }).to.throwError();
-
-        expect(function () {
-          zeroFillArray(number, number);
-        }).to.throwError();
-
-        expect(function () {
-          zeroFillArray(boolean, boolean);
-        }).to.throwError();
-
-        expect(function () {
-          zeroFillArray(nullValue, nullValue);
-        }).to.throwError();
-
-        expect(function () {
-          zeroFillArray(emptyObject, emptyObject);
-        }).to.throwError();
-
-        expect(function () {
-          zeroFillArray(notAValue, notAValue);
-        }).to.throwError();
-      });
-
-      it('should return a function', function () {
-        expect(_.isFunction(zeroFillArray)).to.be(true);
-      });
-
-      it('should return an array', function () {
-        expect(_.isArray(results)).to.be(true);
-      });
-
-      it('should return an array of objects', function () {
-        expect(_.isObject(results[0])).to.be(true);
-        expect(_.isObject(results[1])).to.be(true);
-        expect(_.isObject(results[2])).to.be(true);
-      });
-
-      it('should return an array with zeros injected in the appropriate objects as y values', function () {
-        expect(results[0].y).to.be(0);
-        expect(results[1].y).to.be(0);
-        expect(results[3].y).to.be(0);
-        expect(results[4].y).to.be(0);
-      });
-    });
-
-    describe('Injected Zero values return in the correct order', function () {
-      var injectZeros;
-      var results;
-
-      beforeEach(function () {
-        module('ZeroInjectionUtilService');
-      });
-
-      beforeEach(function () {
-        inject(function (Private) {
-          injectZeros = Private(require('components/vislib/components/zero_injection/inject_zeros'));
-          results = injectZeros(dateHistogramRows);
-        });
-      });
-
-      it('should return an array of objects', function () {
-        results.rows.forEach(function (row) {
-          expect(_.isArray(row.series[0].values)).to.be(true);
-        });
-      });
-
-      it('should return ordered x values', function () {
-        var values = results.rows[0].series[0].values;
-        expect(values[0].x).to.be.lessThan(values[1].x);
-        expect(values[1].x).to.be.lessThan(values[2].x);
-        expect(values[2].x).to.be.lessThan(values[3].x);
-        expect(values[3].x).to.be.lessThan(values[4].x);
-        expect(values[4].x).to.be.lessThan(values[5].x);
-        expect(values[5].x).to.be.lessThan(values[6].x);
-        expect(values[6].x).to.be.lessThan(values[7].x);
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/vislib/fixture/_vis_fixture.js b/test/unit/specs/vislib/fixture/_vis_fixture.js
deleted file mode 100644
index db0a2a6e8aaa3..0000000000000
--- a/test/unit/specs/vislib/fixture/_vis_fixture.js
+++ /dev/null
@@ -1,29 +0,0 @@
-define(function (require) {
-  return function VisLibFixtures(Private) {
-    var $ = require('jquery');
-    var _ = require('lodash');
-
-    return function (visLibParams) {
-      var Vis = Private(require('components/vislib/vis'));
-
-      $('body').append('<div class=visualize-chart></div>');
-
-      var $el = $('.visualize-chart:last');
-
-      $el.width(1024);
-      $el.height(300);
-
-      var config = _.defaults(visLibParams || {}, {
-        shareYAxis: true,
-        addTooltip: true,
-        addLegend: true,
-        defaultYExtents: false,
-        setYExtents: false,
-        yAxis: {},
-        type: 'histogram'
-      });
-
-      return new Vis($el, config);
-    };
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/date_histogram/_columns.js b/test/unit/specs/vislib/fixture/mock_data/date_histogram/_columns.js
deleted file mode 100644
index e5ad6aaac5d93..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/date_histogram/_columns.js
+++ /dev/null
@@ -1,266 +0,0 @@
-define(function (require) {
-  var moment = require('moment');
-
-  return {
-    'columns': [
-      {
-        'label': '200: response',
-        'xAxisLabel': '@timestamp per 30 sec',
-        'ordered': {
-          'date': true,
-          'interval': 30000,
-          'min': 1415826608440,
-          'max': 1415827508440
-        },
-        'yAxisLabel': 'Count of documents',
-        'xAxisFormatter': function (thing) {
-          return moment(thing);
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        },
-        'series': [
-          {
-            'values': [
-              {
-                'x': 1415826600000,
-                'y': 4
-              },
-              {
-                'x': 1415826630000,
-                'y': 8
-              },
-              {
-                'x': 1415826660000,
-                'y': 7
-              },
-              {
-                'x': 1415826690000,
-                'y': 5
-              },
-              {
-                'x': 1415826720000,
-                'y': 5
-              },
-              {
-                'x': 1415826750000,
-                'y': 4
-              },
-              {
-                'x': 1415826780000,
-                'y': 10
-              },
-              {
-                'x': 1415826810000,
-                'y': 7
-              },
-              {
-                'x': 1415826840000,
-                'y': 9
-              },
-              {
-                'x': 1415826870000,
-                'y': 8
-              },
-              {
-                'x': 1415826900000,
-                'y': 9
-              },
-              {
-                'x': 1415826930000,
-                'y': 8
-              },
-              {
-                'x': 1415826960000,
-                'y': 3
-              },
-              {
-                'x': 1415826990000,
-                'y': 9
-              },
-              {
-                'x': 1415827020000,
-                'y': 6
-              },
-              {
-                'x': 1415827050000,
-                'y': 8
-              },
-              {
-                'x': 1415827080000,
-                'y': 7
-              },
-              {
-                'x': 1415827110000,
-                'y': 4
-              },
-              {
-                'x': 1415827140000,
-                'y': 6
-              },
-              {
-                'x': 1415827170000,
-                'y': 10
-              },
-              {
-                'x': 1415827200000,
-                'y': 2
-              },
-              {
-                'x': 1415827230000,
-                'y': 8
-              },
-              {
-                'x': 1415827260000,
-                'y': 5
-              },
-              {
-                'x': 1415827290000,
-                'y': 6
-              },
-              {
-                'x': 1415827320000,
-                'y': 6
-              },
-              {
-                'x': 1415827350000,
-                'y': 10
-              },
-              {
-                'x': 1415827380000,
-                'y': 6
-              },
-              {
-                'x': 1415827410000,
-                'y': 6
-              },
-              {
-                'x': 1415827440000,
-                'y': 12
-              },
-              {
-                'x': 1415827470000,
-                'y': 9
-              },
-              {
-                'x': 1415827500000,
-                'y': 1
-              }
-            ]
-          }
-        ]
-      },
-      {
-        'label': '503: response',
-        'xAxisLabel': '@timestamp per 30 sec',
-        'ordered': {
-          'date': true,
-          'interval': 30000,
-          'min': 1415826608440,
-          'max': 1415827508440
-        },
-        'yAxisLabel': 'Count of documents',
-        'xAxisFormatter': function (thing) {
-          return moment(thing);
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        },
-        'series': [
-          {
-            'values': [
-              {
-                'x': 1415826630000,
-                'y': 1
-              },
-              {
-                'x': 1415826660000,
-                'y': 1
-              },
-              {
-                'x': 1415826720000,
-                'y': 1
-              },
-              {
-                'x': 1415826780000,
-                'y': 1
-              },
-              {
-                'x': 1415826900000,
-                'y': 1
-              },
-              {
-                'x': 1415827020000,
-                'y': 1
-              },
-              {
-                'x': 1415827080000,
-                'y': 1
-              },
-              {
-                'x': 1415827110000,
-                'y': 2
-              }
-            ]
-          }
-        ]
-      },
-      {
-        'label': '404: response',
-        'xAxisLabel': '@timestamp per 30 sec',
-        'ordered': {
-          'date': true,
-          'interval': 30000,
-          'min': 1415826608440,
-          'max': 1415827508440
-        },
-        'yAxisLabel': 'Count of documents',
-        'xAxisFormatter': function (thing) {
-          return moment(thing);
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        },
-        'series': [
-          {
-            'values': [
-              {
-                'x': 1415826660000,
-                'y': 1
-              },
-              {
-                'x': 1415826720000,
-                'y': 1
-              },
-              {
-                'x': 1415826810000,
-                'y': 1
-              },
-              {
-                'x': 1415826960000,
-                'y': 1
-              },
-              {
-                'x': 1415827050000,
-                'y': 1
-              },
-              {
-                'x': 1415827260000,
-                'y': 1
-              },
-              {
-                'x': 1415827380000,
-                'y': 1
-              },
-              {
-                'x': 1415827410000,
-                'y': 1
-              }
-            ]
-          }
-        ]
-      }
-    ],
-    'hits': 225
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/date_histogram/_rows.js b/test/unit/specs/vislib/fixture/mock_data/date_histogram/_rows.js
deleted file mode 100644
index 83606c88f6575..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/date_histogram/_rows.js
+++ /dev/null
@@ -1,1647 +0,0 @@
-define(function (require) {
-  var moment = require('moment');
-
-  return {
-    'rows': [
-      {
-        'label': '0.0-1000.0: bytes',
-        'xAxisLabel': '@timestamp per 30 sec',
-        'ordered': {
-          'date': true,
-          'interval': 30000,
-          'min': 1415826260456,
-          'max': 1415827160456
-        },
-        'yAxisLabel': 'Count of documents',
-        'xAxisFormatter': function (thing) {
-          return moment(thing);
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        },
-        'series': [
-          {
-            'label': 'jpg',
-            'values': [
-              {
-                'x': 1415826240000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826270000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826300000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826330000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 1415826360000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826390000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826420000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826450000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826480000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826510000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826540000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826570000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826600000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826630000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 1415826660000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826690000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826720000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826750000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826780000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 1415826810000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826840000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826870000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826900000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 1415826930000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826960000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826990000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827020000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 1415827050000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827080000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827110000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 1415827140000,
-                'y': 0,
-                'y0': 0
-              }
-            ]
-          },
-          {
-            'label': 'css',
-            'values': [
-              {
-                'x': 1415826240000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826270000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826300000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826330000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826360000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826390000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826420000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826450000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826480000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826510000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826540000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826570000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826600000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826630000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826660000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826690000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826720000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826750000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826780000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826810000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826840000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826870000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826900000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826930000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826960000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826990000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827020000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415827050000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827080000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 1415827110000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415827140000,
-                'y': 0,
-                'y0': 0
-              }
-            ]
-          },
-          {
-            'label': 'png',
-            'values': [
-              {
-                'x': 1415826240000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826270000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826300000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826330000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826360000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826390000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826420000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826450000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826480000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826510000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826540000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826570000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826600000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826630000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826660000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826690000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826720000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826750000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826780000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826810000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826840000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826870000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826900000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826930000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826960000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826990000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827020000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415827050000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827080000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415827110000,
-                'y': 1,
-                'y0': 1
-              },
-              {
-                'x': 1415827140000,
-                'y': 0,
-                'y0': 0
-              }
-            ]
-          },
-          {
-            'label': 'php',
-            'values': [
-              {
-                'x': 1415826240000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826270000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826300000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 1415826330000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826360000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826390000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826420000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826450000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826480000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826510000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826540000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826570000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826600000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826630000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826660000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826690000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826720000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826750000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826780000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826810000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826840000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826870000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826900000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826930000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826960000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826990000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827020000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415827050000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827080000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415827110000,
-                'y': 0,
-                'y0': 2
-              },
-              {
-                'x': 1415827140000,
-                'y': 0,
-                'y0': 0
-              }
-            ]
-          },
-          {
-            'label': 'gif',
-            'values': [
-              {
-                'x': 1415826240000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826270000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826300000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826330000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826360000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826390000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826420000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826450000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 1415826480000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 1415826510000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826540000,
-                'y': 3,
-                'y0': 0
-              },
-              {
-                'x': 1415826570000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826600000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826630000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826660000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 1415826690000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826720000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 1415826750000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826780000,
-                'y': 1,
-                'y0': 1
-              },
-              {
-                'x': 1415826810000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826840000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826870000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826900000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826930000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826960000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826990000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827020000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415827050000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827080000,
-                'y': 1,
-                'y0': 1
-              },
-              {
-                'x': 1415827110000,
-                'y': 1,
-                'y0': 2
-              },
-              {
-                'x': 1415827140000,
-                'y': 0,
-                'y0': 0
-              }
-            ]
-          }
-        ]
-      },
-      {
-        'label': '1000.0-2000.0: bytes',
-        'xAxisLabel': '@timestamp per 30 sec',
-        'ordered': {
-          'date': true,
-          'interval': 30000,
-          'min': 1415826260457,
-          'max': 1415827160457
-        },
-        'yAxisLabel': 'Count of documents',
-        'xAxisFormatter': function (thing) {
-          return moment(thing);
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        },
-        'series': [
-          {
-            'label': 'jpg',
-            'values': [
-              {
-                'x': 1415826240000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826270000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826300000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826330000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826360000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826390000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826420000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826450000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826480000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826510000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826540000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826570000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 1415826600000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826630000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826660000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 1415826690000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826720000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826750000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826780000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826810000,
-                'y': 2,
-                'y0': 0
-              },
-              {
-                'x': 1415826840000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 1415826870000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826900000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 1415826930000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826960000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826990000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827020000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 1415827050000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827080000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827110000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 1415827140000,
-                'y': 0,
-                'y0': 0
-              }
-            ]
-          },
-          {
-            'label': 'css',
-            'values': [
-              {
-                'x': 1415826240000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826270000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826300000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826330000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826360000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826390000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826420000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826450000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826480000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826510000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826540000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826570000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826600000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826630000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826660000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826690000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826720000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826750000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826780000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826810000,
-                'y': 0,
-                'y0': 2
-              },
-              {
-                'x': 1415826840000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826870000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826900000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826930000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826960000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826990000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827020000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415827050000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827080000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827110000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415827140000,
-                'y': 0,
-                'y0': 0
-              }
-            ]
-          },
-          {
-            'label': 'png',
-            'values': [
-              {
-                'x': 1415826240000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826270000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826300000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826330000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826360000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826390000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826420000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826450000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826480000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826510000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826540000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826570000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826600000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826630000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826660000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826690000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826720000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826750000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826780000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826810000,
-                'y': 0,
-                'y0': 2
-              },
-              {
-                'x': 1415826840000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826870000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826900000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826930000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826960000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826990000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 1415827020000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415827050000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827080000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827110000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415827140000,
-                'y': 0,
-                'y0': 0
-              }
-            ]
-          },
-          {
-            'label': 'php',
-            'values': [
-              {
-                'x': 1415826240000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826270000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826300000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826330000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826360000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826390000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826420000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826450000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 1415826480000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826510000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826540000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826570000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826600000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826630000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826660000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826690000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826720000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826750000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826780000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826810000,
-                'y': 0,
-                'y0': 2
-              },
-              {
-                'x': 1415826840000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826870000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826900000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826930000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826960000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826990000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415827020000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415827050000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827080000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827110000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415827140000,
-                'y': 0,
-                'y0': 0
-              }
-            ]
-          },
-          {
-            'label': 'gif',
-            'values': [
-              {
-                'x': 1415826240000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826270000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826300000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826330000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826360000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826390000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826420000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826450000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826480000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826510000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826540000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826570000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826600000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826630000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826660000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826690000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826720000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826750000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826780000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826810000,
-                'y': 0,
-                'y0': 2
-              },
-              {
-                'x': 1415826840000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826870000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826900000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415826930000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826960000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415826990000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415827020000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415827050000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827080000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 1415827110000,
-                'y': 0,
-                'y0': 1
-              },
-              {
-                'x': 1415827140000,
-                'y': 0,
-                'y0': 0
-              }
-            ]
-          }
-        ]
-      }
-    ],
-    'hits': 236
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/date_histogram/_series.js b/test/unit/specs/vislib/fixture/mock_data/date_histogram/_series.js
deleted file mode 100644
index 6225cec259c9d..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/date_histogram/_series.js
+++ /dev/null
@@ -1,152 +0,0 @@
-define(function (require) {
-  var moment = require('moment');
-
-  return {
-    'label': '',
-    'xAxisLabel': '@timestamp per 30 sec',
-    'ordered': {
-      'date': true,
-      'min': 1411761457636,
-      'max': 1411762357636,
-      'interval': 30000
-    },
-    'yAxisLabel': 'Count of documents',
-    'series': [
-      {
-        'values': [
-          {
-            'x': 1411761450000,
-            'y': 41
-          },
-          {
-            'x': 1411761480000,
-            'y': 18
-          },
-          {
-            'x': 1411761510000,
-            'y': 22
-          },
-          {
-            'x': 1411761540000,
-            'y': 17
-          },
-          {
-            'x': 1411761570000,
-            'y': 17
-          },
-          {
-            'x': 1411761600000,
-            'y': 21
-          },
-          {
-            'x': 1411761630000,
-            'y': 16
-          },
-          {
-            'x': 1411761660000,
-            'y': 17
-          },
-          {
-            'x': 1411761690000,
-            'y': 15
-          },
-          {
-            'x': 1411761720000,
-            'y': 19
-          },
-          {
-            'x': 1411761750000,
-            'y': 11
-          },
-          {
-            'x': 1411761780000,
-            'y': 13
-          },
-          {
-            'x': 1411761810000,
-            'y': 24
-          },
-          {
-            'x': 1411761840000,
-            'y': 20
-          },
-          {
-            'x': 1411761870000,
-            'y': 20
-          },
-          {
-            'x': 1411761900000,
-            'y': 21
-          },
-          {
-            'x': 1411761930000,
-            'y': 17
-          },
-          {
-            'x': 1411761960000,
-            'y': 20
-          },
-          {
-            'x': 1411761990000,
-            'y': 13
-          },
-          {
-            'x': 1411762020000,
-            'y': 14
-          },
-          {
-            'x': 1411762050000,
-            'y': 25
-          },
-          {
-            'x': 1411762080000,
-            'y': 17
-          },
-          {
-            'x': 1411762110000,
-            'y': 14
-          },
-          {
-            'x': 1411762140000,
-            'y': 22
-          },
-          {
-            'x': 1411762170000,
-            'y': 14
-          },
-          {
-            'x': 1411762200000,
-            'y': 19
-          },
-          {
-            'x': 1411762230000,
-            'y': 22
-          },
-          {
-            'x': 1411762260000,
-            'y': 17
-          },
-          {
-            'x': 1411762290000,
-            'y': 8
-          },
-          {
-            'x': 1411762320000,
-            'y': 15
-          },
-          {
-            'x': 1411762350000,
-            'y': 4
-          }
-        ]
-      }
-    ],
-    'hits': 533,
-    'xAxisFormatter': function (thing) {
-      return moment(thing);
-    },
-    'tooltipFormatter': function (d) {
-      return d;
-    }
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/date_histogram/_series_neg.js b/test/unit/specs/vislib/fixture/mock_data/date_histogram/_series_neg.js
deleted file mode 100644
index 746c011778d18..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/date_histogram/_series_neg.js
+++ /dev/null
@@ -1,152 +0,0 @@
-define(function (require) {
-  var moment = require('moment');
-
-  return {
-    'label': '',
-    'xAxisLabel': '@timestamp per 30 sec',
-    'ordered': {
-      'date': true,
-      'min': 1411761457636,
-      'max': 1411762357636,
-      'interval': 30000
-    },
-    'yAxisLabel': 'Count of documents',
-    'series': [
-      {
-        'values': [
-          {
-            'x': 1411761450000,
-            'y': -41
-          },
-          {
-            'x': 1411761480000,
-            'y': -18
-          },
-          {
-            'x': 1411761510000,
-            'y': -22
-          },
-          {
-            'x': 1411761540000,
-            'y': -17
-          },
-          {
-            'x': 1411761570000,
-            'y': -17
-          },
-          {
-            'x': 1411761600000,
-            'y': -21
-          },
-          {
-            'x': 1411761630000,
-            'y': -16
-          },
-          {
-            'x': 1411761660000,
-            'y': -17
-          },
-          {
-            'x': 1411761690000,
-            'y': -15
-          },
-          {
-            'x': 1411761720000,
-            'y': -19
-          },
-          {
-            'x': 1411761750000,
-            'y': -11
-          },
-          {
-            'x': 1411761780000,
-            'y': -13
-          },
-          {
-            'x': 1411761810000,
-            'y': -24
-          },
-          {
-            'x': 1411761840000,
-            'y': -20
-          },
-          {
-            'x': 1411761870000,
-            'y': -20
-          },
-          {
-            'x': 1411761900000,
-            'y': -21
-          },
-          {
-            'x': 1411761930000,
-            'y': -17
-          },
-          {
-            'x': 1411761960000,
-            'y': -20
-          },
-          {
-            'x': 1411761990000,
-            'y': -13
-          },
-          {
-            'x': 1411762020000,
-            'y': -14
-          },
-          {
-            'x': 1411762050000,
-            'y': -25
-          },
-          {
-            'x': 1411762080000,
-            'y': -17
-          },
-          {
-            'x': 1411762110000,
-            'y': -14
-          },
-          {
-            'x': 1411762140000,
-            'y': -22
-          },
-          {
-            'x': 1411762170000,
-            'y': -14
-          },
-          {
-            'x': 1411762200000,
-            'y': -19
-          },
-          {
-            'x': 1411762230000,
-            'y': -22
-          },
-          {
-            'x': 1411762260000,
-            'y': -17
-          },
-          {
-            'x': 1411762290000,
-            'y': -8
-          },
-          {
-            'x': 1411762320000,
-            'y': -15
-          },
-          {
-            'x': 1411762350000,
-            'y': -4
-          }
-        ]
-      }
-    ],
-    'hits': 533,
-    'xAxisFormatter': function (thing) {
-      return moment(thing);
-    },
-    'tooltipFormatter': function (d) {
-      return d;
-    }
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/date_histogram/_series_pos_neg.js b/test/unit/specs/vislib/fixture/mock_data/date_histogram/_series_pos_neg.js
deleted file mode 100644
index d514b93c31cd2..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/date_histogram/_series_pos_neg.js
+++ /dev/null
@@ -1,152 +0,0 @@
-define(function (require) {
-  var moment = require('moment');
-
-  return {
-    'label': '',
-    'xAxisLabel': '@timestamp per 30 sec',
-    'ordered': {
-      'date': true,
-      'min': 1411761457636,
-      'max': 1411762357636,
-      'interval': 30000
-    },
-    'yAxisLabel': 'Count of documents',
-    'series': [
-      {
-        'values': [
-          {
-            'x': 1411761450000,
-            'y': 41
-          },
-          {
-            'x': 1411761480000,
-            'y': 18
-          },
-          {
-            'x': 1411761510000,
-            'y': -22
-          },
-          {
-            'x': 1411761540000,
-            'y': -17
-          },
-          {
-            'x': 1411761570000,
-            'y': -17
-          },
-          {
-            'x': 1411761600000,
-            'y': -21
-          },
-          {
-            'x': 1411761630000,
-            'y': -16
-          },
-          {
-            'x': 1411761660000,
-            'y': 17
-          },
-          {
-            'x': 1411761690000,
-            'y': 15
-          },
-          {
-            'x': 1411761720000,
-            'y': 19
-          },
-          {
-            'x': 1411761750000,
-            'y': 11
-          },
-          {
-            'x': 1411761780000,
-            'y': -13
-          },
-          {
-            'x': 1411761810000,
-            'y': -24
-          },
-          {
-            'x': 1411761840000,
-            'y': -20
-          },
-          {
-            'x': 1411761870000,
-            'y': -20
-          },
-          {
-            'x': 1411761900000,
-            'y': -21
-          },
-          {
-            'x': 1411761930000,
-            'y': 17
-          },
-          {
-            'x': 1411761960000,
-            'y': 20
-          },
-          {
-            'x': 1411761990000,
-            'y': -13
-          },
-          {
-            'x': 1411762020000,
-            'y': -14
-          },
-          {
-            'x': 1411762050000,
-            'y': 25
-          },
-          {
-            'x': 1411762080000,
-            'y': -17
-          },
-          {
-            'x': 1411762110000,
-            'y': -14
-          },
-          {
-            'x': 1411762140000,
-            'y': -22
-          },
-          {
-            'x': 1411762170000,
-            'y': -14
-          },
-          {
-            'x': 1411762200000,
-            'y': 19
-          },
-          {
-            'x': 1411762230000,
-            'y': 22
-          },
-          {
-            'x': 1411762260000,
-            'y': 17
-          },
-          {
-            'x': 1411762290000,
-            'y': 8
-          },
-          {
-            'x': 1411762320000,
-            'y': -15
-          },
-          {
-            'x': 1411762350000,
-            'y': -4
-          }
-        ]
-      }
-    ],
-    'hits': 533,
-    'xAxisFormatter': function (thing) {
-      return moment(thing);
-    },
-    'tooltipFormatter': function (d) {
-      return d;
-    }
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/date_histogram/_stacked_series.js b/test/unit/specs/vislib/fixture/mock_data/date_histogram/_stacked_series.js
deleted file mode 100644
index 68567de5375e6..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/date_histogram/_stacked_series.js
+++ /dev/null
@@ -1,1485 +0,0 @@
-define(function (require) {
-  var moment = require('moment');
-
-  return {
-    'label': '',
-    'xAxisLabel': '@timestamp per 10 min',
-    'ordered': {
-      'date': true,
-      'min': 1413544140087,
-      'max': 1413587340087,
-      'interval': 600000
-    },
-    'yAxisLabel': 'Count of documents',
-    'series': [
-      {
-        'label': 'html',
-        'values': [
-          {
-            'x': 1413543600000,
-            'y': 140
-          },
-          {
-            'x': 1413544200000,
-            'y': 1388
-          },
-          {
-            'x': 1413544800000,
-            'y': 1308
-          },
-          {
-            'x': 1413545400000,
-            'y': 1356
-          },
-          {
-            'x': 1413546000000,
-            'y': 1314
-          },
-          {
-            'x': 1413546600000,
-            'y': 1343
-          },
-          {
-            'x': 1413547200000,
-            'y': 1353
-          },
-          {
-            'x': 1413547800000,
-            'y': 1353
-          },
-          {
-            'x': 1413548400000,
-            'y': 1334
-          },
-          {
-            'x': 1413549000000,
-            'y': 1433
-          },
-          {
-            'x': 1413549600000,
-            'y': 1331
-          },
-          {
-            'x': 1413550200000,
-            'y': 1349
-          },
-          {
-            'x': 1413550800000,
-            'y': 1323
-          },
-          {
-            'x': 1413551400000,
-            'y': 1203
-          },
-          {
-            'x': 1413552000000,
-            'y': 1231
-          },
-          {
-            'x': 1413552600000,
-            'y': 1227
-          },
-          {
-            'x': 1413553200000,
-            'y': 1187
-          },
-          {
-            'x': 1413553800000,
-            'y': 1119
-          },
-          {
-            'x': 1413554400000,
-            'y': 1159
-          },
-          {
-            'x': 1413555000000,
-            'y': 1117
-          },
-          {
-            'x': 1413555600000,
-            'y': 1152
-          },
-          {
-            'x': 1413556200000,
-            'y': 1057
-          },
-          {
-            'x': 1413556800000,
-            'y': 1009
-          },
-          {
-            'x': 1413557400000,
-            'y': 979
-          },
-          {
-            'x': 1413558000000,
-            'y': 975
-          },
-          {
-            'x': 1413558600000,
-            'y': 848
-          },
-          {
-            'x': 1413559200000,
-            'y': 873
-          },
-          {
-            'x': 1413559800000,
-            'y': 808
-          },
-          {
-            'x': 1413560400000,
-            'y': 784
-          },
-          {
-            'x': 1413561000000,
-            'y': 799
-          },
-          {
-            'x': 1413561600000,
-            'y': 684
-          },
-          {
-            'x': 1413562200000,
-            'y': 727
-          },
-          {
-            'x': 1413562800000,
-            'y': 621
-          },
-          {
-            'x': 1413563400000,
-            'y': 615
-          },
-          {
-            'x': 1413564000000,
-            'y': 569
-          },
-          {
-            'x': 1413564600000,
-            'y': 523
-          },
-          {
-            'x': 1413565200000,
-            'y': 474
-          },
-          {
-            'x': 1413565800000,
-            'y': 470
-          },
-          {
-            'x': 1413566400000,
-            'y': 466
-          },
-          {
-            'x': 1413567000000,
-            'y': 394
-          },
-          {
-            'x': 1413567600000,
-            'y': 404
-          },
-          {
-            'x': 1413568200000,
-            'y': 389
-          },
-          {
-            'x': 1413568800000,
-            'y': 312
-          },
-          {
-            'x': 1413569400000,
-            'y': 274
-          },
-          {
-            'x': 1413570000000,
-            'y': 285
-          },
-          {
-            'x': 1413570600000,
-            'y': 299
-          },
-          {
-            'x': 1413571200000,
-            'y': 207
-          },
-          {
-            'x': 1413571800000,
-            'y': 213
-          },
-          {
-            'x': 1413572400000,
-            'y': 119
-          },
-          {
-            'x': 1413573600000,
-            'y': 122
-          },
-          {
-            'x': 1413574200000,
-            'y': 169
-          },
-          {
-            'x': 1413574800000,
-            'y': 151
-          },
-          {
-            'x': 1413575400000,
-            'y': 152
-          },
-          {
-            'x': 1413576000000,
-            'y': 115
-          },
-          {
-            'x': 1413576600000,
-            'y': 117
-          },
-          {
-            'x': 1413577200000,
-            'y': 108
-          },
-          {
-            'x': 1413577800000,
-            'y': 100
-          },
-          {
-            'x': 1413578400000,
-            'y': 78
-          },
-          {
-            'x': 1413579000000,
-            'y': 88
-          },
-          {
-            'x': 1413579600000,
-            'y': 63
-          },
-          {
-            'x': 1413580200000,
-            'y': 58
-          },
-          {
-            'x': 1413580800000,
-            'y': 45
-          },
-          {
-            'x': 1413581400000,
-            'y': 57
-          },
-          {
-            'x': 1413582000000,
-            'y': 34
-          },
-          {
-            'x': 1413582600000,
-            'y': 41
-          },
-          {
-            'x': 1413583200000,
-            'y': 24
-          },
-          {
-            'x': 1413583800000,
-            'y': 27
-          },
-          {
-            'x': 1413584400000,
-            'y': 19
-          },
-          {
-            'x': 1413585000000,
-            'y': 24
-          },
-          {
-            'x': 1413585600000,
-            'y': 18
-          },
-          {
-            'x': 1413586200000,
-            'y': 17
-          },
-          {
-            'x': 1413586800000,
-            'y': 14
-          }
-        ]
-      },
-      {
-        'label': 'php',
-        'values': [
-          {
-            'x': 1413543600000,
-            'y': 90
-          },
-          {
-            'x': 1413544200000,
-            'y': 949
-          },
-          {
-            'x': 1413544800000,
-            'y': 1012
-          },
-          {
-            'x': 1413545400000,
-            'y': 1027
-          },
-          {
-            'x': 1413546000000,
-            'y': 1073
-          },
-          {
-            'x': 1413546600000,
-            'y': 992
-          },
-          {
-            'x': 1413547200000,
-            'y': 1005
-          },
-          {
-            'x': 1413547800000,
-            'y': 1014
-          },
-          {
-            'x': 1413548400000,
-            'y': 987
-          },
-          {
-            'x': 1413549000000,
-            'y': 982
-          },
-          {
-            'x': 1413549600000,
-            'y': 1086
-          },
-          {
-            'x': 1413550200000,
-            'y': 998
-          },
-          {
-            'x': 1413550800000,
-            'y': 935
-          },
-          {
-            'x': 1413551400000,
-            'y': 995
-          },
-          {
-            'x': 1413552000000,
-            'y': 926
-          },
-          {
-            'x': 1413552600000,
-            'y': 897
-          },
-          {
-            'x': 1413553200000,
-            'y': 873
-          },
-          {
-            'x': 1413553800000,
-            'y': 885
-          },
-          {
-            'x': 1413554400000,
-            'y': 859
-          },
-          {
-            'x': 1413555000000,
-            'y': 852
-          },
-          {
-            'x': 1413555600000,
-            'y': 779
-          },
-          {
-            'x': 1413556200000,
-            'y': 739
-          },
-          {
-            'x': 1413556800000,
-            'y': 783
-          },
-          {
-            'x': 1413557400000,
-            'y': 784
-          },
-          {
-            'x': 1413558000000,
-            'y': 687
-          },
-          {
-            'x': 1413558600000,
-            'y': 660
-          },
-          {
-            'x': 1413559200000,
-            'y': 672
-          },
-          {
-            'x': 1413559800000,
-            'y': 600
-          },
-          {
-            'x': 1413560400000,
-            'y': 659
-          },
-          {
-            'x': 1413561000000,
-            'y': 540
-          },
-          {
-            'x': 1413561600000,
-            'y': 539
-          },
-          {
-            'x': 1413562200000,
-            'y': 481
-          },
-          {
-            'x': 1413562800000,
-            'y': 498
-          },
-          {
-            'x': 1413563400000,
-            'y': 444
-          },
-          {
-            'x': 1413564000000,
-            'y': 452
-          },
-          {
-            'x': 1413564600000,
-            'y': 408
-          },
-          {
-            'x': 1413565200000,
-            'y': 358
-          },
-          {
-            'x': 1413565800000,
-            'y': 321
-          },
-          {
-            'x': 1413566400000,
-            'y': 305
-          },
-          {
-            'x': 1413567000000,
-            'y': 292
-          },
-          {
-            'x': 1413567600000,
-            'y': 289
-          },
-          {
-            'x': 1413568200000,
-            'y': 239
-          },
-          {
-            'x': 1413568800000,
-            'y': 256
-          },
-          {
-            'x': 1413569400000,
-            'y': 220
-          },
-          {
-            'x': 1413570000000,
-            'y': 205
-          },
-          {
-            'x': 1413570600000,
-            'y': 201
-          },
-          {
-            'x': 1413571200000,
-            'y': 183
-          },
-          {
-            'x': 1413571800000,
-            'y': 172
-          },
-          {
-            'x': 1413572400000,
-            'y': 73
-          },
-          {
-            'x': 1413573600000,
-            'y': 90
-          },
-          {
-            'x': 1413574200000,
-            'y': 130
-          },
-          {
-            'x': 1413574800000,
-            'y': 104
-          },
-          {
-            'x': 1413575400000,
-            'y': 108
-          },
-          {
-            'x': 1413576000000,
-            'y': 92
-          },
-          {
-            'x': 1413576600000,
-            'y': 79
-          },
-          {
-            'x': 1413577200000,
-            'y': 90
-          },
-          {
-            'x': 1413577800000,
-            'y': 72
-          },
-          {
-            'x': 1413578400000,
-            'y': 68
-          },
-          {
-            'x': 1413579000000,
-            'y': 52
-          },
-          {
-            'x': 1413579600000,
-            'y': 60
-          },
-          {
-            'x': 1413580200000,
-            'y': 51
-          },
-          {
-            'x': 1413580800000,
-            'y': 32
-          },
-          {
-            'x': 1413581400000,
-            'y': 37
-          },
-          {
-            'x': 1413582000000,
-            'y': 30
-          },
-          {
-            'x': 1413582600000,
-            'y': 29
-          },
-          {
-            'x': 1413583200000,
-            'y': 24
-          },
-          {
-            'x': 1413583800000,
-            'y': 16
-          },
-          {
-            'x': 1413584400000,
-            'y': 15
-          },
-          {
-            'x': 1413585000000,
-            'y': 15
-          },
-          {
-            'x': 1413585600000,
-            'y': 10
-          },
-          {
-            'x': 1413586200000,
-            'y': 9
-          },
-          {
-            'x': 1413586800000,
-            'y': 9
-          }
-        ]
-      },
-      {
-        'label': 'png',
-        'values': [
-          {
-            'x': 1413543600000,
-            'y': 44
-          },
-          {
-            'x': 1413544200000,
-            'y': 495
-          },
-          {
-            'x': 1413544800000,
-            'y': 489
-          },
-          {
-            'x': 1413545400000,
-            'y': 492
-          },
-          {
-            'x': 1413546000000,
-            'y': 556
-          },
-          {
-            'x': 1413546600000,
-            'y': 536
-          },
-          {
-            'x': 1413547200000,
-            'y': 511
-          },
-          {
-            'x': 1413547800000,
-            'y': 479
-          },
-          {
-            'x': 1413548400000,
-            'y': 544
-          },
-          {
-            'x': 1413549000000,
-            'y': 513
-          },
-          {
-            'x': 1413549600000,
-            'y': 501
-          },
-          {
-            'x': 1413550200000,
-            'y': 532
-          },
-          {
-            'x': 1413550800000,
-            'y': 440
-          },
-          {
-            'x': 1413551400000,
-            'y': 455
-          },
-          {
-            'x': 1413552000000,
-            'y': 455
-          },
-          {
-            'x': 1413552600000,
-            'y': 471
-          },
-          {
-            'x': 1413553200000,
-            'y': 428
-          },
-          {
-            'x': 1413553800000,
-            'y': 457
-          },
-          {
-            'x': 1413554400000,
-            'y': 450
-          },
-          {
-            'x': 1413555000000,
-            'y': 418
-          },
-          {
-            'x': 1413555600000,
-            'y': 398
-          },
-          {
-            'x': 1413556200000,
-            'y': 397
-          },
-          {
-            'x': 1413556800000,
-            'y': 359
-          },
-          {
-            'x': 1413557400000,
-            'y': 398
-          },
-          {
-            'x': 1413558000000,
-            'y': 339
-          },
-          {
-            'x': 1413558600000,
-            'y': 363
-          },
-          {
-            'x': 1413559200000,
-            'y': 297
-          },
-          {
-            'x': 1413559800000,
-            'y': 323
-          },
-          {
-            'x': 1413560400000,
-            'y': 302
-          },
-          {
-            'x': 1413561000000,
-            'y': 260
-          },
-          {
-            'x': 1413561600000,
-            'y': 276
-          },
-          {
-            'x': 1413562200000,
-            'y': 249
-          },
-          {
-            'x': 1413562800000,
-            'y': 248
-          },
-          {
-            'x': 1413563400000,
-            'y': 235
-          },
-          {
-            'x': 1413564000000,
-            'y': 234
-          },
-          {
-            'x': 1413564600000,
-            'y': 188
-          },
-          {
-            'x': 1413565200000,
-            'y': 192
-          },
-          {
-            'x': 1413565800000,
-            'y': 173
-          },
-          {
-            'x': 1413566400000,
-            'y': 160
-          },
-          {
-            'x': 1413567000000,
-            'y': 137
-          },
-          {
-            'x': 1413567600000,
-            'y': 158
-          },
-          {
-            'x': 1413568200000,
-            'y': 111
-          },
-          {
-            'x': 1413568800000,
-            'y': 145
-          },
-          {
-            'x': 1413569400000,
-            'y': 118
-          },
-          {
-            'x': 1413570000000,
-            'y': 104
-          },
-          {
-            'x': 1413570600000,
-            'y': 80
-          },
-          {
-            'x': 1413571200000,
-            'y': 79
-          },
-          {
-            'x': 1413571800000,
-            'y': 86
-          },
-          {
-            'x': 1413572400000,
-            'y': 47
-          },
-          {
-            'x': 1413573600000,
-            'y': 49
-          },
-          {
-            'x': 1413574200000,
-            'y': 68
-          },
-          {
-            'x': 1413574800000,
-            'y': 78
-          },
-          {
-            'x': 1413575400000,
-            'y': 77
-          },
-          {
-            'x': 1413576000000,
-            'y': 50
-          },
-          {
-            'x': 1413576600000,
-            'y': 51
-          },
-          {
-            'x': 1413577200000,
-            'y': 40
-          },
-          {
-            'x': 1413577800000,
-            'y': 42
-          },
-          {
-            'x': 1413578400000,
-            'y': 29
-          },
-          {
-            'x': 1413579000000,
-            'y': 24
-          },
-          {
-            'x': 1413579600000,
-            'y': 30
-          },
-          {
-            'x': 1413580200000,
-            'y': 18
-          },
-          {
-            'x': 1413580800000,
-            'y': 15
-          },
-          {
-            'x': 1413581400000,
-            'y': 19
-          },
-          {
-            'x': 1413582000000,
-            'y': 18
-          },
-          {
-            'x': 1413582600000,
-            'y': 13
-          },
-          {
-            'x': 1413583200000,
-            'y': 11
-          },
-          {
-            'x': 1413583800000,
-            'y': 11
-          },
-          {
-            'x': 1413584400000,
-            'y': 13
-          },
-          {
-            'x': 1413585000000,
-            'y': 9
-          },
-          {
-            'x': 1413585600000,
-            'y': 9
-          },
-          {
-            'x': 1413586200000,
-            'y': 9
-          },
-          {
-            'x': 1413586800000,
-            'y': 3
-          }
-        ]
-      },
-      {
-        'label': 'css',
-        'values': [
-          {
-            'x': 1413543600000,
-            'y': 35
-          },
-          {
-            'x': 1413544200000,
-            'y': 360
-          },
-          {
-            'x': 1413544800000,
-            'y': 343
-          },
-          {
-            'x': 1413545400000,
-            'y': 329
-          },
-          {
-            'x': 1413546000000,
-            'y': 345
-          },
-          {
-            'x': 1413546600000,
-            'y': 336
-          },
-          {
-            'x': 1413547200000,
-            'y': 330
-          },
-          {
-            'x': 1413547800000,
-            'y': 334
-          },
-          {
-            'x': 1413548400000,
-            'y': 326
-          },
-          {
-            'x': 1413549000000,
-            'y': 351
-          },
-          {
-            'x': 1413549600000,
-            'y': 334
-          },
-          {
-            'x': 1413550200000,
-            'y': 351
-          },
-          {
-            'x': 1413550800000,
-            'y': 337
-          },
-          {
-            'x': 1413551400000,
-            'y': 306
-          },
-          {
-            'x': 1413552000000,
-            'y': 346
-          },
-          {
-            'x': 1413552600000,
-            'y': 317
-          },
-          {
-            'x': 1413553200000,
-            'y': 298
-          },
-          {
-            'x': 1413553800000,
-            'y': 288
-          },
-          {
-            'x': 1413554400000,
-            'y': 283
-          },
-          {
-            'x': 1413555000000,
-            'y': 262
-          },
-          {
-            'x': 1413555600000,
-            'y': 245
-          },
-          {
-            'x': 1413556200000,
-            'y': 259
-          },
-          {
-            'x': 1413556800000,
-            'y': 267
-          },
-          {
-            'x': 1413557400000,
-            'y': 230
-          },
-          {
-            'x': 1413558000000,
-            'y': 218
-          },
-          {
-            'x': 1413558600000,
-            'y': 241
-          },
-          {
-            'x': 1413559200000,
-            'y': 213
-          },
-          {
-            'x': 1413559800000,
-            'y': 239
-          },
-          {
-            'x': 1413560400000,
-            'y': 208
-          },
-          {
-            'x': 1413561000000,
-            'y': 187
-          },
-          {
-            'x': 1413561600000,
-            'y': 166
-          },
-          {
-            'x': 1413562200000,
-            'y': 154
-          },
-          {
-            'x': 1413562800000,
-            'y': 184
-          },
-          {
-            'x': 1413563400000,
-            'y': 148
-          },
-          {
-            'x': 1413564000000,
-            'y': 153
-          },
-          {
-            'x': 1413564600000,
-            'y': 149
-          },
-          {
-            'x': 1413565200000,
-            'y': 102
-          },
-          {
-            'x': 1413565800000,
-            'y': 110
-          },
-          {
-            'x': 1413566400000,
-            'y': 121
-          },
-          {
-            'x': 1413567000000,
-            'y': 120
-          },
-          {
-            'x': 1413567600000,
-            'y': 86
-          },
-          {
-            'x': 1413568200000,
-            'y': 96
-          },
-          {
-            'x': 1413568800000,
-            'y': 71
-          },
-          {
-            'x': 1413569400000,
-            'y': 92
-          },
-          {
-            'x': 1413570000000,
-            'y': 65
-          },
-          {
-            'x': 1413570600000,
-            'y': 54
-          },
-          {
-            'x': 1413571200000,
-            'y': 68
-          },
-          {
-            'x': 1413571800000,
-            'y': 57
-          },
-          {
-            'x': 1413572400000,
-            'y': 33
-          },
-          {
-            'x': 1413573600000,
-            'y': 47
-          },
-          {
-            'x': 1413574200000,
-            'y': 42
-          },
-          {
-            'x': 1413574800000,
-            'y': 39
-          },
-          {
-            'x': 1413575400000,
-            'y': 25
-          },
-          {
-            'x': 1413576000000,
-            'y': 31
-          },
-          {
-            'x': 1413576600000,
-            'y': 37
-          },
-          {
-            'x': 1413577200000,
-            'y': 35
-          },
-          {
-            'x': 1413577800000,
-            'y': 19
-          },
-          {
-            'x': 1413578400000,
-            'y': 15
-          },
-          {
-            'x': 1413579000000,
-            'y': 21
-          },
-          {
-            'x': 1413579600000,
-            'y': 16
-          },
-          {
-            'x': 1413580200000,
-            'y': 18
-          },
-          {
-            'x': 1413580800000,
-            'y': 10
-          },
-          {
-            'x': 1413581400000,
-            'y': 13
-          },
-          {
-            'x': 1413582000000,
-            'y': 14
-          },
-          {
-            'x': 1413582600000,
-            'y': 11
-          },
-          {
-            'x': 1413583200000,
-            'y': 4
-          },
-          {
-            'x': 1413583800000,
-            'y': 6
-          },
-          {
-            'x': 1413584400000,
-            'y': 3
-          },
-          {
-            'x': 1413585000000,
-            'y': 6
-          },
-          {
-            'x': 1413585600000,
-            'y': 6
-          },
-          {
-            'x': 1413586200000,
-            'y': 2
-          },
-          {
-            'x': 1413586800000,
-            'y': 3
-          }
-        ]
-      },
-      {
-        'label': 'gif',
-        'values': [
-          {
-            'x': 1413543600000,
-            'y': 21
-          },
-          {
-            'x': 1413544200000,
-            'y': 191
-          },
-          {
-            'x': 1413544800000,
-            'y': 176
-          },
-          {
-            'x': 1413545400000,
-            'y': 166
-          },
-          {
-            'x': 1413546000000,
-            'y': 183
-          },
-          {
-            'x': 1413546600000,
-            'y': 170
-          },
-          {
-            'x': 1413547200000,
-            'y': 153
-          },
-          {
-            'x': 1413547800000,
-            'y': 202
-          },
-          {
-            'x': 1413548400000,
-            'y': 175
-          },
-          {
-            'x': 1413549000000,
-            'y': 161
-          },
-          {
-            'x': 1413549600000,
-            'y': 174
-          },
-          {
-            'x': 1413550200000,
-            'y': 167
-          },
-          {
-            'x': 1413550800000,
-            'y': 171
-          },
-          {
-            'x': 1413551400000,
-            'y': 176
-          },
-          {
-            'x': 1413552000000,
-            'y': 139
-          },
-          {
-            'x': 1413552600000,
-            'y': 145
-          },
-          {
-            'x': 1413553200000,
-            'y': 157
-          },
-          {
-            'x': 1413553800000,
-            'y': 148
-          },
-          {
-            'x': 1413554400000,
-            'y': 149
-          },
-          {
-            'x': 1413555000000,
-            'y': 135
-          },
-          {
-            'x': 1413555600000,
-            'y': 118
-          },
-          {
-            'x': 1413556200000,
-            'y': 142
-          },
-          {
-            'x': 1413556800000,
-            'y': 141
-          },
-          {
-            'x': 1413557400000,
-            'y': 146
-          },
-          {
-            'x': 1413558000000,
-            'y': 114
-          },
-          {
-            'x': 1413558600000,
-            'y': 115
-          },
-          {
-            'x': 1413559200000,
-            'y': 136
-          },
-          {
-            'x': 1413559800000,
-            'y': 106
-          },
-          {
-            'x': 1413560400000,
-            'y': 92
-          },
-          {
-            'x': 1413561000000,
-            'y': 97
-          },
-          {
-            'x': 1413561600000,
-            'y': 90
-          },
-          {
-            'x': 1413562200000,
-            'y': 69
-          },
-          {
-            'x': 1413562800000,
-            'y': 66
-          },
-          {
-            'x': 1413563400000,
-            'y': 93
-          },
-          {
-            'x': 1413564000000,
-            'y': 75
-          },
-          {
-            'x': 1413564600000,
-            'y': 68
-          },
-          {
-            'x': 1413565200000,
-            'y': 55
-          },
-          {
-            'x': 1413565800000,
-            'y': 73
-          },
-          {
-            'x': 1413566400000,
-            'y': 57
-          },
-          {
-            'x': 1413567000000,
-            'y': 48
-          },
-          {
-            'x': 1413567600000,
-            'y': 41
-          },
-          {
-            'x': 1413568200000,
-            'y': 39
-          },
-          {
-            'x': 1413568800000,
-            'y': 32
-          },
-          {
-            'x': 1413569400000,
-            'y': 33
-          },
-          {
-            'x': 1413570000000,
-            'y': 39
-          },
-          {
-            'x': 1413570600000,
-            'y': 35
-          },
-          {
-            'x': 1413571200000,
-            'y': 25
-          },
-          {
-            'x': 1413571800000,
-            'y': 28
-          },
-          {
-            'x': 1413572400000,
-            'y': 8
-          },
-          {
-            'x': 1413573600000,
-            'y': 13
-          },
-          {
-            'x': 1413574200000,
-            'y': 23
-          },
-          {
-            'x': 1413574800000,
-            'y': 19
-          },
-          {
-            'x': 1413575400000,
-            'y': 16
-          },
-          {
-            'x': 1413576000000,
-            'y': 22
-          },
-          {
-            'x': 1413576600000,
-            'y': 13
-          },
-          {
-            'x': 1413577200000,
-            'y': 21
-          },
-          {
-            'x': 1413577800000,
-            'y': 11
-          },
-          {
-            'x': 1413578400000,
-            'y': 12
-          },
-          {
-            'x': 1413579000000,
-            'y': 10
-          },
-          {
-            'x': 1413579600000,
-            'y': 7
-          },
-          {
-            'x': 1413580200000,
-            'y': 4
-          },
-          {
-            'x': 1413580800000,
-            'y': 5
-          },
-          {
-            'x': 1413581400000,
-            'y': 7
-          },
-          {
-            'x': 1413582000000,
-            'y': 9
-          },
-          {
-            'x': 1413582600000,
-            'y': 2
-          },
-          {
-            'x': 1413583200000,
-            'y': 2
-          },
-          {
-            'x': 1413583800000,
-            'y': 4
-          },
-          {
-            'x': 1413584400000,
-            'y': 6
-          },
-          {
-            'x': 1413585600000,
-            'y': 2
-          },
-          {
-            'x': 1413586200000,
-            'y': 4
-          },
-          {
-            'x': 1413586800000,
-            'y': 4
-          }
-        ]
-      }
-    ],
-    'hits': 108970,
-    'xAxisFormatter': function (thing) {
-      return moment(thing);
-    },
-    'tooltipFormatter': function (d) {
-      return d;
-    }
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/filters/_columns.js b/test/unit/specs/vislib/fixture/mock_data/filters/_columns.js
deleted file mode 100644
index 9960dc06a3be7..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/filters/_columns.js
+++ /dev/null
@@ -1,108 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return {
-    'columns': [
-      {
-        'label': 'Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 Firefox/6.0a1: agent.raw',
-        'xAxisLabel': 'filters',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'css',
-                'y': 10379
-              },
-              {
-                'x': 'png',
-                'y': 6395
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      },
-      {
-        'label': 'Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.50 Safari/534.24: agent.raw',
-        'xAxisLabel': 'filters',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'css',
-                'y': 9253
-              },
-              {
-                'x': 'png',
-                'y': 5571
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      },
-      {
-        'label': 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322): agent.raw',
-        'xAxisLabel': 'filters',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'css',
-                'y': 7740
-              },
-              {
-                'x': 'png',
-                'y': 4697
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      }
-    ],
-    'hits': 171443
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/filters/_rows.js b/test/unit/specs/vislib/fixture/mock_data/filters/_rows.js
deleted file mode 100644
index 9103ae9fb7f04..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/filters/_rows.js
+++ /dev/null
@@ -1,108 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return {
-    'rows': [
-      {
-        'label': '200: response',
-        'xAxisLabel': 'filters',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'css',
-                'y': 25260
-              },
-              {
-                'x': 'png',
-                'y': 15311
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      },
-      {
-        'label': '404: response',
-        'xAxisLabel': 'filters',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'css',
-                'y': 1352
-              },
-              {
-                'x': 'png',
-                'y': 826
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      },
-      {
-        'label': '503: response',
-        'xAxisLabel': 'filters',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'css',
-                'y': 761
-              },
-              {
-                'x': 'png',
-                'y': 527
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      }
-    ],
-    'hits': 171443
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/filters/_series.js b/test/unit/specs/vislib/fixture/mock_data/filters/_series.js
deleted file mode 100644
index e5bab79febc74..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/filters/_series.js
+++ /dev/null
@@ -1,42 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return {
-    'label': '',
-    'xAxisLabel': 'filters',
-    'yAxisLabel': 'Count of documents',
-    'series': [
-      {
-        'values': [
-          {
-            'x': 'css',
-            'y': 27374
-          },
-          {
-            'x': 'html',
-            'y': 0
-          },
-          {
-            'x': 'png',
-            'y': 16663
-          }
-        ]
-      }
-    ],
-    'hits': 171454,
-    'xAxisFormatter': function (val) {
-      if (_.isObject(val)) {
-        return JSON.stringify(val);
-      }
-      else if (val == null) {
-        return '';
-      }
-      else {
-        return '' + val;
-      }
-    },
-    'tooltipFormatter': function (d) {
-      return d;
-    }
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/geohash/_columns.js b/test/unit/specs/vislib/fixture/mock_data/geohash/_columns.js
deleted file mode 100644
index 2dde4713b01a4..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/geohash/_columns.js
+++ /dev/null
@@ -1,3746 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  return {
-    'columns': [
-        {
-          'title': 'Top 2 geo.dest: CN',
-          'valueFormatter': _.identity,
-          'geoJson': {
-            'type': 'FeatureCollection',
-            'features': [
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    22.5,
-                    22.5
-                  ]
-                },
-                'properties': {
-                  'value': 42,
-                  'geohash': 's',
-                  'center': [
-                    22.5,
-                    22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 's',
-                      'value': 's',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 42,
-                    'value': 42,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      45,
-                      0
-                    ],
-                    [
-                      45,
-                      45
-                    ],
-                    [
-                      0,
-                      45
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -67.5,
-                    22.5
-                  ]
-                },
-                'properties': {
-                  'value': 31,
-                  'geohash': 'd',
-                  'center': [
-                    -67.5,
-                    22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'd',
-                      'value': 'd',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 31,
-                    'value': 31,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -90,
-                      0
-                    ],
-                    [
-                      -45,
-                      0
-                    ],
-                    [
-                      -45,
-                      45
-                    ],
-                    [
-                      -90,
-                      45
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    112.5,
-                    22.5
-                  ]
-                },
-                'properties': {
-                  'value': 30,
-                  'geohash': 'w',
-                  'center': [
-                    112.5,
-                    22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'w',
-                      'value': 'w',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 30,
-                    'value': 30,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      90,
-                      0
-                    ],
-                    [
-                      135,
-                      0
-                    ],
-                    [
-                      135,
-                      45
-                    ],
-                    [
-                      90,
-                      45
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -112.5,
-                    22.5
-                  ]
-                },
-                'properties': {
-                  'value': 25,
-                  'geohash': '9',
-                  'center': [
-                    -112.5,
-                    22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': '9',
-                      'value': '9',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 25,
-                    'value': 25,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -135,
-                      0
-                    ],
-                    [
-                      -90,
-                      0
-                    ],
-                    [
-                      -90,
-                      45
-                    ],
-                    [
-                      -135,
-                      45
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    67.5,
-                    22.5
-                  ]
-                },
-                'properties': {
-                  'value': 22,
-                  'geohash': 't',
-                  'center': [
-                    67.5,
-                    22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 't',
-                      'value': 't',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 22,
-                    'value': 22,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      45,
-                      0
-                    ],
-                    [
-                      90,
-                      0
-                    ],
-                    [
-                      90,
-                      45
-                    ],
-                    [
-                      45,
-                      45
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    22.5,
-                    -22.5
-                  ]
-                },
-                'properties': {
-                  'value': 22,
-                  'geohash': 'k',
-                  'center': [
-                    22.5,
-                    -22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'k',
-                      'value': 'k',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 22,
-                    'value': 22,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      0,
-                      -45
-                    ],
-                    [
-                      45,
-                      -45
-                    ],
-                    [
-                      45,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -67.5,
-                    -22.5
-                  ]
-                },
-                'properties': {
-                  'value': 21,
-                  'geohash': '6',
-                  'center': [
-                    -67.5,
-                    -22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': '6',
-                      'value': '6',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 21,
-                    'value': 21,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -90,
-                      -45
-                    ],
-                    [
-                      -45,
-                      -45
-                    ],
-                    [
-                      -45,
-                      0
-                    ],
-                    [
-                      -90,
-                      0
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    22.5,
-                    67.5
-                  ]
-                },
-                'properties': {
-                  'value': 19,
-                  'geohash': 'u',
-                  'center': [
-                    22.5,
-                    67.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'u',
-                      'value': 'u',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 19,
-                    'value': 19,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      0,
-                      45
-                    ],
-                    [
-                      45,
-                      45
-                    ],
-                    [
-                      45,
-                      90
-                    ],
-                    [
-                      0,
-                      90
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    67.5,
-                    67.5
-                  ]
-                },
-                'properties': {
-                  'value': 18,
-                  'geohash': 'v',
-                  'center': [
-                    67.5,
-                    67.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'v',
-                      'value': 'v',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 18,
-                    'value': 18,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      45,
-                      45
-                    ],
-                    [
-                      90,
-                      45
-                    ],
-                    [
-                      90,
-                      90
-                    ],
-                    [
-                      45,
-                      90
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -112.5,
-                    67.5
-                  ]
-                },
-                'properties': {
-                  'value': 11,
-                  'geohash': 'c',
-                  'center': [
-                    -112.5,
-                    67.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'c',
-                      'value': 'c',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 11,
-                    'value': 11,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -135,
-                      45
-                    ],
-                    [
-                      -90,
-                      45
-                    ],
-                    [
-                      -90,
-                      90
-                    ],
-                    [
-                      -135,
-                      90
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    157.5,
-                    -22.5
-                  ]
-                },
-                'properties': {
-                  'value': 10,
-                  'geohash': 'r',
-                  'center': [
-                    157.5,
-                    -22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'r',
-                      'value': 'r',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 10,
-                    'value': 10,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      135,
-                      -45
-                    ],
-                    [
-                      180,
-                      -45
-                    ],
-                    [
-                      180,
-                      0
-                    ],
-                    [
-                      135,
-                      0
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    112.5,
-                    67.5
-                  ]
-                },
-                'properties': {
-                  'value': 9,
-                  'geohash': 'y',
-                  'center': [
-                    112.5,
-                    67.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'y',
-                      'value': 'y',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 9,
-                    'value': 9,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      90,
-                      45
-                    ],
-                    [
-                      135,
-                      45
-                    ],
-                    [
-                      135,
-                      90
-                    ],
-                    [
-                      90,
-                      90
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -22.5,
-                    22.5
-                  ]
-                },
-                'properties': {
-                  'value': 9,
-                  'geohash': 'e',
-                  'center': [
-                    -22.5,
-                    22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'e',
-                      'value': 'e',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 9,
-                    'value': 9,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -45,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      45
-                    ],
-                    [
-                      -45,
-                      45
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -67.5,
-                    67.5
-                  ]
-                },
-                'properties': {
-                  'value': 8,
-                  'geohash': 'f',
-                  'center': [
-                    -67.5,
-                    67.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'f',
-                      'value': 'f',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 8,
-                    'value': 8,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -90,
-                      45
-                    ],
-                    [
-                      -45,
-                      45
-                    ],
-                    [
-                      -45,
-                      90
-                    ],
-                    [
-                      -90,
-                      90
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -22.5,
-                    -22.5
-                  ]
-                },
-                'properties': {
-                  'value': 8,
-                  'geohash': '7',
-                  'center': [
-                    -22.5,
-                    -22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': '7',
-                      'value': '7',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 8,
-                    'value': 8,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -45,
-                      -45
-                    ],
-                    [
-                      0,
-                      -45
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      -45,
-                      0
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    112.5,
-                    -22.5
-                  ]
-                },
-                'properties': {
-                  'value': 6,
-                  'geohash': 'q',
-                  'center': [
-                    112.5,
-                    -22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'q',
-                      'value': 'q',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 6,
-                    'value': 6,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      90,
-                      -45
-                    ],
-                    [
-                      135,
-                      -45
-                    ],
-                    [
-                      135,
-                      0
-                    ],
-                    [
-                      90,
-                      0
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -22.5,
-                    67.5
-                  ]
-                },
-                'properties': {
-                  'value': 6,
-                  'geohash': 'g',
-                  'center': [
-                    -22.5,
-                    67.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'g',
-                      'value': 'g',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 6,
-                    'value': 6,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -45,
-                      45
-                    ],
-                    [
-                      0,
-                      45
-                    ],
-                    [
-                      0,
-                      90
-                    ],
-                    [
-                      -45,
-                      90
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    157.5,
-                    22.5
-                  ]
-                },
-                'properties': {
-                  'value': 4,
-                  'geohash': 'x',
-                  'center': [
-                    157.5,
-                    22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'x',
-                      'value': 'x',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 4,
-                    'value': 4,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      135,
-                      0
-                    ],
-                    [
-                      180,
-                      0
-                    ],
-                    [
-                      180,
-                      45
-                    ],
-                    [
-                      135,
-                      45
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -157.5,
-                    67.5
-                  ]
-                },
-                'properties': {
-                  'value': 3,
-                  'geohash': 'b',
-                  'center': [
-                    -157.5,
-                    67.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'b',
-                      'value': 'b',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 3,
-                    'value': 3,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -180,
-                      45
-                    ],
-                    [
-                      -135,
-                      45
-                    ],
-                    [
-                      -135,
-                      90
-                    ],
-                    [
-                      -180,
-                      90
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    157.5,
-                    67.5
-                  ]
-                },
-                'properties': {
-                  'value': 2,
-                  'geohash': 'z',
-                  'center': [
-                    157.5,
-                    67.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'z',
-                      'value': 'z',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 2,
-                    'value': 2,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      135,
-                      45
-                    ],
-                    [
-                      180,
-                      45
-                    ],
-                    [
-                      180,
-                      90
-                    ],
-                    [
-                      135,
-                      90
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    67.5,
-                    -22.5
-                  ]
-                },
-                'properties': {
-                  'value': 1,
-                  'geohash': 'm',
-                  'center': [
-                    67.5,
-                    -22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'm',
-                      'value': 'm',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 1,
-                    'value': 1,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      45,
-                      -45
-                    ],
-                    [
-                      90,
-                      -45
-                    ],
-                    [
-                      90,
-                      0
-                    ],
-                    [
-                      45,
-                      0
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -22.5,
-                    -67.5
-                  ]
-                },
-                'properties': {
-                  'value': 1,
-                  'geohash': '5',
-                  'center': [
-                    -22.5,
-                    -67.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': '5',
-                      'value': '5',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 1,
-                    'value': 1,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -45,
-                      -90
-                    ],
-                    [
-                      0,
-                      -90
-                    ],
-                    [
-                      0,
-                      -45
-                    ],
-                    [
-                      -45,
-                      -45
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -67.5,
-                    -67.5
-                  ]
-                },
-                'properties': {
-                  'value': 1,
-                  'geohash': '4',
-                  'center': [
-                    -67.5,
-                    -67.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': '4',
-                      'value': '4',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 1,
-                    'value': 1,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -90,
-                      -90
-                    ],
-                    [
-                      -45,
-                      -90
-                    ],
-                    [
-                      -45,
-                      -45
-                    ],
-                    [
-                      -90,
-                      -45
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -112.5,
-                    -22.5
-                  ]
-                },
-                'properties': {
-                  'value': 1,
-                  'geohash': '3',
-                  'center': [
-                    -112.5,
-                    -22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'CN',
-                        'value': 'CN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': '3',
-                      'value': '3',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 1,
-                    'value': 1,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -135,
-                      -45
-                    ],
-                    [
-                      -90,
-                      -45
-                    ],
-                    [
-                      -90,
-                      0
-                    ],
-                    [
-                      -135,
-                      0
-                    ]
-                  ]
-                }
-              }
-            ],
-            'properties': {
-              'min': 1,
-              'max': 42
-            }
-          }
-        },
-        {
-          'label': 'Top 2 geo.dest: IN',
-          'valueFormatter': _.identity,
-          'geoJson': {
-            'type': 'FeatureCollection',
-            'features': [
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    22.5,
-                    22.5
-                  ]
-                },
-                'properties': {
-                  'value': 32,
-                  'geohash': 's',
-                  'center': [
-                    22.5,
-                    22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 's',
-                      'value': 's',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 32,
-                    'value': 32,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      45,
-                      0
-                    ],
-                    [
-                      45,
-                      45
-                    ],
-                    [
-                      0,
-                      45
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -67.5,
-                    -22.5
-                  ]
-                },
-                'properties': {
-                  'value': 31,
-                  'geohash': '6',
-                  'center': [
-                    -67.5,
-                    -22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': '6',
-                      'value': '6',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 31,
-                    'value': 31,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -90,
-                      -45
-                    ],
-                    [
-                      -45,
-                      -45
-                    ],
-                    [
-                      -45,
-                      0
-                    ],
-                    [
-                      -90,
-                      0
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -67.5,
-                    22.5
-                  ]
-                },
-                'properties': {
-                  'value': 28,
-                  'geohash': 'd',
-                  'center': [
-                    -67.5,
-                    22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'd',
-                      'value': 'd',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 28,
-                    'value': 28,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -90,
-                      0
-                    ],
-                    [
-                      -45,
-                      0
-                    ],
-                    [
-                      -45,
-                      45
-                    ],
-                    [
-                      -90,
-                      45
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    112.5,
-                    22.5
-                  ]
-                },
-                'properties': {
-                  'value': 27,
-                  'geohash': 'w',
-                  'center': [
-                    112.5,
-                    22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'w',
-                      'value': 'w',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 27,
-                    'value': 27,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      90,
-                      0
-                    ],
-                    [
-                      135,
-                      0
-                    ],
-                    [
-                      135,
-                      45
-                    ],
-                    [
-                      90,
-                      45
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    67.5,
-                    22.5
-                  ]
-                },
-                'properties': {
-                  'value': 24,
-                  'geohash': 't',
-                  'center': [
-                    67.5,
-                    22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 't',
-                      'value': 't',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 24,
-                    'value': 24,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      45,
-                      0
-                    ],
-                    [
-                      90,
-                      0
-                    ],
-                    [
-                      90,
-                      45
-                    ],
-                    [
-                      45,
-                      45
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    22.5,
-                    -22.5
-                  ]
-                },
-                'properties': {
-                  'value': 23,
-                  'geohash': 'k',
-                  'center': [
-                    22.5,
-                    -22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'k',
-                      'value': 'k',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 23,
-                    'value': 23,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      0,
-                      -45
-                    ],
-                    [
-                      45,
-                      -45
-                    ],
-                    [
-                      45,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    22.5,
-                    67.5
-                  ]
-                },
-                'properties': {
-                  'value': 17,
-                  'geohash': 'u',
-                  'center': [
-                    22.5,
-                    67.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'u',
-                      'value': 'u',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 17,
-                    'value': 17,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      0,
-                      45
-                    ],
-                    [
-                      45,
-                      45
-                    ],
-                    [
-                      45,
-                      90
-                    ],
-                    [
-                      0,
-                      90
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -112.5,
-                    22.5
-                  ]
-                },
-                'properties': {
-                  'value': 16,
-                  'geohash': '9',
-                  'center': [
-                    -112.5,
-                    22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': '9',
-                      'value': '9',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 16,
-                    'value': 16,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -135,
-                      0
-                    ],
-                    [
-                      -90,
-                      0
-                    ],
-                    [
-                      -90,
-                      45
-                    ],
-                    [
-                      -135,
-                      45
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    67.5,
-                    67.5
-                  ]
-                },
-                'properties': {
-                  'value': 14,
-                  'geohash': 'v',
-                  'center': [
-                    67.5,
-                    67.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'v',
-                      'value': 'v',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 14,
-                    'value': 14,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      45,
-                      45
-                    ],
-                    [
-                      90,
-                      45
-                    ],
-                    [
-                      90,
-                      90
-                    ],
-                    [
-                      45,
-                      90
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -22.5,
-                    22.5
-                  ]
-                },
-                'properties': {
-                  'value': 13,
-                  'geohash': 'e',
-                  'center': [
-                    -22.5,
-                    22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'e',
-                      'value': 'e',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 13,
-                    'value': 13,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -45,
-                      0
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      0,
-                      45
-                    ],
-                    [
-                      -45,
-                      45
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    157.5,
-                    -22.5
-                  ]
-                },
-                'properties': {
-                  'value': 9,
-                  'geohash': 'r',
-                  'center': [
-                    157.5,
-                    -22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'r',
-                      'value': 'r',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 9,
-                    'value': 9,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      135,
-                      -45
-                    ],
-                    [
-                      180,
-                      -45
-                    ],
-                    [
-                      180,
-                      0
-                    ],
-                    [
-                      135,
-                      0
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    112.5,
-                    67.5
-                  ]
-                },
-                'properties': {
-                  'value': 6,
-                  'geohash': 'y',
-                  'center': [
-                    112.5,
-                    67.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'y',
-                      'value': 'y',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 6,
-                    'value': 6,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      90,
-                      45
-                    ],
-                    [
-                      135,
-                      45
-                    ],
-                    [
-                      135,
-                      90
-                    ],
-                    [
-                      90,
-                      90
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -22.5,
-                    67.5
-                  ]
-                },
-                'properties': {
-                  'value': 6,
-                  'geohash': 'g',
-                  'center': [
-                    -22.5,
-                    67.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'g',
-                      'value': 'g',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 6,
-                    'value': 6,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -45,
-                      45
-                    ],
-                    [
-                      0,
-                      45
-                    ],
-                    [
-                      0,
-                      90
-                    ],
-                    [
-                      -45,
-                      90
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -67.5,
-                    67.5
-                  ]
-                },
-                'properties': {
-                  'value': 6,
-                  'geohash': 'f',
-                  'center': [
-                    -67.5,
-                    67.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'f',
-                      'value': 'f',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 6,
-                    'value': 6,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -90,
-                      45
-                    ],
-                    [
-                      -45,
-                      45
-                    ],
-                    [
-                      -45,
-                      90
-                    ],
-                    [
-                      -90,
-                      90
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -112.5,
-                    67.5
-                  ]
-                },
-                'properties': {
-                  'value': 5,
-                  'geohash': 'c',
-                  'center': [
-                    -112.5,
-                    67.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'c',
-                      'value': 'c',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 5,
-                    'value': 5,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -135,
-                      45
-                    ],
-                    [
-                      -90,
-                      45
-                    ],
-                    [
-                      -90,
-                      90
-                    ],
-                    [
-                      -135,
-                      90
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -157.5,
-                    67.5
-                  ]
-                },
-                'properties': {
-                  'value': 4,
-                  'geohash': 'b',
-                  'center': [
-                    -157.5,
-                    67.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'b',
-                      'value': 'b',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 4,
-                    'value': 4,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -180,
-                      45
-                    ],
-                    [
-                      -135,
-                      45
-                    ],
-                    [
-                      -135,
-                      90
-                    ],
-                    [
-                      -180,
-                      90
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    112.5,
-                    -22.5
-                  ]
-                },
-                'properties': {
-                  'value': 3,
-                  'geohash': 'q',
-                  'center': [
-                    112.5,
-                    -22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'q',
-                      'value': 'q',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 3,
-                    'value': 3,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      90,
-                      -45
-                    ],
-                    [
-                      135,
-                      -45
-                    ],
-                    [
-                      135,
-                      0
-                    ],
-                    [
-                      90,
-                      0
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -67.5,
-                    -67.5
-                  ]
-                },
-                'properties': {
-                  'value': 2,
-                  'geohash': '4',
-                  'center': [
-                    -67.5,
-                    -67.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': '4',
-                      'value': '4',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 2,
-                    'value': 2,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -90,
-                      -90
-                    ],
-                    [
-                      -45,
-                      -90
-                    ],
-                    [
-                      -45,
-                      -45
-                    ],
-                    [
-                      -90,
-                      -45
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    157.5,
-                    67.5
-                  ]
-                },
-                'properties': {
-                  'value': 1,
-                  'geohash': 'z',
-                  'center': [
-                    157.5,
-                    67.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'z',
-                      'value': 'z',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 1,
-                    'value': 1,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      135,
-                      45
-                    ],
-                    [
-                      180,
-                      45
-                    ],
-                    [
-                      180,
-                      90
-                    ],
-                    [
-                      135,
-                      90
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    157.5,
-                    22.5
-                  ]
-                },
-                'properties': {
-                  'value': 1,
-                  'geohash': 'x',
-                  'center': [
-                    157.5,
-                    22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'x',
-                      'value': 'x',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 1,
-                    'value': 1,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      135,
-                      0
-                    ],
-                    [
-                      180,
-                      0
-                    ],
-                    [
-                      180,
-                      45
-                    ],
-                    [
-                      135,
-                      45
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    157.5,
-                    -67.5
-                  ]
-                },
-                'properties': {
-                  'value': 1,
-                  'geohash': 'p',
-                  'center': [
-                    157.5,
-                    -67.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'p',
-                      'value': 'p',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 1,
-                    'value': 1,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      135,
-                      -90
-                    ],
-                    [
-                      180,
-                      -90
-                    ],
-                    [
-                      180,
-                      -45
-                    ],
-                    [
-                      135,
-                      -45
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    67.5,
-                    -22.5
-                  ]
-                },
-                'properties': {
-                  'value': 1,
-                  'geohash': 'm',
-                  'center': [
-                    67.5,
-                    -22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': 'm',
-                      'value': 'm',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 1,
-                    'value': 1,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      45,
-                      -45
-                    ],
-                    [
-                      90,
-                      -45
-                    ],
-                    [
-                      90,
-                      0
-                    ],
-                    [
-                      45,
-                      0
-                    ]
-                  ]
-                }
-              },
-              {
-                'type': 'Feature',
-                'geometry': {
-                  'type': 'Point',
-                  'coordinates': [
-                    -22.5,
-                    -22.5
-                  ]
-                },
-                'properties': {
-                  'value': 1,
-                  'geohash': '7',
-                  'center': [
-                    -22.5,
-                    -22.5
-                  ],
-                  'aggConfigResult': {
-                    '$parent': {
-                      '$parent': {
-                        '$parent': null,
-                        'key': 'IN',
-                        'value': 'IN',
-                        'aggConfig': {
-                          'id': '3',
-                          'type': 'terms',
-                          'schema': 'split',
-                          'params': {
-                            'field': 'geo.dest',
-                            'size': 2,
-                            'order': 'desc',
-                            'orderBy': '1',
-                            'row': false
-                          }
-                        },
-                        'type': 'bucket'
-                      },
-                      'key': '7',
-                      'value': '7',
-                      'aggConfig': {
-                        'id': '2',
-                        'type': 'geohash_grid',
-                        'schema': 'segment',
-                        'params': {
-                          'field': 'geo.coordinates',
-                          'precision': 1
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 1,
-                    'value': 1,
-                    'aggConfig': {
-                      'id': '1',
-                      'type': 'count',
-                      'schema': 'metric',
-                      'params': {}
-                    },
-                    'type': 'metric'
-                  },
-                  'rectangle': [
-                    [
-                      -45,
-                      -45
-                    ],
-                    [
-                      0,
-                      -45
-                    ],
-                    [
-                      0,
-                      0
-                    ],
-                    [
-                      -45,
-                      0
-                    ]
-                  ]
-                }
-              }
-            ],
-            'properties': {
-              'min': 1,
-              'max': 32
-            }
-          }
-        }
-      ]
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/geohash/_geo_json.js b/test/unit/specs/vislib/fixture/mock_data/geohash/_geo_json.js
deleted file mode 100644
index e5e67afb21578..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/geohash/_geo_json.js
+++ /dev/null
@@ -1,1848 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return {
-    'valueFormatter': _.identity,
-    'geoJson': {
-      'type': 'FeatureCollection',
-      'features': [
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              22.5,
-              22.5
-            ]
-          },
-          'properties': {
-            'value': 608,
-            'geohash': 's',
-            'center': [
-              22.5,
-              22.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 's',
-                'value': 's',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 608,
-              'value': 608,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                0,
-                0
-              ],
-              [
-                0,
-                45
-              ],
-              [
-                45,
-                45
-              ],
-              [
-                45,
-                0
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              112.5,
-              22.5
-            ]
-          },
-          'properties': {
-            'value': 522,
-            'geohash': 'w',
-            'center': [
-              112.5,
-              22.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 'w',
-                'value': 'w',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 522,
-              'value': 522,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                0,
-                90
-              ],
-              [
-                0,
-                135
-              ],
-              [
-                45,
-                135
-              ],
-              [
-                45,
-                90
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              -67.5,
-              -22.5
-            ]
-          },
-          'properties': {
-            'value': 517,
-            'geohash': '6',
-            'center': [
-              -67.5,
-              -22.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': '6',
-                'value': '6',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 517,
-              'value': 517,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                -45,
-                -90
-              ],
-              [
-                -45,
-                -45
-              ],
-              [
-                0,
-                -45
-              ],
-              [
-                0,
-                -90
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              -67.5,
-              22.5
-            ]
-          },
-          'properties': {
-            'value': 446,
-            'geohash': 'd',
-            'center': [
-              -67.5,
-              22.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 'd',
-                'value': 'd',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 446,
-              'value': 446,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                0,
-                -90
-              ],
-              [
-                0,
-                -45
-              ],
-              [
-                45,
-                -45
-              ],
-              [
-                45,
-                -90
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              22.5,
-              67.5
-            ]
-          },
-          'properties': {
-            'value': 426,
-            'geohash': 'u',
-            'center': [
-              22.5,
-              67.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 'u',
-                'value': 'u',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 426,
-              'value': 426,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                45,
-                0
-              ],
-              [
-                45,
-                45
-              ],
-              [
-                90,
-                45
-              ],
-              [
-                90,
-                0
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              67.5,
-              22.5
-            ]
-          },
-          'properties': {
-            'value': 413,
-            'geohash': 't',
-            'center': [
-              67.5,
-              22.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 't',
-                'value': 't',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 413,
-              'value': 413,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                0,
-                45
-              ],
-              [
-                0,
-                90
-              ],
-              [
-                45,
-                90
-              ],
-              [
-                45,
-                45
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              22.5,
-              -22.5
-            ]
-          },
-          'properties': {
-            'value': 362,
-            'geohash': 'k',
-            'center': [
-              22.5,
-              -22.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 'k',
-                'value': 'k',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 362,
-              'value': 362,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                -45,
-                0
-              ],
-              [
-                -45,
-                45
-              ],
-              [
-                0,
-                45
-              ],
-              [
-                0,
-                0
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              -112.5,
-              22.5
-            ]
-          },
-          'properties': {
-            'value': 352,
-            'geohash': '9',
-            'center': [
-              -112.5,
-              22.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': '9',
-                'value': '9',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 352,
-              'value': 352,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                0,
-                -135
-              ],
-              [
-                0,
-                -90
-              ],
-              [
-                45,
-                -90
-              ],
-              [
-                45,
-                -135
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              -22.5,
-              22.5
-            ]
-          },
-          'properties': {
-            'value': 216,
-            'geohash': 'e',
-            'center': [
-              -22.5,
-              22.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 'e',
-                'value': 'e',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 216,
-              'value': 216,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                0,
-                -45
-              ],
-              [
-                0,
-                0
-              ],
-              [
-                45,
-                0
-              ],
-              [
-                45,
-                -45
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              67.5,
-              67.5
-            ]
-          },
-          'properties': {
-            'value': 183,
-            'geohash': 'v',
-            'center': [
-              67.5,
-              67.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 'v',
-                'value': 'v',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 183,
-              'value': 183,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                45,
-                45
-              ],
-              [
-                45,
-                90
-              ],
-              [
-                90,
-                90
-              ],
-              [
-                90,
-                45
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              157.5,
-              -22.5
-            ]
-          },
-          'properties': {
-            'value': 158,
-            'geohash': 'r',
-            'center': [
-              157.5,
-              -22.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 'r',
-                'value': 'r',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 158,
-              'value': 158,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                -45,
-                135
-              ],
-              [
-                -45,
-                180
-              ],
-              [
-                0,
-                180
-              ],
-              [
-                0,
-                135
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              112.5,
-              67.5
-            ]
-          },
-          'properties': {
-            'value': 139,
-            'geohash': 'y',
-            'center': [
-              112.5,
-              67.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 'y',
-                'value': 'y',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 139,
-              'value': 139,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                45,
-                90
-              ],
-              [
-                45,
-                135
-              ],
-              [
-                90,
-                135
-              ],
-              [
-                90,
-                90
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              -112.5,
-              67.5
-            ]
-          },
-          'properties': {
-            'value': 110,
-            'geohash': 'c',
-            'center': [
-              -112.5,
-              67.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 'c',
-                'value': 'c',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 110,
-              'value': 110,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                45,
-                -135
-              ],
-              [
-                45,
-                -90
-              ],
-              [
-                90,
-                -90
-              ],
-              [
-                90,
-                -135
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              112.5,
-              -22.5
-            ]
-          },
-          'properties': {
-            'value': 101,
-            'geohash': 'q',
-            'center': [
-              112.5,
-              -22.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 'q',
-                'value': 'q',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 101,
-              'value': 101,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                -45,
-                90
-              ],
-              [
-                -45,
-                135
-              ],
-              [
-                0,
-                135
-              ],
-              [
-                0,
-                90
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              -22.5,
-              -22.5
-            ]
-          },
-          'properties': {
-            'value': 101,
-            'geohash': '7',
-            'center': [
-              -22.5,
-              -22.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': '7',
-                'value': '7',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 101,
-              'value': 101,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                -45,
-                -45
-              ],
-              [
-                -45,
-                0
-              ],
-              [
-                0,
-                0
-              ],
-              [
-                0,
-                -45
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              -67.5,
-              67.5
-            ]
-          },
-          'properties': {
-            'value': 92,
-            'geohash': 'f',
-            'center': [
-              -67.5,
-              67.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 'f',
-                'value': 'f',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 92,
-              'value': 92,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                45,
-                -90
-              ],
-              [
-                45,
-                -45
-              ],
-              [
-                90,
-                -45
-              ],
-              [
-                90,
-                -90
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              -157.5,
-              67.5
-            ]
-          },
-          'properties': {
-            'value': 75,
-            'geohash': 'b',
-            'center': [
-              -157.5,
-              67.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 'b',
-                'value': 'b',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 75,
-              'value': 75,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                45,
-                -180
-              ],
-              [
-                45,
-                -135
-              ],
-              [
-                90,
-                -135
-              ],
-              [
-                90,
-                -180
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              -22.5,
-              67.5
-            ]
-          },
-          'properties': {
-            'value': 64,
-            'geohash': 'g',
-            'center': [
-              -22.5,
-              67.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 'g',
-                'value': 'g',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 64,
-              'value': 64,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                45,
-                -45
-              ],
-              [
-                45,
-                0
-              ],
-              [
-                90,
-                0
-              ],
-              [
-                90,
-                -45
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              157.5,
-              67.5
-            ]
-          },
-          'properties': {
-            'value': 36,
-            'geohash': 'z',
-            'center': [
-              157.5,
-              67.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 'z',
-                'value': 'z',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 36,
-              'value': 36,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                45,
-                135
-              ],
-              [
-                45,
-                180
-              ],
-              [
-                90,
-                180
-              ],
-              [
-                90,
-                135
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              157.5,
-              22.5
-            ]
-          },
-          'properties': {
-            'value': 34,
-            'geohash': 'x',
-            'center': [
-              157.5,
-              22.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 'x',
-                'value': 'x',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 34,
-              'value': 34,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                0,
-                135
-              ],
-              [
-                0,
-                180
-              ],
-              [
-                45,
-                180
-              ],
-              [
-                45,
-                135
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              -67.5,
-              -67.5
-            ]
-          },
-          'properties': {
-            'value': 30,
-            'geohash': '4',
-            'center': [
-              -67.5,
-              -67.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': '4',
-                'value': '4',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 30,
-              'value': 30,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                -90,
-                -90
-              ],
-              [
-                -90,
-                -45
-              ],
-              [
-                -45,
-                -45
-              ],
-              [
-                -45,
-                -90
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              67.5,
-              -22.5
-            ]
-          },
-          'properties': {
-            'value': 16,
-            'geohash': 'm',
-            'center': [
-              67.5,
-              -22.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 'm',
-                'value': 'm',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 16,
-              'value': 16,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                -45,
-                45
-              ],
-              [
-                -45,
-                90
-              ],
-              [
-                0,
-                90
-              ],
-              [
-                0,
-                45
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              -22.5,
-              -67.5
-            ]
-          },
-          'properties': {
-            'value': 10,
-            'geohash': '5',
-            'center': [
-              -22.5,
-              -67.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': '5',
-                'value': '5',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 10,
-              'value': 10,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                -90,
-                -45
-              ],
-              [
-                -90,
-                0
-              ],
-              [
-                -45,
-                0
-              ],
-              [
-                -45,
-                -45
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              157.5,
-              -67.5
-            ]
-          },
-          'properties': {
-            'value': 6,
-            'geohash': 'p',
-            'center': [
-              157.5,
-              -67.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 'p',
-                'value': 'p',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 6,
-              'value': 6,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                -90,
-                135
-              ],
-              [
-                -90,
-                180
-              ],
-              [
-                -45,
-                180
-              ],
-              [
-                -45,
-                135
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              -157.5,
-              -22.5
-            ]
-          },
-          'properties': {
-            'value': 6,
-            'geohash': '2',
-            'center': [
-              -157.5,
-              -22.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': '2',
-                'value': '2',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 6,
-              'value': 6,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                -45,
-                -180
-              ],
-              [
-                -45,
-                -135
-              ],
-              [
-                0,
-                -135
-              ],
-              [
-                0,
-                -180
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              22.5,
-              -67.5
-            ]
-          },
-          'properties': {
-            'value': 4,
-            'geohash': 'h',
-            'center': [
-              22.5,
-              -67.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 'h',
-                'value': 'h',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 4,
-              'value': 4,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                -90,
-                0
-              ],
-              [
-                -90,
-                45
-              ],
-              [
-                -45,
-                45
-              ],
-              [
-                -45,
-                0
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              112.5,
-              -67.5
-            ]
-          },
-          'properties': {
-            'value': 2,
-            'geohash': 'n',
-            'center': [
-              112.5,
-              -67.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 'n',
-                'value': 'n',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 2,
-              'value': 2,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                -90,
-                90
-              ],
-              [
-                -90,
-                135
-              ],
-              [
-                -45,
-                135
-              ],
-              [
-                -45,
-                90
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              67.5,
-              -67.5
-            ]
-          },
-          'properties': {
-            'value': 2,
-            'geohash': 'j',
-            'center': [
-              67.5,
-              -67.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': 'j',
-                'value': 'j',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 2,
-              'value': 2,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                -90,
-                45
-              ],
-              [
-                -90,
-                90
-              ],
-              [
-                -45,
-                90
-              ],
-              [
-                -45,
-                45
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              -112.5,
-              -22.5
-            ]
-          },
-          'properties': {
-            'value': 1,
-            'geohash': '3',
-            'center': [
-              -112.5,
-              -22.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': '3',
-                'value': '3',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 1,
-              'value': 1,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                -45,
-                -135
-              ],
-              [
-                -45,
-                -90
-              ],
-              [
-                0,
-                -90
-              ],
-              [
-                0,
-                -135
-              ]
-            ]
-          }
-        },
-        {
-          'type': 'Feature',
-          'geometry': {
-            'type': 'Point',
-            'coordinates': [
-              -112.5,
-              -67.5
-            ]
-          },
-          'properties': {
-            'value': 1,
-            'geohash': '1',
-            'center': [
-              -112.5,
-              -67.5
-            ],
-            'aggConfigResult': {
-              '$parent': {
-                'key': '1',
-                'value': '1',
-                'aggConfig': {
-                  'id': '2',
-                  'type': 'geohash_grid',
-                  'schema': 'segment',
-                  'params': {
-                    'field': 'geo.coordinates',
-                    'precision': 1
-                  }
-                },
-                'type': 'bucket'
-              },
-              'key': 1,
-              'value': 1,
-              'aggConfig': {
-                'id': '1',
-                'type': 'count',
-                'schema': 'metric',
-                'params': {}
-              },
-              'type': 'metric'
-            },
-            'rectangle': [
-              [
-                -90,
-                -135
-              ],
-              [
-                -90,
-                -90
-              ],
-              [
-                -45,
-                -90
-              ],
-              [
-                -45,
-                -135
-              ]
-            ]
-          }
-        }
-      ],
-      'properties': {
-        'min': 1,
-        'max': 608,
-        'zoom': 2,
-        'center': [5, 15]
-      }
-    },
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/geohash/_rows.js b/test/unit/specs/vislib/fixture/mock_data/geohash/_rows.js
deleted file mode 100644
index 7e515a546edfe..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/geohash/_rows.js
+++ /dev/null
@@ -1,3670 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return {
-    'rows': [
-      {
-        'title': 'Top 2 geo.dest: CN',
-        'valueFormatter': _.identity,
-        'geoJson': {
-          'type': 'FeatureCollection',
-          'features': [
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  22.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 39,
-                'geohash': 's',
-                'center': [
-                  22.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 's',
-                    'value': 's',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 39,
-                  'value': 39,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    0,
-                    0
-                  ],
-                  [
-                    45,
-                    0
-                  ],
-                  [
-                    45,
-                    45
-                  ],
-                  [
-                    0,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  112.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 31,
-                'geohash': 'w',
-                'center': [
-                  112.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'w',
-                    'value': 'w',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 31,
-                  'value': 31,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    90,
-                    0
-                  ],
-                  [
-                    135,
-                    0
-                  ],
-                  [
-                    135,
-                    45
-                  ],
-                  [
-                    90,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -67.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 30,
-                'geohash': 'd',
-                'center': [
-                  -67.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'd',
-                    'value': 'd',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 30,
-                  'value': 30,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -90,
-                    0
-                  ],
-                  [
-                    -45,
-                    0
-                  ],
-                  [
-                    -45,
-                    45
-                  ],
-                  [
-                    -90,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -112.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 25,
-                'geohash': '9',
-                'center': [
-                  -112.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': '9',
-                    'value': '9',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 25,
-                  'value': 25,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -135,
-                    0
-                  ],
-                  [
-                    -90,
-                    0
-                  ],
-                  [
-                    -90,
-                    45
-                  ],
-                  [
-                    -135,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  67.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 23,
-                'geohash': 't',
-                'center': [
-                  67.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 't',
-                    'value': 't',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 23,
-                  'value': 23,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    45,
-                    0
-                  ],
-                  [
-                    90,
-                    0
-                  ],
-                  [
-                    90,
-                    45
-                  ],
-                  [
-                    45,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  22.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 23,
-                'geohash': 'k',
-                'center': [
-                  22.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'k',
-                    'value': 'k',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 23,
-                  'value': 23,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    0,
-                    -45
-                  ],
-                  [
-                    45,
-                    -45
-                  ],
-                  [
-                    45,
-                    0
-                  ],
-                  [
-                    0,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -67.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 22,
-                'geohash': '6',
-                'center': [
-                  -67.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': '6',
-                    'value': '6',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 22,
-                  'value': 22,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -90,
-                    -45
-                  ],
-                  [
-                    -45,
-                    -45
-                  ],
-                  [
-                    -45,
-                    0
-                  ],
-                  [
-                    -90,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  22.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 20,
-                'geohash': 'u',
-                'center': [
-                  22.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'u',
-                    'value': 'u',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 20,
-                  'value': 20,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    0,
-                    45
-                  ],
-                  [
-                    45,
-                    45
-                  ],
-                  [
-                    45,
-                    90
-                  ],
-                  [
-                    0,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  67.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 18,
-                'geohash': 'v',
-                'center': [
-                  67.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'v',
-                    'value': 'v',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 18,
-                  'value': 18,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    45,
-                    45
-                  ],
-                  [
-                    90,
-                    45
-                  ],
-                  [
-                    90,
-                    90
-                  ],
-                  [
-                    45,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  157.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 11,
-                'geohash': 'r',
-                'center': [
-                  157.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'r',
-                    'value': 'r',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 11,
-                  'value': 11,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    135,
-                    -45
-                  ],
-                  [
-                    180,
-                    -45
-                  ],
-                  [
-                    180,
-                    0
-                  ],
-                  [
-                    135,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -22.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 11,
-                'geohash': 'e',
-                'center': [
-                  -22.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'e',
-                    'value': 'e',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 11,
-                  'value': 11,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -45,
-                    0
-                  ],
-                  [
-                    0,
-                    0
-                  ],
-                  [
-                    0,
-                    45
-                  ],
-                  [
-                    -45,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  112.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 10,
-                'geohash': 'y',
-                'center': [
-                  112.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'y',
-                    'value': 'y',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 10,
-                  'value': 10,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    90,
-                    45
-                  ],
-                  [
-                    135,
-                    45
-                  ],
-                  [
-                    135,
-                    90
-                  ],
-                  [
-                    90,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -112.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 10,
-                'geohash': 'c',
-                'center': [
-                  -112.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'c',
-                    'value': 'c',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 10,
-                  'value': 10,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -135,
-                    45
-                  ],
-                  [
-                    -90,
-                    45
-                  ],
-                  [
-                    -90,
-                    90
-                  ],
-                  [
-                    -135,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -67.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 8,
-                'geohash': 'f',
-                'center': [
-                  -67.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'f',
-                    'value': 'f',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 8,
-                  'value': 8,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -90,
-                    45
-                  ],
-                  [
-                    -45,
-                    45
-                  ],
-                  [
-                    -45,
-                    90
-                  ],
-                  [
-                    -90,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -22.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 8,
-                'geohash': '7',
-                'center': [
-                  -22.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': '7',
-                    'value': '7',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 8,
-                  'value': 8,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -45,
-                    -45
-                  ],
-                  [
-                    0,
-                    -45
-                  ],
-                  [
-                    0,
-                    0
-                  ],
-                  [
-                    -45,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  112.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 6,
-                'geohash': 'q',
-                'center': [
-                  112.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'q',
-                    'value': 'q',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 6,
-                  'value': 6,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    90,
-                    -45
-                  ],
-                  [
-                    135,
-                    -45
-                  ],
-                  [
-                    135,
-                    0
-                  ],
-                  [
-                    90,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -22.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 6,
-                'geohash': 'g',
-                'center': [
-                  -22.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'g',
-                    'value': 'g',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 6,
-                  'value': 6,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -45,
-                    45
-                  ],
-                  [
-                    0,
-                    45
-                  ],
-                  [
-                    0,
-                    90
-                  ],
-                  [
-                    -45,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  157.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 4,
-                'geohash': 'x',
-                'center': [
-                  157.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'x',
-                    'value': 'x',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 4,
-                  'value': 4,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    135,
-                    0
-                  ],
-                  [
-                    180,
-                    0
-                  ],
-                  [
-                    180,
-                    45
-                  ],
-                  [
-                    135,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -157.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 3,
-                'geohash': 'b',
-                'center': [
-                  -157.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'b',
-                    'value': 'b',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 3,
-                  'value': 3,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -180,
-                    45
-                  ],
-                  [
-                    -135,
-                    45
-                  ],
-                  [
-                    -135,
-                    90
-                  ],
-                  [
-                    -180,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  157.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 2,
-                'geohash': 'z',
-                'center': [
-                  157.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'z',
-                    'value': 'z',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 2,
-                  'value': 2,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    135,
-                    45
-                  ],
-                  [
-                    180,
-                    45
-                  ],
-                  [
-                    180,
-                    90
-                  ],
-                  [
-                    135,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -67.5,
-                  -67.5
-                ]
-              },
-              'properties': {
-                'value': 2,
-                'geohash': '4',
-                'center': [
-                  -67.5,
-                  -67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': '4',
-                    'value': '4',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 2,
-                  'value': 2,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -90,
-                    -90
-                  ],
-                  [
-                    -45,
-                    -90
-                  ],
-                  [
-                    -45,
-                    -45
-                  ],
-                  [
-                    -90,
-                    -45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -22.5,
-                  -67.5
-                ]
-              },
-              'properties': {
-                'value': 1,
-                'geohash': '5',
-                'center': [
-                  -22.5,
-                  -67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': '5',
-                    'value': '5',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 1,
-                  'value': 1,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -45,
-                    -90
-                  ],
-                  [
-                    0,
-                    -90
-                  ],
-                  [
-                    0,
-                    -45
-                  ],
-                  [
-                    -45,
-                    -45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -112.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 1,
-                'geohash': '3',
-                'center': [
-                  -112.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': '3',
-                    'value': '3',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 1,
-                  'value': 1,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -135,
-                    -45
-                  ],
-                  [
-                    -90,
-                    -45
-                  ],
-                  [
-                    -90,
-                    0
-                  ],
-                  [
-                    -135,
-                    0
-                  ]
-                ]
-              }
-            }
-          ],
-          'properties': {
-            'min': 1,
-            'max': 39
-          }
-        }
-      },
-      {
-        'label': 'Top 2 geo.dest: IN',
-        'valueFormatter': _.identity,
-        'geoJson': {
-          'type': 'FeatureCollection',
-          'features': [
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -67.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 31,
-                'geohash': '6',
-                'center': [
-                  -67.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': '6',
-                    'value': '6',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 31,
-                  'value': 31,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -90,
-                    -45
-                  ],
-                  [
-                    -45,
-                    -45
-                  ],
-                  [
-                    -45,
-                    0
-                  ],
-                  [
-                    -90,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  22.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 30,
-                'geohash': 's',
-                'center': [
-                  22.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 's',
-                    'value': 's',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 30,
-                  'value': 30,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    0,
-                    0
-                  ],
-                  [
-                    45,
-                    0
-                  ],
-                  [
-                    45,
-                    45
-                  ],
-                  [
-                    0,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  112.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 29,
-                'geohash': 'w',
-                'center': [
-                  112.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'w',
-                    'value': 'w',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 29,
-                  'value': 29,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    90,
-                    0
-                  ],
-                  [
-                    135,
-                    0
-                  ],
-                  [
-                    135,
-                    45
-                  ],
-                  [
-                    90,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -67.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 28,
-                'geohash': 'd',
-                'center': [
-                  -67.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'd',
-                    'value': 'd',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 28,
-                  'value': 28,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -90,
-                    0
-                  ],
-                  [
-                    -45,
-                    0
-                  ],
-                  [
-                    -45,
-                    45
-                  ],
-                  [
-                    -90,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  67.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 25,
-                'geohash': 't',
-                'center': [
-                  67.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 't',
-                    'value': 't',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 25,
-                  'value': 25,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    45,
-                    0
-                  ],
-                  [
-                    90,
-                    0
-                  ],
-                  [
-                    90,
-                    45
-                  ],
-                  [
-                    45,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  22.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 24,
-                'geohash': 'k',
-                'center': [
-                  22.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'k',
-                    'value': 'k',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 24,
-                  'value': 24,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    0,
-                    -45
-                  ],
-                  [
-                    45,
-                    -45
-                  ],
-                  [
-                    45,
-                    0
-                  ],
-                  [
-                    0,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  22.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 20,
-                'geohash': 'u',
-                'center': [
-                  22.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'u',
-                    'value': 'u',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 20,
-                  'value': 20,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    0,
-                    45
-                  ],
-                  [
-                    45,
-                    45
-                  ],
-                  [
-                    45,
-                    90
-                  ],
-                  [
-                    0,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -112.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 18,
-                'geohash': '9',
-                'center': [
-                  -112.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': '9',
-                    'value': '9',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 18,
-                  'value': 18,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -135,
-                    0
-                  ],
-                  [
-                    -90,
-                    0
-                  ],
-                  [
-                    -90,
-                    45
-                  ],
-                  [
-                    -135,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  67.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 14,
-                'geohash': 'v',
-                'center': [
-                  67.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'v',
-                    'value': 'v',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 14,
-                  'value': 14,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    45,
-                    45
-                  ],
-                  [
-                    90,
-                    45
-                  ],
-                  [
-                    90,
-                    90
-                  ],
-                  [
-                    45,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -22.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 11,
-                'geohash': 'e',
-                'center': [
-                  -22.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'e',
-                    'value': 'e',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 11,
-                  'value': 11,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -45,
-                    0
-                  ],
-                  [
-                    0,
-                    0
-                  ],
-                  [
-                    0,
-                    45
-                  ],
-                  [
-                    -45,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  157.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 9,
-                'geohash': 'r',
-                'center': [
-                  157.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'r',
-                    'value': 'r',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 9,
-                  'value': 9,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    135,
-                    -45
-                  ],
-                  [
-                    180,
-                    -45
-                  ],
-                  [
-                    180,
-                    0
-                  ],
-                  [
-                    135,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  112.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 6,
-                'geohash': 'y',
-                'center': [
-                  112.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'y',
-                    'value': 'y',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 6,
-                  'value': 6,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    90,
-                    45
-                  ],
-                  [
-                    135,
-                    45
-                  ],
-                  [
-                    135,
-                    90
-                  ],
-                  [
-                    90,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -67.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 6,
-                'geohash': 'f',
-                'center': [
-                  -67.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'f',
-                    'value': 'f',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 6,
-                  'value': 6,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -90,
-                    45
-                  ],
-                  [
-                    -45,
-                    45
-                  ],
-                  [
-                    -45,
-                    90
-                  ],
-                  [
-                    -90,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -22.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 5,
-                'geohash': 'g',
-                'center': [
-                  -22.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'g',
-                    'value': 'g',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 5,
-                  'value': 5,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -45,
-                    45
-                  ],
-                  [
-                    0,
-                    45
-                  ],
-                  [
-                    0,
-                    90
-                  ],
-                  [
-                    -45,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -112.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 5,
-                'geohash': 'c',
-                'center': [
-                  -112.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'c',
-                    'value': 'c',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 5,
-                  'value': 5,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -135,
-                    45
-                  ],
-                  [
-                    -90,
-                    45
-                  ],
-                  [
-                    -90,
-                    90
-                  ],
-                  [
-                    -135,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -157.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 4,
-                'geohash': 'b',
-                'center': [
-                  -157.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'b',
-                    'value': 'b',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 4,
-                  'value': 4,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -180,
-                    45
-                  ],
-                  [
-                    -135,
-                    45
-                  ],
-                  [
-                    -135,
-                    90
-                  ],
-                  [
-                    -180,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  112.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 3,
-                'geohash': 'q',
-                'center': [
-                  112.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'q',
-                    'value': 'q',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 3,
-                  'value': 3,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    90,
-                    -45
-                  ],
-                  [
-                    135,
-                    -45
-                  ],
-                  [
-                    135,
-                    0
-                  ],
-                  [
-                    90,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -67.5,
-                  -67.5
-                ]
-              },
-              'properties': {
-                'value': 2,
-                'geohash': '4',
-                'center': [
-                  -67.5,
-                  -67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': '4',
-                    'value': '4',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 2,
-                  'value': 2,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -90,
-                    -90
-                  ],
-                  [
-                    -45,
-                    -90
-                  ],
-                  [
-                    -45,
-                    -45
-                  ],
-                  [
-                    -90,
-                    -45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  157.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 1,
-                'geohash': 'z',
-                'center': [
-                  157.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'z',
-                    'value': 'z',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 1,
-                  'value': 1,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    135,
-                    45
-                  ],
-                  [
-                    180,
-                    45
-                  ],
-                  [
-                    180,
-                    90
-                  ],
-                  [
-                    135,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  157.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 1,
-                'geohash': 'x',
-                'center': [
-                  157.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'x',
-                    'value': 'x',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 1,
-                  'value': 1,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    135,
-                    0
-                  ],
-                  [
-                    180,
-                    0
-                  ],
-                  [
-                    180,
-                    45
-                  ],
-                  [
-                    135,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  157.5,
-                  -67.5
-                ]
-              },
-              'properties': {
-                'value': 1,
-                'geohash': 'p',
-                'center': [
-                  157.5,
-                  -67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'p',
-                    'value': 'p',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 1,
-                  'value': 1,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    135,
-                    -90
-                  ],
-                  [
-                    180,
-                    -90
-                  ],
-                  [
-                    180,
-                    -45
-                  ],
-                  [
-                    135,
-                    -45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  67.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 1,
-                'geohash': 'm',
-                'center': [
-                  67.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'm',
-                    'value': 'm',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 1,
-                  'value': 1,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    45,
-                    -45
-                  ],
-                  [
-                    90,
-                    -45
-                  ],
-                  [
-                    90,
-                    0
-                  ],
-                  [
-                    45,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -22.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 1,
-                'geohash': '7',
-                'center': [
-                  -22.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': true
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': '7',
-                    'value': '7',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 1,
-                  'value': 1,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -45,
-                    -45
-                  ],
-                  [
-                    0,
-                    -45
-                  ],
-                  [
-                    0,
-                    0
-                  ],
-                  [
-                    -45,
-                    0
-                  ]
-                ]
-              }
-            }
-          ],
-          'properties': {
-            'min': 1,
-            'max': 31
-          }
-        }
-      }
-    ],
-    'hits': 1639
-  };
-});
-
diff --git a/test/unit/specs/vislib/fixture/mock_data/histogram/_columns.js b/test/unit/specs/vislib/fixture/mock_data/histogram/_columns.js
deleted file mode 100644
index 0d3276a9f6ebe..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/histogram/_columns.js
+++ /dev/null
@@ -1,348 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return {
-    'columns': [
-      {
-        'label': '404: response',
-        'xAxisLabel': 'machine.ram',
-        'ordered': {
-          'interval': 100
-        },
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 2147483600,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 3221225400,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 4294967200,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 5368709100,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 6442450900,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 7516192700,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 8589934500,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 10737418200,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 11811160000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 12884901800,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 13958643700,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 15032385500,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 16106127300,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 18253611000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 19327352800,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 20401094600,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 21474836400,
-                'y': 0,
-                'y0': 0
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      },
-      {
-        'label': '200: response',
-        'xAxisLabel': 'machine.ram',
-        'ordered': {
-          'interval': 100
-        },
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 2147483600,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 3221225400,
-                'y': 2,
-                'y0': 0
-              },
-              {
-                'x': 4294967200,
-                'y': 3,
-                'y0': 0
-              },
-              {
-                'x': 5368709100,
-                'y': 3,
-                'y0': 0
-              },
-              {
-                'x': 6442450900,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 7516192700,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 8589934500,
-                'y': 4,
-                'y0': 0
-              },
-              {
-                'x': 10737418200,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 11811160000,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 12884901800,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 13958643700,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 15032385500,
-                'y': 2,
-                'y0': 0
-              },
-              {
-                'x': 16106127300,
-                'y': 3,
-                'y0': 0
-              },
-              {
-                'x': 18253611000,
-                'y': 4,
-                'y0': 0
-              },
-              {
-                'x': 19327352800,
-                'y': 5,
-                'y0': 0
-              },
-              {
-                'x': 20401094600,
-                'y': 2,
-                'y0': 0
-              },
-              {
-                'x': 21474836400,
-                'y': 2,
-                'y0': 0
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      },
-      {
-        'label': '503: response',
-        'xAxisLabel': 'machine.ram',
-        'ordered': {
-          'interval': 100
-        },
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 2147483600,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 3221225400,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 4294967200,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 5368709100,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 6442450900,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 7516192700,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 8589934500,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 10737418200,
-                'y': 1,
-                'y0': 0
-              },
-              {
-                'x': 11811160000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 12884901800,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 13958643700,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 15032385500,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 16106127300,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 18253611000,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 19327352800,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 20401094600,
-                'y': 0,
-                'y0': 0
-              },
-              {
-                'x': 21474836400,
-                'y': 0,
-                'y0': 0
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      }
-    ],
-    'hits': 40
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/histogram/_rows.js b/test/unit/specs/vislib/fixture/mock_data/histogram/_rows.js
deleted file mode 100644
index 2c66ed1bd8bd2..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/histogram/_rows.js
+++ /dev/null
@@ -1,189 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return {
-    'rows': [
-      {
-        'label': '404: response',
-        'xAxisLabel': 'machine.ram',
-        'ordered': {
-          'interval': 100
-        },
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 2147483600,
-                'y': 1
-              },
-              {
-                'x': 10737418200,
-                'y': 1
-              },
-              {
-                'x': 15032385500,
-                'y': 2
-              },
-              {
-                'x': 19327352800,
-                'y': 1
-              },
-              {
-                'x': 32212254700,
-                'y': 1
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      },
-      {
-        'label': '200: response',
-        'xAxisLabel': 'machine.ram',
-        'ordered': {
-          'interval': 100
-        },
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 3221225400,
-                'y': 4
-              },
-              {
-                'x': 4294967200,
-                'y': 3
-              },
-              {
-                'x': 5368709100,
-                'y': 3
-              },
-              {
-                'x': 6442450900,
-                'y': 2
-              },
-              {
-                'x': 7516192700,
-                'y': 2
-              },
-              {
-                'x': 8589934500,
-                'y': 2
-              },
-              {
-                'x': 9663676400,
-                'y': 3
-              },
-              {
-                'x': 11811160000,
-                'y': 3
-              },
-              {
-                'x': 12884901800,
-                'y': 2
-              },
-              {
-                'x': 13958643700,
-                'y': 1
-              },
-              {
-                'x': 15032385500,
-                'y': 2
-              },
-              {
-                'x': 16106127300,
-                'y': 3
-              },
-              {
-                'x': 17179869100,
-                'y': 1
-              },
-              {
-                'x': 18253611000,
-                'y': 4
-              },
-              {
-                'x': 19327352800,
-                'y': 1
-              },
-              {
-                'x': 20401094600,
-                'y': 1
-              },
-              {
-                'x': 21474836400,
-                'y': 4
-              },
-              {
-                'x': 32212254700,
-                'y': 3
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      },
-      {
-        'label': '503: response',
-        'xAxisLabel': 'machine.ram',
-        'ordered': {
-          'interval': 100
-        },
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 10737418200,
-                'y': 1
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      }
-    ],
-    'hits': 51
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/histogram/_series.js b/test/unit/specs/vislib/fixture/mock_data/histogram/_series.js
deleted file mode 100644
index 0c78e46cb4d05..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/histogram/_series.js
+++ /dev/null
@@ -1,105 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return {
-    'label': '',
-    'xAxisLabel': 'machine.ram',
-    'ordered': {
-      'interval': 100
-    },
-    'yAxisLabel': 'Count of documents',
-    'series': [
-      {
-        'values': [
-          {
-            'x': 3221225400,
-            'y': 5
-          },
-          {
-            'x': 4294967200,
-            'y': 2
-          },
-          {
-            'x': 5368709100,
-            'y': 5
-          },
-          {
-            'x': 6442450900,
-            'y': 4
-          },
-          {
-            'x': 7516192700,
-            'y': 1
-          },
-          {
-            'x': 9663676400,
-            'y': 9
-          },
-          {
-            'x': 10737418200,
-            'y': 5
-          },
-          {
-            'x': 11811160000,
-            'y': 5
-          },
-          {
-            'x': 12884901800,
-            'y': 2
-          },
-          {
-            'x': 13958643700,
-            'y': 3
-          },
-          {
-            'x': 15032385500,
-            'y': 3
-          },
-          {
-            'x': 16106127300,
-            'y': 3
-          },
-          {
-            'x': 17179869100,
-            'y': 1
-          },
-          {
-            'x': 18253611000,
-            'y': 6
-          },
-          {
-            'x': 19327352800,
-            'y': 3
-          },
-          {
-            'x': 20401094600,
-            'y': 3
-          },
-          {
-            'x': 21474836400,
-            'y': 7
-          },
-          {
-            'x': 32212254700,
-            'y': 4
-          }
-        ]
-      }
-    ],
-    'hits': 71,
-    'xAxisFormatter': function (val) {
-      if (_.isObject(val)) {
-        return JSON.stringify(val);
-      }
-      else if (val == null) {
-        return '';
-      }
-      else {
-        return '' + val;
-      }
-    },
-    'tooltipFormatter': function (d) {
-      return d;
-    }
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/histogram/_slices.js b/test/unit/specs/vislib/fixture/mock_data/histogram/_slices.js
deleted file mode 100644
index f41013da80f87..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/histogram/_slices.js
+++ /dev/null
@@ -1,311 +0,0 @@
-define(function () {
-  var _ = require('lodash');
-
-  return {
-    'label': '',
-    'slices': {
-      'children': [
-        {
-          'name': 0,
-          'size': 378611,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        },
-        {
-          'name': 1000,
-          'size': 205997,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        },
-        {
-          'name': 2000,
-          'size': 397189,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        },
-        {
-          'name': 3000,
-          'size': 397195,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        },
-        {
-          'name': 4000,
-          'size': 398429,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        },
-        {
-          'name': 5000,
-          'size': 397843,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        },
-        {
-          'name': 6000,
-          'size': 398140,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        },
-        {
-          'name': 7000,
-          'size': 398076,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        },
-        {
-          'name': 8000,
-          'size': 396746,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        },
-        {
-          'name': 9000,
-          'size': 397418,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        },
-        {
-          'name': 10000,
-          'size': 20222,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        },
-        {
-          'name': 11000,
-          'size': 20173,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        },
-        {
-          'name': 12000,
-          'size': 20026,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        },
-        {
-          'name': 13000,
-          'size': 19986,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        },
-        {
-          'name': 14000,
-          'size': 20091,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        },
-        {
-          'name': 15000,
-          'size': 20052,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        },
-        {
-          'name': 16000,
-          'size': 20349,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        },
-        {
-          'name': 17000,
-          'size': 20290,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        },
-        {
-          'name': 18000,
-          'size': 20399,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        },
-        {
-          'name': 19000,
-          'size': 20133,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        },
-        {
-          'name': 20000,
-          'size': 9,
-          'aggConfig': {
-            'type': 'histogram',
-            'schema': 'segment',
-            'fieldFormatter': _.constant(String),
-            'params': {
-              'interval': 1000,
-              'extended_bounds': {}
-            }
-          }
-        }
-      ]
-    },
-    'names': [
-      0,
-      1000,
-      2000,
-      3000,
-      4000,
-      5000,
-      6000,
-      7000,
-      8000,
-      9000,
-      10000,
-      11000,
-      12000,
-      13000,
-      14000,
-      15000,
-      16000,
-      17000,
-      18000,
-      19000,
-      20000
-    ],
-    'hits': 3967374,
-    'tooltipFormatter': function (event) {
-      return event.point;
-    }
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/not_enough_data/_one_point.js b/test/unit/specs/vislib/fixture/mock_data/not_enough_data/_one_point.js
deleted file mode 100644
index d4baacc5d5528..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/not_enough_data/_one_point.js
+++ /dev/null
@@ -1,34 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return {
-    'label': '',
-    'xAxisLabel': '',
-    'yAxisLabel': 'Count of documents',
-    'series': [
-      {
-        'values': [
-          {
-            'x': '_all',
-            'y': 274
-          }
-        ]
-      }
-    ],
-    'hits': 274,
-    'xAxisFormatter': function (val) {
-      if (_.isObject(val)) {
-        return JSON.stringify(val);
-      }
-      else if (val == null) {
-        return '';
-      }
-      else {
-        return '' + val;
-      }
-    },
-    'tooltipFormatter': function (d) {
-      return d;
-    }
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/range/_columns.js b/test/unit/specs/vislib/fixture/mock_data/range/_columns.js
deleted file mode 100644
index 2012af38a1434..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/range/_columns.js
+++ /dev/null
@@ -1,61 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return {
-    'columns': [
-      {
-        'label': 'apache: _type',
-        'xAxisLabel': 'bytes ranges',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': '0.0-1000.0',
-                'y': 13309
-              },
-              {
-                'x': '1000.0-2000.0',
-                'y': 7196
-              }
-            ]
-          }
-        ]
-      },
-      {
-        'label': 'nginx: _type',
-        'xAxisLabel': 'bytes ranges',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': '0.0-1000.0',
-                'y': 3278
-              },
-              {
-                'x': '1000.0-2000.0',
-                'y': 1804
-              }
-            ]
-          }
-        ]
-      }
-    ],
-    'hits': 171499,
-    'xAxisFormatter': function (val) {
-      if (_.isObject(val)) {
-        return JSON.stringify(val);
-      }
-      else if (val == null) {
-        return '';
-      }
-      else {
-        return '' + val;
-      }
-    },
-    'tooltipFormatter': function (d) {
-      return d;
-    }
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/range/_rows.js b/test/unit/specs/vislib/fixture/mock_data/range/_rows.js
deleted file mode 100644
index 86e5adfaf7805..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/range/_rows.js
+++ /dev/null
@@ -1,86 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return {
-    'rows': [
-      {
-        'label': 'Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 Firefox/6.0a1: agent.raw',
-        'xAxisLabel': 'bytes ranges',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': '0.0-1000.0',
-                'y': 6422,
-                'y0': 0
-              },
-              {
-                'x': '1000.0-2000.0',
-                'y': 3446,
-                'y0': 0
-              }
-            ]
-          }
-        ]
-      },
-      {
-        'label': 'Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.50 Safari/534.24: agent.raw',
-        'xAxisLabel': 'bytes ranges',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': '0.0-1000.0',
-                'y': 5430,
-                'y0': 0
-              },
-              {
-                'x': '1000.0-2000.0',
-                'y': 3010,
-                'y0': 0
-              }
-            ]
-          }
-        ]
-      },
-      {
-        'label': 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322): agent.raw',
-        'xAxisLabel': 'bytes ranges',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': '0.0-1000.0',
-                'y': 4735,
-                'y0': 0
-              },
-              {
-                'x': '1000.0-2000.0',
-                'y': 2542,
-                'y0': 0
-              }
-            ]
-          }
-        ]
-      }
-    ],
-    'hits': 171501,
-    'xAxisFormatter': function (val) {
-      if (_.isObject(val)) {
-        return JSON.stringify(val);
-      }
-      else if (val == null) {
-        return '';
-      }
-      else {
-        return '' + val;
-      }
-    },
-    'tooltipFormatter': function (d) {
-      return d;
-    }
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/range/_series.js b/test/unit/specs/vislib/fixture/mock_data/range/_series.js
deleted file mode 100644
index e276232754fa1..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/range/_series.js
+++ /dev/null
@@ -1,38 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return {
-    'label': '',
-    'xAxisLabel': 'bytes ranges',
-    'yAxisLabel': 'Count of documents',
-    'series': [
-      {
-        'values': [
-          {
-            'x': '0.0-1000.0',
-            'y': 16576
-          },
-          {
-            'x': '1000.0-2000.0',
-            'y': 9005
-          }
-        ]
-      }
-    ],
-    'hits': 171500,
-    'xAxisFormatter': function (val) {
-      if (_.isObject(val)) {
-        return JSON.stringify(val);
-      }
-      else if (val == null) {
-        return '';
-      }
-      else {
-        return '' + val;
-      }
-    },
-    'tooltipFormatter': function (d) {
-      return d;
-    }
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/significant_terms/_columns.js b/test/unit/specs/vislib/fixture/mock_data/significant_terms/_columns.js
deleted file mode 100644
index b239ef3b96e91..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/significant_terms/_columns.js
+++ /dev/null
@@ -1,234 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return {
-    'columns': [
-      {
-        'label': 'http: links',
-        'xAxisLabel': 'Top 5 unusual terms in @tags',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'success',
-                'y': 144000
-              },
-              {
-                'x': 'info',
-                'y': 128237
-              },
-              {
-                'x': 'security',
-                'y': 34518
-              },
-              {
-                'x': 'error',
-                'y': 10258
-              },
-              {
-                'x': 'warning',
-                'y': 17188
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      },
-      {
-        'label': 'info: links',
-        'xAxisLabel': 'Top 5 unusual terms in @tags',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'success',
-                'y': 108148
-              },
-              {
-                'x': 'info',
-                'y': 96242
-              },
-              {
-                'x': 'security',
-                'y': 25889
-              },
-              {
-                'x': 'error',
-                'y': 7673
-              },
-              {
-                'x': 'warning',
-                'y': 12842
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      },
-      {
-        'label': 'www.slate.com: links',
-        'xAxisLabel': 'Top 5 unusual terms in @tags',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'success',
-                'y': 98056
-              },
-              {
-                'x': 'info',
-                'y': 87344
-              },
-              {
-                'x': 'security',
-                'y': 23577
-              },
-              {
-                'x': 'error',
-                'y': 7004
-              },
-              {
-                'x': 'warning',
-                'y': 11759
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      },
-      {
-        'label': 'twitter.com: links',
-        'xAxisLabel': 'Top 5 unusual terms in @tags',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'success',
-                'y': 74154
-              },
-              {
-                'x': 'info',
-                'y': 65963
-              },
-              {
-                'x': 'security',
-                'y': 17832
-              },
-              {
-                'x': 'error',
-                'y': 5258
-              },
-              {
-                'x': 'warning',
-                'y': 8906
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      },
-      {
-        'label': 'www.www.slate.com: links',
-        'xAxisLabel': 'Top 5 unusual terms in @tags',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'success',
-                'y': 62591
-              },
-              {
-                'x': 'info',
-                'y': 55822
-              },
-              {
-                'x': 'security',
-                'y': 15100
-              },
-              {
-                'x': 'error',
-                'y': 4564
-              },
-              {
-                'x': 'warning',
-                'y': 7498
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      }
-    ],
-    'hits': 171446
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/significant_terms/_rows.js b/test/unit/specs/vislib/fixture/mock_data/significant_terms/_rows.js
deleted file mode 100644
index 0d7bba68e87f5..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/significant_terms/_rows.js
+++ /dev/null
@@ -1,234 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return {
-    'rows': [
-      {
-        'label': 'h3: headings',
-        'xAxisLabel': 'Top 5 unusual terms in @tags',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'success',
-                'y': 144000
-              },
-              {
-                'x': 'info',
-                'y': 128235
-              },
-              {
-                'x': 'security',
-                'y': 34518
-              },
-              {
-                'x': 'error',
-                'y': 10257
-              },
-              {
-                'x': 'warning',
-                'y': 17188
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      },
-      {
-        'label': 'h5: headings',
-        'xAxisLabel': 'Top 5 unusual terms in @tags',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'success',
-                'y': 144000
-              },
-              {
-                'x': 'info',
-                'y': 128235
-              },
-              {
-                'x': 'security',
-                'y': 34518
-              },
-              {
-                'x': 'error',
-                'y': 10257
-              },
-              {
-                'x': 'warning',
-                'y': 17188
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      },
-      {
-        'label': 'http: headings',
-        'xAxisLabel': 'Top 5 unusual terms in @tags',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'success',
-                'y': 144000
-              },
-              {
-                'x': 'info',
-                'y': 128235
-              },
-              {
-                'x': 'security',
-                'y': 34518
-              },
-              {
-                'x': 'error',
-                'y': 10257
-              },
-              {
-                'x': 'warning',
-                'y': 17188
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      },
-      {
-        'label': 'success: headings',
-        'xAxisLabel': 'Top 5 unusual terms in @tags',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'success',
-                'y': 120689
-              },
-              {
-                'x': 'info',
-                'y': 107621
-              },
-              {
-                'x': 'security',
-                'y': 28916
-              },
-              {
-                'x': 'error',
-                'y': 8590
-              },
-              {
-                'x': 'warning',
-                'y': 14548
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      },
-      {
-        'label': 'www.slate.com: headings',
-        'xAxisLabel': 'Top 5 unusual terms in @tags',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'success',
-                'y': 62292
-              },
-              {
-                'x': 'info',
-                'y': 55646
-              },
-              {
-                'x': 'security',
-                'y': 14823
-              },
-              {
-                'x': 'error',
-                'y': 4441
-              },
-              {
-                'x': 'warning',
-                'y': 7539
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      }
-    ],
-    'hits': 171445
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/significant_terms/_series.js b/test/unit/specs/vislib/fixture/mock_data/significant_terms/_series.js
deleted file mode 100644
index 4ddcd765e2a35..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/significant_terms/_series.js
+++ /dev/null
@@ -1,50 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return {
-    'label': '',
-    'xAxisLabel': 'Top 5 unusual terms in @tags',
-    'yAxisLabel': 'Count of documents',
-    'series': [
-      {
-        'values': [
-          {
-            'x': 'success',
-            'y': 143995
-          },
-          {
-            'x': 'info',
-            'y': 128233
-          },
-          {
-            'x': 'security',
-            'y': 34515
-          },
-          {
-            'x': 'error',
-            'y': 10256
-          },
-          {
-            'x': 'warning',
-            'y': 17188
-          }
-        ]
-      }
-    ],
-    'hits': 171439,
-    'xAxisFormatter': function (val) {
-      if (_.isObject(val)) {
-        return JSON.stringify(val);
-      }
-      else if (val == null) {
-        return '';
-      }
-      else {
-        return '' + val;
-      }
-    },
-    'tooltipFormatter': function (d) {
-      return d;
-    }
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/stacked/_stacked.js b/test/unit/specs/vislib/fixture/mock_data/stacked/_stacked.js
deleted file mode 100644
index 7def3fcb21c7d..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/stacked/_stacked.js
+++ /dev/null
@@ -1,1574 +0,0 @@
-define(function (require) {
-  var moment = require('moment');
-
-  return {
-    'label': '',
-    'xAxisLabel': '@timestamp per 30 sec',
-    'ordered': {
-      'date': true,
-      'interval': 30000,
-      'min': 1416850340336,
-      'max': 1416852140336
-    },
-    'yAxisLabel': 'Count of documents',
-    'series': [
-      {
-        'label': 'jpg',
-        'values': [
-          {
-            'x': 1416850320000,
-            'y': 110,
-            'y0': 0
-          },
-          {
-            'x': 1416850350000,
-            'y': 24,
-            'y0': 0
-          },
-          {
-            'x': 1416850380000,
-            'y': 34,
-            'y0': 0
-          },
-          {
-            'x': 1416850410000,
-            'y': 21,
-            'y0': 0
-          },
-          {
-            'x': 1416850440000,
-            'y': 32,
-            'y0': 0
-          },
-          {
-            'x': 1416850470000,
-            'y': 24,
-            'y0': 0
-          },
-          {
-            'x': 1416850500000,
-            'y': 16,
-            'y0': 0
-          },
-          {
-            'x': 1416850530000,
-            'y': 27,
-            'y0': 0
-          },
-          {
-            'x': 1416850560000,
-            'y': 24,
-            'y0': 0
-          },
-          {
-            'x': 1416850590000,
-            'y': 38,
-            'y0': 0
-          },
-          {
-            'x': 1416850620000,
-            'y': 33,
-            'y0': 0
-          },
-          {
-            'x': 1416850650000,
-            'y': 33,
-            'y0': 0
-          },
-          {
-            'x': 1416850680000,
-            'y': 31,
-            'y0': 0
-          },
-          {
-            'x': 1416850710000,
-            'y': 24,
-            'y0': 0
-          },
-          {
-            'x': 1416850740000,
-            'y': 24,
-            'y0': 0
-          },
-          {
-            'x': 1416850770000,
-            'y': 38,
-            'y0': 0
-          },
-          {
-            'x': 1416850800000,
-            'y': 34,
-            'y0': 0
-          },
-          {
-            'x': 1416850830000,
-            'y': 30,
-            'y0': 0
-          },
-          {
-            'x': 1416850860000,
-            'y': 38,
-            'y0': 0
-          },
-          {
-            'x': 1416850890000,
-            'y': 19,
-            'y0': 0
-          },
-          {
-            'x': 1416850920000,
-            'y': 23,
-            'y0': 0
-          },
-          {
-            'x': 1416850950000,
-            'y': 33,
-            'y0': 0
-          },
-          {
-            'x': 1416850980000,
-            'y': 28,
-            'y0': 0
-          },
-          {
-            'x': 1416851010000,
-            'y': 24,
-            'y0': 0
-          },
-          {
-            'x': 1416851040000,
-            'y': 22,
-            'y0': 0
-          },
-          {
-            'x': 1416851070000,
-            'y': 28,
-            'y0': 0
-          },
-          {
-            'x': 1416851100000,
-            'y': 27,
-            'y0': 0
-          },
-          {
-            'x': 1416851130000,
-            'y': 32,
-            'y0': 0
-          },
-          {
-            'x': 1416851160000,
-            'y': 32,
-            'y0': 0
-          },
-          {
-            'x': 1416851190000,
-            'y': 30,
-            'y0': 0
-          },
-          {
-            'x': 1416851220000,
-            'y': 32,
-            'y0': 0
-          },
-          {
-            'x': 1416851250000,
-            'y': 36,
-            'y0': 0
-          },
-          {
-            'x': 1416851280000,
-            'y': 32,
-            'y0': 0
-          },
-          {
-            'x': 1416851310000,
-            'y': 29,
-            'y0': 0
-          },
-          {
-            'x': 1416851340000,
-            'y': 22,
-            'y0': 0
-          },
-          {
-            'x': 1416851370000,
-            'y': 29,
-            'y0': 0
-          },
-          {
-            'x': 1416851400000,
-            'y': 33,
-            'y0': 0
-          },
-          {
-            'x': 1416851430000,
-            'y': 28,
-            'y0': 0
-          },
-          {
-            'x': 1416851460000,
-            'y': 39,
-            'y0': 0
-          },
-          {
-            'x': 1416851490000,
-            'y': 28,
-            'y0': 0
-          },
-          {
-            'x': 1416851520000,
-            'y': 28,
-            'y0': 0
-          },
-          {
-            'x': 1416851550000,
-            'y': 28,
-            'y0': 0
-          },
-          {
-            'x': 1416851580000,
-            'y': 30,
-            'y0': 0
-          },
-          {
-            'x': 1416851610000,
-            'y': 29,
-            'y0': 0
-          },
-          {
-            'x': 1416851640000,
-            'y': 30,
-            'y0': 0
-          },
-          {
-            'x': 1416851670000,
-            'y': 23,
-            'y0': 0
-          },
-          {
-            'x': 1416851700000,
-            'y': 23,
-            'y0': 0
-          },
-          {
-            'x': 1416851730000,
-            'y': 27,
-            'y0': 0
-          },
-          {
-            'x': 1416851760000,
-            'y': 21,
-            'y0': 0
-          },
-          {
-            'x': 1416851790000,
-            'y': 24,
-            'y0': 0
-          },
-          {
-            'x': 1416851820000,
-            'y': 26,
-            'y0': 0
-          },
-          {
-            'x': 1416851850000,
-            'y': 26,
-            'y0': 0
-          },
-          {
-            'x': 1416851880000,
-            'y': 21,
-            'y0': 0
-          },
-          {
-            'x': 1416851910000,
-            'y': 33,
-            'y0': 0
-          },
-          {
-            'x': 1416851940000,
-            'y': 23,
-            'y0': 0
-          },
-          {
-            'x': 1416851970000,
-            'y': 46,
-            'y0': 0
-          },
-          {
-            'x': 1416852000000,
-            'y': 27,
-            'y0': 0
-          },
-          {
-            'x': 1416852030000,
-            'y': 20,
-            'y0': 0
-          },
-          {
-            'x': 1416852060000,
-            'y': 34,
-            'y0': 0
-          },
-          {
-            'x': 1416852090000,
-            'y': 15,
-            'y0': 0
-          },
-          {
-            'x': 1416852120000,
-            'y': 18,
-            'y0': 0
-          }
-        ]
-      },
-      {
-        'label': 'css',
-        'values': [
-          {
-            'x': 1416850320000,
-            'y': 3,
-            'y0': 11
-          },
-          {
-            'x': 1416850350000,
-            'y': 13,
-            'y0': 24
-          },
-          {
-            'x': 1416850380000,
-            'y': 5,
-            'y0': 34
-          },
-          {
-            'x': 1416850410000,
-            'y': 12,
-            'y0': 21
-          },
-          {
-            'x': 1416850440000,
-            'y': 9,
-            'y0': 32
-          },
-          {
-            'x': 1416850470000,
-            'y': 12,
-            'y0': 24
-          },
-          {
-            'x': 1416850500000,
-            'y': 6,
-            'y0': 16
-          },
-          {
-            'x': 1416850530000,
-            'y': 6,
-            'y0': 27
-          },
-          {
-            'x': 1416850560000,
-            'y': 11,
-            'y0': 24
-          },
-          {
-            'x': 1416850590000,
-            'y': 11,
-            'y0': 38
-          },
-          {
-            'x': 1416850620000,
-            'y': 6,
-            'y0': 33
-          },
-          {
-            'x': 1416850650000,
-            'y': 8,
-            'y0': 33
-          },
-          {
-            'x': 1416850680000,
-            'y': 6,
-            'y0': 31
-          },
-          {
-            'x': 1416850710000,
-            'y': 4,
-            'y0': 24
-          },
-          {
-            'x': 1416850740000,
-            'y': 9,
-            'y0': 24
-          },
-          {
-            'x': 1416850770000,
-            'y': 3,
-            'y0': 38
-          },
-          {
-            'x': 1416850800000,
-            'y': 5,
-            'y0': 34
-          },
-          {
-            'x': 1416850830000,
-            'y': 6,
-            'y0': 30
-          },
-          {
-            'x': 1416850860000,
-            'y': 9,
-            'y0': 38
-          },
-          {
-            'x': 1416850890000,
-            'y': 5,
-            'y0': 19
-          },
-          {
-            'x': 1416850920000,
-            'y': 8,
-            'y0': 23
-          },
-          {
-            'x': 1416850950000,
-            'y': 9,
-            'y0': 33
-          },
-          {
-            'x': 1416850980000,
-            'y': 5,
-            'y0': 28
-          },
-          {
-            'x': 1416851010000,
-            'y': 6,
-            'y0': 24
-          },
-          {
-            'x': 1416851040000,
-            'y': 9,
-            'y0': 22
-          },
-          {
-            'x': 1416851070000,
-            'y': 9,
-            'y0': 28
-          },
-          {
-            'x': 1416851100000,
-            'y': 11,
-            'y0': 27
-          },
-          {
-            'x': 1416851130000,
-            'y': 5,
-            'y0': 32
-          },
-          {
-            'x': 1416851160000,
-            'y': 8,
-            'y0': 32
-          },
-          {
-            'x': 1416851190000,
-            'y': 6,
-            'y0': 30
-          },
-          {
-            'x': 1416851220000,
-            'y': 10,
-            'y0': 32
-          },
-          {
-            'x': 1416851250000,
-            'y': 5,
-            'y0': 36
-          },
-          {
-            'x': 1416851280000,
-            'y': 6,
-            'y0': 32
-          },
-          {
-            'x': 1416851310000,
-            'y': 4,
-            'y0': 29
-          },
-          {
-            'x': 1416851340000,
-            'y': 8,
-            'y0': 22
-          },
-          {
-            'x': 1416851370000,
-            'y': 3,
-            'y0': 29
-          },
-          {
-            'x': 1416851400000,
-            'y': 8,
-            'y0': 33
-          },
-          {
-            'x': 1416851430000,
-            'y': 10,
-            'y0': 28
-          },
-          {
-            'x': 1416851460000,
-            'y': 5,
-            'y0': 39
-          },
-          {
-            'x': 1416851490000,
-            'y': 7,
-            'y0': 28
-          },
-          {
-            'x': 1416851520000,
-            'y': 6,
-            'y0': 28
-          },
-          {
-            'x': 1416851550000,
-            'y': 4,
-            'y0': 28
-          },
-          {
-            'x': 1416851580000,
-            'y': 9,
-            'y0': 30
-          },
-          {
-            'x': 1416851610000,
-            'y': 3,
-            'y0': 29
-          },
-          {
-            'x': 1416851640000,
-            'y': 9,
-            'y0': 30
-          },
-          {
-            'x': 1416851670000,
-            'y': 6,
-            'y0': 23
-          },
-          {
-            'x': 1416851700000,
-            'y': 11,
-            'y0': 23
-          },
-          {
-            'x': 1416851730000,
-            'y': 4,
-            'y0': 27
-          },
-          {
-            'x': 1416851760000,
-            'y': 8,
-            'y0': 21
-          },
-          {
-            'x': 1416851790000,
-            'y': 5,
-            'y0': 24
-          },
-          {
-            'x': 1416851820000,
-            'y': 7,
-            'y0': 26
-          },
-          {
-            'x': 1416851850000,
-            'y': 7,
-            'y0': 26
-          },
-          {
-            'x': 1416851880000,
-            'y': 4,
-            'y0': 21
-          },
-          {
-            'x': 1416851910000,
-            'y': 8,
-            'y0': 33
-          },
-          {
-            'x': 1416851940000,
-            'y': 6,
-            'y0': 23
-          },
-          {
-            'x': 1416851970000,
-            'y': 6,
-            'y0': 46
-          },
-          {
-            'x': 1416852000000,
-            'y': 3,
-            'y0': 27
-          },
-          {
-            'x': 1416852030000,
-            'y': 6,
-            'y0': 20
-          },
-          {
-            'x': 1416852060000,
-            'y': 5,
-            'y0': 34
-          },
-          {
-            'x': 1416852090000,
-            'y': 5,
-            'y0': 15
-          },
-          {
-            'x': 1416852120000,
-            'y': 1,
-            'y0': 18
-          }
-        ]
-      },
-      {
-        'label': 'gif',
-        'values': [
-          {
-            'x': 1416850320000,
-            'y': 1,
-            'y0': 14
-          },
-          {
-            'x': 1416850350000,
-            'y': 2,
-            'y0': 37
-          },
-          {
-            'x': 1416850380000,
-            'y': 4,
-            'y0': 39
-          },
-          {
-            'x': 1416850410000,
-            'y': 2,
-            'y0': 33
-          },
-          {
-            'x': 1416850440000,
-            'y': 3,
-            'y0': 41
-          },
-          {
-            'x': 1416850470000,
-            'y': 1,
-            'y0': 36
-          },
-          {
-            'x': 1416850500000,
-            'y': 1,
-            'y0': 22
-          },
-          {
-            'x': 1416850530000,
-            'y': 1,
-            'y0': 33
-          },
-          {
-            'x': 1416850560000,
-            'y': 2,
-            'y0': 35
-          },
-          {
-            'x': 1416850590000,
-            'y': 5,
-            'y0': 49
-          },
-          {
-            'x': 1416850620000,
-            'y': 1,
-            'y0': 39
-          },
-          {
-            'x': 1416850650000,
-            'y': 1,
-            'y0': 41
-          },
-          {
-            'x': 1416850680000,
-            'y': 4,
-            'y0': 37
-          },
-          {
-            'x': 1416850710000,
-            'y': 1,
-            'y0': 28
-          },
-          {
-            'x': 1416850740000,
-            'y': 3,
-            'y0': 33
-          },
-          {
-            'x': 1416850770000,
-            'y': 2,
-            'y0': 41
-          },
-          {
-            'x': 1416850800000,
-            'y': 2,
-            'y0': 39
-          },
-          {
-            'x': 1416850830000,
-            'y': 5,
-            'y0': 36
-          },
-          {
-            'x': 1416850860000,
-            'y': 3,
-            'y0': 47
-          },
-          {
-            'x': 1416850890000,
-            'y': 1,
-            'y0': 24
-          },
-          {
-            'x': 1416850920000,
-            'y': 3,
-            'y0': 31
-          },
-          {
-            'x': 1416850950000,
-            'y': 4,
-            'y0': 42
-          },
-          {
-            'x': 1416850980000,
-            'y': 3,
-            'y0': 33
-          },
-          {
-            'x': 1416851010000,
-            'y': 5,
-            'y0': 30
-          },
-          {
-            'x': 1416851040000,
-            'y': 2,
-            'y0': 31
-          },
-          {
-            'x': 1416851070000,
-            'y': 3,
-            'y0': 37
-          },
-          {
-            'x': 1416851100000,
-            'y': 5,
-            'y0': 38
-          },
-          {
-            'x': 1416851130000,
-            'y': 3,
-            'y0': 37
-          },
-          {
-            'x': 1416851160000,
-            'y': 4,
-            'y0': 40
-          },
-          {
-            'x': 1416851190000,
-            'y': 9,
-            'y0': 36
-          },
-          {
-            'x': 1416851220000,
-            'y': 7,
-            'y0': 42
-          },
-          {
-            'x': 1416851250000,
-            'y': 2,
-            'y0': 41
-          },
-          {
-            'x': 1416851280000,
-            'y': 1,
-            'y0': 38
-          },
-          {
-            'x': 1416851310000,
-            'y': 2,
-            'y0': 33
-          },
-          {
-            'x': 1416851340000,
-            'y': 5,
-            'y0': 30
-          },
-          {
-            'x': 1416851370000,
-            'y': 3,
-            'y0': 32
-          },
-          {
-            'x': 1416851400000,
-            'y': 5,
-            'y0': 41
-          },
-          {
-            'x': 1416851430000,
-            'y': 4,
-            'y0': 38
-          },
-          {
-            'x': 1416851460000,
-            'y': 5,
-            'y0': 44
-          },
-          {
-            'x': 1416851490000,
-            'y': 2,
-            'y0': 35
-          },
-          {
-            'x': 1416851520000,
-            'y': 2,
-            'y0': 34
-          },
-          {
-            'x': 1416851550000,
-            'y': 4,
-            'y0': 32
-          },
-          {
-            'x': 1416851580000,
-            'y': 3,
-            'y0': 39
-          },
-          {
-            'x': 1416851610000,
-            'y': 4,
-            'y0': 32
-          },
-          {
-            'x': 1416851640000,
-            'y': 0,
-            'y0': 39
-          },
-          {
-            'x': 1416851670000,
-            'y': 2,
-            'y0': 29
-          },
-          {
-            'x': 1416851700000,
-            'y': 1,
-            'y0': 34
-          },
-          {
-            'x': 1416851730000,
-            'y': 3,
-            'y0': 31
-          },
-          {
-            'x': 1416851760000,
-            'y': 0,
-            'y0': 29
-          },
-          {
-            'x': 1416851790000,
-            'y': 4,
-            'y0': 29
-          },
-          {
-            'x': 1416851820000,
-            'y': 3,
-            'y0': 33
-          },
-          {
-            'x': 1416851850000,
-            'y': 3,
-            'y0': 33
-          },
-          {
-            'x': 1416851880000,
-            'y': 0,
-            'y0': 25
-          },
-          {
-            'x': 1416851910000,
-            'y': 0,
-            'y0': 41
-          },
-          {
-            'x': 1416851940000,
-            'y': 3,
-            'y0': 29
-          },
-          {
-            'x': 1416851970000,
-            'y': 3,
-            'y0': 52
-          },
-          {
-            'x': 1416852000000,
-            'y': 1,
-            'y0': 30
-          },
-          {
-            'x': 1416852030000,
-            'y': 5,
-            'y0': 26
-          },
-          {
-            'x': 1416852060000,
-            'y': 3,
-            'y0': 39
-          },
-          {
-            'x': 1416852090000,
-            'y': 1,
-            'y0': 20
-          },
-          {
-            'x': 1416852120000,
-            'y': 2,
-            'y0': 19
-          }
-        ]
-      },
-      {
-        'label': 'png',
-        'values': [
-          {
-            'x': 1416850320000,
-            'y': 1,
-            'y0': 15
-          },
-          {
-            'x': 1416850350000,
-            'y': 6,
-            'y0': 39
-          },
-          {
-            'x': 1416850380000,
-            'y': 6,
-            'y0': 43
-          },
-          {
-            'x': 1416850410000,
-            'y': 5,
-            'y0': 35
-          },
-          {
-            'x': 1416850440000,
-            'y': 3,
-            'y0': 44
-          },
-          {
-            'x': 1416850470000,
-            'y': 5,
-            'y0': 37
-          },
-          {
-            'x': 1416850500000,
-            'y': 6,
-            'y0': 23
-          },
-          {
-            'x': 1416850530000,
-            'y': 1,
-            'y0': 34
-          },
-          {
-            'x': 1416850560000,
-            'y': 3,
-            'y0': 37
-          },
-          {
-            'x': 1416850590000,
-            'y': 2,
-            'y0': 54
-          },
-          {
-            'x': 1416850620000,
-            'y': 1,
-            'y0': 40
-          },
-          {
-            'x': 1416850650000,
-            'y': 1,
-            'y0': 42
-          },
-          {
-            'x': 1416850680000,
-            'y': 2,
-            'y0': 41
-          },
-          {
-            'x': 1416850710000,
-            'y': 5,
-            'y0': 29
-          },
-          {
-            'x': 1416850740000,
-            'y': 7,
-            'y0': 36
-          },
-          {
-            'x': 1416850770000,
-            'y': 2,
-            'y0': 43
-          },
-          {
-            'x': 1416850800000,
-            'y': 3,
-            'y0': 41
-          },
-          {
-            'x': 1416850830000,
-            'y': 6,
-            'y0': 41
-          },
-          {
-            'x': 1416850860000,
-            'y': 2,
-            'y0': 50
-          },
-          {
-            'x': 1416850890000,
-            'y': 4,
-            'y0': 25
-          },
-          {
-            'x': 1416850920000,
-            'y': 2,
-            'y0': 34
-          },
-          {
-            'x': 1416850950000,
-            'y': 3,
-            'y0': 46
-          },
-          {
-            'x': 1416850980000,
-            'y': 8,
-            'y0': 36
-          },
-          {
-            'x': 1416851010000,
-            'y': 4,
-            'y0': 35
-          },
-          {
-            'x': 1416851040000,
-            'y': 4,
-            'y0': 33
-          },
-          {
-            'x': 1416851070000,
-            'y': 1,
-            'y0': 40
-          },
-          {
-            'x': 1416851100000,
-            'y': 2,
-            'y0': 43
-          },
-          {
-            'x': 1416851130000,
-            'y': 4,
-            'y0': 40
-          },
-          {
-            'x': 1416851160000,
-            'y': 3,
-            'y0': 44
-          },
-          {
-            'x': 1416851190000,
-            'y': 4,
-            'y0': 45
-          },
-          {
-            'x': 1416851220000,
-            'y': 2,
-            'y0': 49
-          },
-          {
-            'x': 1416851250000,
-            'y': 4,
-            'y0': 43
-          },
-          {
-            'x': 1416851280000,
-            'y': 8,
-            'y0': 39
-          },
-          {
-            'x': 1416851310000,
-            'y': 4,
-            'y0': 35
-          },
-          {
-            'x': 1416851340000,
-            'y': 4,
-            'y0': 35
-          },
-          {
-            'x': 1416851370000,
-            'y': 7,
-            'y0': 35
-          },
-          {
-            'x': 1416851400000,
-            'y': 2,
-            'y0': 46
-          },
-          {
-            'x': 1416851430000,
-            'y': 3,
-            'y0': 42
-          },
-          {
-            'x': 1416851460000,
-            'y': 3,
-            'y0': 49
-          },
-          {
-            'x': 1416851490000,
-            'y': 3,
-            'y0': 37
-          },
-          {
-            'x': 1416851520000,
-            'y': 4,
-            'y0': 36
-          },
-          {
-            'x': 1416851550000,
-            'y': 3,
-            'y0': 36
-          },
-          {
-            'x': 1416851580000,
-            'y': 4,
-            'y0': 42
-          },
-          {
-            'x': 1416851610000,
-            'y': 5,
-            'y0': 36
-          },
-          {
-            'x': 1416851640000,
-            'y': 3,
-            'y0': 39
-          },
-          {
-            'x': 1416851670000,
-            'y': 3,
-            'y0': 31
-          },
-          {
-            'x': 1416851700000,
-            'y': 2,
-            'y0': 35
-          },
-          {
-            'x': 1416851730000,
-            'y': 5,
-            'y0': 34
-          },
-          {
-            'x': 1416851760000,
-            'y': 4,
-            'y0': 29
-          },
-          {
-            'x': 1416851790000,
-            'y': 5,
-            'y0': 33
-          },
-          {
-            'x': 1416851820000,
-            'y': 1,
-            'y0': 36
-          },
-          {
-            'x': 1416851850000,
-            'y': 3,
-            'y0': 36
-          },
-          {
-            'x': 1416851880000,
-            'y': 6,
-            'y0': 25
-          },
-          {
-            'x': 1416851910000,
-            'y': 4,
-            'y0': 41
-          },
-          {
-            'x': 1416851940000,
-            'y': 7,
-            'y0': 32
-          },
-          {
-            'x': 1416851970000,
-            'y': 5,
-            'y0': 55
-          },
-          {
-            'x': 1416852000000,
-            'y': 2,
-            'y0': 31
-          },
-          {
-            'x': 1416852030000,
-            'y': 2,
-            'y0': 31
-          },
-          {
-            'x': 1416852060000,
-            'y': 4,
-            'y0': 42
-          },
-          {
-            'x': 1416852090000,
-            'y': 6,
-            'y0': 21
-          },
-          {
-            'x': 1416852120000,
-            'y': 2,
-            'y0': 21
-          }
-        ]
-      },
-      {
-        'label': 'php',
-        'values': [
-          {
-            'x': 1416850320000,
-            'y': 0,
-            'y0': 16
-          },
-          {
-            'x': 1416850350000,
-            'y': 1,
-            'y0': 45
-          },
-          {
-            'x': 1416850380000,
-            'y': 0,
-            'y0': 49
-          },
-          {
-            'x': 1416850410000,
-            'y': 2,
-            'y0': 40
-          },
-          {
-            'x': 1416850440000,
-            'y': 0,
-            'y0': 47
-          },
-          {
-            'x': 1416850470000,
-            'y': 0,
-            'y0': 42
-          },
-          {
-            'x': 1416850500000,
-            'y': 3,
-            'y0': 29
-          },
-          {
-            'x': 1416850530000,
-            'y': 1,
-            'y0': 35
-          },
-          {
-            'x': 1416850560000,
-            'y': 3,
-            'y0': 40
-          },
-          {
-            'x': 1416850590000,
-            'y': 2,
-            'y0': 56
-          },
-          {
-            'x': 1416850620000,
-            'y': 2,
-            'y0': 41
-          },
-          {
-            'x': 1416850650000,
-            'y': 5,
-            'y0': 43
-          },
-          {
-            'x': 1416850680000,
-            'y': 2,
-            'y0': 43
-          },
-          {
-            'x': 1416850710000,
-            'y': 1,
-            'y0': 34
-          },
-          {
-            'x': 1416850740000,
-            'y': 2,
-            'y0': 43
-          },
-          {
-            'x': 1416850770000,
-            'y': 2,
-            'y0': 45
-          },
-          {
-            'x': 1416850800000,
-            'y': 1,
-            'y0': 44
-          },
-          {
-            'x': 1416850830000,
-            'y': 1,
-            'y0': 47
-          },
-          {
-            'x': 1416850860000,
-            'y': 1,
-            'y0': 52
-          },
-          {
-            'x': 1416850890000,
-            'y': 1,
-            'y0': 29
-          },
-          {
-            'x': 1416850920000,
-            'y': 2,
-            'y0': 36
-          },
-          {
-            'x': 1416850950000,
-            'y': 2,
-            'y0': 49
-          },
-          {
-            'x': 1416850980000,
-            'y': 0,
-            'y0': 44
-          },
-          {
-            'x': 1416851010000,
-            'y': 3,
-            'y0': 39
-          },
-          {
-            'x': 1416851040000,
-            'y': 2,
-            'y0': 37
-          },
-          {
-            'x': 1416851070000,
-            'y': 2,
-            'y0': 41
-          },
-          {
-            'x': 1416851100000,
-            'y': 2,
-            'y0': 45
-          },
-          {
-            'x': 1416851130000,
-            'y': 0,
-            'y0': 44
-          },
-          {
-            'x': 1416851160000,
-            'y': 1,
-            'y0': 47
-          },
-          {
-            'x': 1416851190000,
-            'y': 2,
-            'y0': 49
-          },
-          {
-            'x': 1416851220000,
-            'y': 4,
-            'y0': 51
-          },
-          {
-            'x': 1416851250000,
-            'y': 0,
-            'y0': 47
-          },
-          {
-            'x': 1416851280000,
-            'y': 3,
-            'y0': 47
-          },
-          {
-            'x': 1416851310000,
-            'y': 3,
-            'y0': 39
-          },
-          {
-            'x': 1416851340000,
-            'y': 2,
-            'y0': 39
-          },
-          {
-            'x': 1416851370000,
-            'y': 2,
-            'y0': 42
-          },
-          {
-            'x': 1416851400000,
-            'y': 3,
-            'y0': 48
-          },
-          {
-            'x': 1416851430000,
-            'y': 1,
-            'y0': 45
-          },
-          {
-            'x': 1416851460000,
-            'y': 0,
-            'y0': 52
-          },
-          {
-            'x': 1416851490000,
-            'y': 2,
-            'y0': 40
-          },
-          {
-            'x': 1416851520000,
-            'y': 1,
-            'y0': 40
-          },
-          {
-            'x': 1416851550000,
-            'y': 3,
-            'y0': 39
-          },
-          {
-            'x': 1416851580000,
-            'y': 1,
-            'y0': 46
-          },
-          {
-            'x': 1416851610000,
-            'y': 2,
-            'y0': 41
-          },
-          {
-            'x': 1416851640000,
-            'y': 1,
-            'y0': 42
-          },
-          {
-            'x': 1416851670000,
-            'y': 2,
-            'y0': 34
-          },
-          {
-            'x': 1416851700000,
-            'y': 3,
-            'y0': 37
-          },
-          {
-            'x': 1416851730000,
-            'y': 1,
-            'y0': 39
-          },
-          {
-            'x': 1416851760000,
-            'y': 1,
-            'y0': 33
-          },
-          {
-            'x': 1416851790000,
-            'y': 1,
-            'y0': 38
-          },
-          {
-            'x': 1416851820000,
-            'y': 1,
-            'y0': 37
-          },
-          {
-            'x': 1416851850000,
-            'y': 1,
-            'y0': 39
-          },
-          {
-            'x': 1416851880000,
-            'y': 1,
-            'y0': 31
-          },
-          {
-            'x': 1416851910000,
-            'y': 2,
-            'y0': 45
-          },
-          {
-            'x': 1416851940000,
-            'y': 0,
-            'y0': 39
-          },
-          {
-            'x': 1416851970000,
-            'y': 0,
-            'y0': 60
-          },
-          {
-            'x': 1416852000000,
-            'y': 1,
-            'y0': 33
-          },
-          {
-            'x': 1416852030000,
-            'y': 2,
-            'y0': 33
-          },
-          {
-            'x': 1416852060000,
-            'y': 1,
-            'y0': 46
-          },
-          {
-            'x': 1416852090000,
-            'y': 1,
-            'y0': 27
-          },
-          {
-            'x': 1416852120000,
-            'y': 0,
-            'y0': 23
-          }
-        ]
-      }
-    ],
-    'hits': 2595,
-    'xAxisFormatter': function (thing) {
-      return moment(thing);
-    },
-    'tooltipFormatter': function (d) {
-      return d;
-    }
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/terms/_columns.js b/test/unit/specs/vislib/fixture/mock_data/terms/_columns.js
deleted file mode 100644
index 6889cdddf2caf..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/terms/_columns.js
+++ /dev/null
@@ -1,144 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return {
-    'columns': [
-      {
-        'label': 'logstash: index',
-        'xAxisLabel': 'Top 5 extension',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'jpg',
-                'y': 110710
-              },
-              {
-                'x': 'css',
-                'y': 27376
-              },
-              {
-                'x': 'png',
-                'y': 16664
-              },
-              {
-                'x': 'gif',
-                'y': 11264
-              },
-              {
-                'x': 'php',
-                'y': 5448
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      },
-      {
-        'label': '2014.11.12: index',
-        'xAxisLabel': 'Top 5 extension',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'jpg',
-                'y': 110643
-              },
-              {
-                'x': 'css',
-                'y': 27350
-              },
-              {
-                'x': 'png',
-                'y': 16648
-              },
-              {
-                'x': 'gif',
-                'y': 11257
-              },
-              {
-                'x': 'php',
-                'y': 5440
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      },
-      {
-        'label': '2014.11.11: index',
-        'xAxisLabel': 'Top 5 extension',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'jpg',
-                'y': 67
-              },
-              {
-                'x': 'css',
-                'y': 26
-              },
-              {
-                'x': 'png',
-                'y': 16
-              },
-              {
-                'x': 'gif',
-                'y': 7
-              },
-              {
-                'x': 'php',
-                'y': 8
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      }
-    ],
-    'hits': 171462
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/terms/_rows.js b/test/unit/specs/vislib/fixture/mock_data/terms/_rows.js
deleted file mode 100644
index 2b9c9a2307545..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/terms/_rows.js
+++ /dev/null
@@ -1,99 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return {
-    'rows': [
-      {
-        'label': '0.0-1000.0: bytes',
-        'xAxisLabel': 'Top 5 extension',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'jpg',
-                'y': 3378
-              },
-              {
-                'x': 'css',
-                'y': 762
-              },
-              {
-                'x': 'png',
-                'y': 527
-              },
-              {
-                'x': 'gif',
-                'y': 11258
-              },
-              {
-                'x': 'php',
-                'y': 653
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      },
-      {
-        'label': '1000.0-2000.0: bytes',
-        'xAxisLabel': 'Top 5 extension',
-        'yAxisLabel': 'Count of documents',
-        'series': [
-          {
-            'values': [
-              {
-                'x': 'jpg',
-                'y': 6422
-              },
-              {
-                'x': 'css',
-                'y': 1591
-              },
-              {
-                'x': 'png',
-                'y': 430
-              },
-              {
-                'x': 'gif',
-                'y': 8
-              },
-              {
-                'x': 'php',
-                'y': 561
-              }
-            ]
-          }
-        ],
-        'xAxisFormatter': function (val) {
-          if (_.isObject(val)) {
-            return JSON.stringify(val);
-          }
-          else if (val == null) {
-            return '';
-          }
-          else {
-            return '' + val;
-          }
-        },
-        'tooltipFormatter': function (d) {
-          return d;
-        }
-      }
-    ],
-    'hits': 171458
-  };
-});
diff --git a/test/unit/specs/vislib/fixture/mock_data/terms/_series.js b/test/unit/specs/vislib/fixture/mock_data/terms/_series.js
deleted file mode 100644
index 32df18dd99f67..0000000000000
--- a/test/unit/specs/vislib/fixture/mock_data/terms/_series.js
+++ /dev/null
@@ -1,50 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  return {
-    'label': '',
-    'xAxisLabel': 'Top 5 extension',
-    'yAxisLabel': 'Count of documents',
-    'series': [
-      {
-        'values': [
-          {
-            'x': 'jpg',
-            'y': 110710
-          },
-          {
-            'x': 'css',
-            'y': 27389
-          },
-          {
-            'x': 'png',
-            'y': 16661
-          },
-          {
-            'x': 'gif',
-            'y': 11269
-          },
-          {
-            'x': 'php',
-            'y': 5447
-          }
-        ]
-      }
-    ],
-    'hits': 171476,
-    'xAxisFormatter': function (val) {
-      if (_.isObject(val)) {
-        return JSON.stringify(val);
-      }
-      else if (val == null) {
-        return '';
-      }
-      else {
-        return '' + val;
-      }
-    },
-    'tooltipFormatter': function (d) {
-      return d;
-    }
-  };
-});
diff --git a/test/unit/specs/vislib/index.js b/test/unit/specs/vislib/index.js
deleted file mode 100644
index bbacd0641041e..0000000000000
--- a/test/unit/specs/vislib/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  var angular = require('angular');
-
-  angular.module('kibana/vislib', ['kibana']);
-
-  describe('VisLib Index Test Suite', function () {
-    var visLib;
-
-    beforeEach(function () {
-      module('kibana/vislib');
-    });
-
-    beforeEach(function () {
-      inject(function (d3, vislib) {
-        visLib = vislib;
-      });
-    });
-
-    it('should return an object', function () {
-      expect(_.isObject(visLib)).to.be(true);
-    });
-
-    it('should return a Vis function', function () {
-      expect(_.isFunction(visLib.Vis)).to.be(true);
-    });
-  });
-});
diff --git a/test/unit/specs/vislib/lib/axis_title.js b/test/unit/specs/vislib/lib/axis_title.js
deleted file mode 100644
index f0ac3d1be3065..0000000000000
--- a/test/unit/specs/vislib/lib/axis_title.js
+++ /dev/null
@@ -1,137 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-  var $ = require('jquery');
-
-  angular.module('AxisTitleFactory', ['kibana']);
-
-  describe('Vislib AxisTitle Class Test Suite', function () {
-    var AxisTitle;
-    var Data;
-    var axisTitle;
-    var el;
-    var dataObj;
-    var xTitle;
-    var yTitle;
-    var data = {
-      hits: 621,
-      label: '',
-      ordered: {
-        date: true,
-        interval: 30000,
-        max: 1408734982458,
-        min: 1408734082458
-      },
-      series: [
-        {
-          values: [
-            {
-              x: 1408734060000,
-              y: 8
-            },
-            {
-              x: 1408734090000,
-              y: 23
-            },
-            {
-              x: 1408734120000,
-              y: 30
-            },
-            {
-              x: 1408734150000,
-              y: 28
-            },
-            {
-              x: 1408734180000,
-              y: 36
-            },
-            {
-              x: 1408734210000,
-              y: 30
-            },
-            {
-              x: 1408734240000,
-              y: 26
-            },
-            {
-              x: 1408734270000,
-              y: 22
-            },
-            {
-              x: 1408734300000,
-              y: 29
-            },
-            {
-              x: 1408734330000,
-              y: 24
-            }
-          ]
-        }
-      ],
-      xAxisLabel: 'Date Histogram',
-      yAxisLabel: 'Count'
-    };
-
-    beforeEach(function () {
-      module('AxisTitleFactory');
-    });
-
-    beforeEach(function () {
-      inject(function (d3, Private) {
-        AxisTitle = Private(require('components/vislib/lib/axis_title'));
-        Data = Private(require('components/vislib/lib/data'));
-
-        el = d3.select('body').append('div')
-          .attr('class', 'vis-wrapper');
-
-        el.append('div')
-          .attr('class', 'y-axis-title')
-          .style('height', '20px')
-          .style('width', '20px');
-
-        el.append('div')
-          .attr('class', 'x-axis-title')
-          .style('height', '20px')
-          .style('width', '20px');
-
-
-        dataObj = new Data(data, {});
-        xTitle = dataObj.get('xAxisLabel');
-        yTitle = dataObj.get('yAxisLabel');
-        axisTitle = new AxisTitle($('.vis-wrapper')[0], xTitle, yTitle);
-      });
-    });
-
-    afterEach(function () {
-      el.remove();
-    });
-
-    describe('render Method', function () {
-      beforeEach(function () {
-        axisTitle.render();
-      });
-
-      it('should append an svg to div', function () {
-        expect(el.select('.x-axis-title').selectAll('svg').length).to.be(1);
-        expect(el.select('.y-axis-title').selectAll('svg').length).to.be(1);
-      });
-
-      it('should append a g element to the svg', function () {
-        expect(el.select('.x-axis-title').selectAll('svg').select('g').length).to.be(1);
-        expect(el.select('.y-axis-title').selectAll('svg').select('g').length).to.be(1);
-      });
-
-      it('should append text', function () {
-        expect(!!el.select('.x-axis-title').selectAll('svg').selectAll('text')).to.be(true);
-        expect(!!el.select('.y-axis-title').selectAll('svg').selectAll('text')).to.be(true);
-      });
-    });
-
-    describe('draw Method', function () {
-      it('should be a function', function () {
-        expect(_.isFunction(axisTitle.draw())).to.be(true);
-      });
-    });
-
-  });
-});
diff --git a/test/unit/specs/vislib/lib/chart_title.js b/test/unit/specs/vislib/lib/chart_title.js
deleted file mode 100644
index 6698d5a75ab23..0000000000000
--- a/test/unit/specs/vislib/lib/chart_title.js
+++ /dev/null
@@ -1,120 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-  var $ = require('jquery');
-
-  angular.module('ChartTitleFactory', ['kibana']);
-
-  describe('Vislib ChartTitle Class Test Suite', function () {
-    var ChartTitle;
-    var Data;
-    var chartTitle;
-    var el;
-    var dataObj;
-    var data = {
-      hits: 621,
-      label: '',
-      ordered: {
-        date: true,
-        interval: 30000,
-        max: 1408734982458,
-        min: 1408734082458
-      },
-      series: [
-        {
-          values: [
-            {
-              x: 1408734060000,
-              y: 8
-            },
-            {
-              x: 1408734090000,
-              y: 23
-            },
-            {
-              x: 1408734120000,
-              y: 30
-            },
-            {
-              x: 1408734150000,
-              y: 28
-            },
-            {
-              x: 1408734180000,
-              y: 36
-            },
-            {
-              x: 1408734210000,
-              y: 30
-            },
-            {
-              x: 1408734240000,
-              y: 26
-            },
-            {
-              x: 1408734270000,
-              y: 22
-            },
-            {
-              x: 1408734300000,
-              y: 29
-            },
-            {
-              x: 1408734330000,
-              y: 24
-            }
-          ]
-        }
-      ],
-      xAxisLabel: 'Date Histogram',
-      yAxisLabel: 'Count'
-    };
-
-    beforeEach(function () {
-      module('ChartTitleFactory');
-    });
-
-    beforeEach(function () {
-      inject(function (d3, Private) {
-        ChartTitle = Private(require('components/vislib/lib/chart_title'));
-        Data = Private(require('components/vislib/lib/data'));
-
-        el = d3.select('body').append('div')
-          .attr('class', 'vis-wrapper')
-          .datum(data);
-
-        el.append('div')
-          .attr('class', 'chart-title')
-          .style('height', '20px');
-
-        dataObj = new Data(data, {});
-        chartTitle = new ChartTitle($('.vis-wrapper')[0], 'rows');
-      });
-    });
-
-    afterEach(function () {
-      el.remove();
-    });
-
-    describe('render Method', function () {
-      beforeEach(function () {
-        chartTitle.render();
-      });
-
-      it('should append an svg to div', function () {
-        expect(el.select('.chart-title').selectAll('svg').length).to.be(1);
-      });
-
-      it('should append text', function () {
-        expect(!!el.select('.chart-title').selectAll('svg').selectAll('text')).to.be(true);
-      });
-    });
-
-    describe('draw Method', function () {
-      it('should be a function', function () {
-        expect(_.isFunction(chartTitle.draw())).to.be(true);
-      });
-    });
-
-  });
-});
diff --git a/test/unit/specs/vislib/lib/data.js b/test/unit/specs/vislib/lib/data.js
deleted file mode 100644
index 19f02d2a3e88c..0000000000000
--- a/test/unit/specs/vislib/lib/data.js
+++ /dev/null
@@ -1,421 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-
-  var Data;
-  var dataSeries = require('vislib_fixtures/mock_data/date_histogram/_series');
-  var dataSeriesNeg = require('vislib_fixtures/mock_data/date_histogram/_series_neg');
-  var dataStacked = require('vislib_fixtures/mock_data/stacked/_stacked');
-
-  var seriesData = {
-    'label': '',
-    'series': [
-      {
-        'label': '100',
-        'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-      }
-    ]
-  };
-
-  var rowsData = {
-    'rows': [
-      {
-        'label': 'a',
-        'series': [
-          {
-            'label': '100',
-            'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-          }
-        ]
-      },
-      {
-        'label': 'b',
-        'series': [
-          {
-            'label': '300',
-            'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-          }
-        ]
-      },
-      {
-        'label': 'c',
-        'series': [
-          {
-            'label': '100',
-            'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-          }
-        ]
-      },
-      {
-        'label': 'd',
-        'series': [
-          {
-            'label': '200',
-            'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-          }
-        ]
-      }
-    ]
-  };
-
-  var colsData = {
-    'columns': [
-      {
-        'label': 'a',
-        'series': [
-          {
-            'label': '100',
-            'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-          }
-        ]
-      },
-      {
-        'label': 'b',
-        'series': [
-          {
-            'label': '300',
-            'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-          }
-        ]
-      },
-      {
-        'label': 'c',
-        'series': [
-          {
-            'label': '100',
-            'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-          }
-        ]
-      },
-      {
-        'label': 'd',
-        'series': [
-          {
-            'label': '200',
-            'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-          }
-        ]
-      }
-    ]
-  };
-
-  angular.module('DataFactory', ['kibana']);
-
-  describe('Vislib Data Class Test Suite', function () {
-
-    beforeEach(function () {
-      module('DataFactory');
-
-      inject(function (Private) {
-        Data = Private(require('components/vislib/lib/data'));
-      });
-    });
-
-    describe('Data Class (main)', function () {
-      it('should be a function', function () {
-        expect(_.isFunction(Data)).to.be(true);
-      });
-
-      it('should return an object', function () {
-        var rowIn = new Data(rowsData, {});
-        expect(_.isObject(rowIn)).to.be(true);
-      });
-
-      it('should update label in series data', function () {
-        var seriesDataWithoutLabelInSeries = {
-          'label': '',
-          'series': [
-            {
-              'label': '',
-              'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-            }
-          ],
-          'yAxisLabel': 'customLabel'
-        };
-        var modifiedData = new Data(seriesDataWithoutLabelInSeries, {});
-        expect(modifiedData.data.series[0].label).to.be('customLabel');
-      });
-
-      it('should update label in row data', function () {
-        var seriesDataWithoutLabelInRow = {
-          'rows': [
-            {
-              'label': '',
-              'series': [
-                {
-                  'label': '',
-                  'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-                }
-              ],
-              'yAxisLabel': 'customLabel'
-            },
-            {
-              'label': '',
-              'series': [
-                {
-                  'label': '',
-                  'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-                }
-              ],
-              'yAxisLabel': 'customLabel'
-            }
-          ],
-        };
-
-        var modifiedData = new Data(seriesDataWithoutLabelInRow, {});
-        expect(modifiedData.data.rows[0].series[0].label).to.be('customLabel');
-        expect(modifiedData.data.rows[1].series[0].label).to.be('customLabel');
-      });
-
-      it('should update label in column data', function () {
-        var seriesDataWithoutLabelInRow = {
-          'columns': [
-            {
-              'label': '',
-              'series': [
-                {
-                  'label': '',
-                  'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-                }
-              ],
-              'yAxisLabel': 'customLabel'
-            },
-            {
-              'label': '',
-              'series': [
-                {
-                  'label': '',
-                  'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
-                }
-              ],
-              'yAxisLabel': 'customLabel'
-            }
-          ],
-          'yAxisLabel': 'customLabel'
-        };
-
-        var modifiedData = new Data(seriesDataWithoutLabelInRow, {});
-        expect(modifiedData.data.columns[0].series[0].label).to.be('customLabel');
-        expect(modifiedData.data.columns[1].series[0].label).to.be('customLabel');
-      });
-    });
-
-
-    describe('_removeZeroSlices', function () {
-      var data;
-      var pieData = {
-        slices: {
-          children: [
-            {size: 30},
-            {size: 20},
-            {size: 0}
-          ]
-        }
-      };
-
-      beforeEach(function () {
-        data = new Data(pieData, {});
-      });
-
-      it('should remove zero values', function () {
-        var slices = data._removeZeroSlices(data.data.slices);
-        expect(slices.children.length).to.be(2);
-      });
-    });
-
-    describe('Data.flatten', function () {
-      var serIn;
-      var rowIn;
-      var colIn;
-      var serOut;
-      var rowOut;
-      var colOut;
-
-      beforeEach(function () {
-        serIn = new Data(seriesData, {});
-        rowIn = new Data(rowsData, {});
-        colIn = new Data(colsData, {});
-        serOut = serIn.flatten();
-        rowOut = rowIn.flatten();
-        colOut = colIn.flatten();
-      });
-
-      it('should return an array of value objects from every series', function () {
-        expect(serOut.every(_.isObject)).to.be(true);
-      });
-
-      it('should return all points from every series', testLength(seriesData));
-      it('should return all points from every series', testLength(rowsData));
-      it('should return all points from every series', testLength(colsData));
-
-      function testLength(inputData) {
-        return function () {
-          var data = new Data(inputData, {});
-          var len = _.reduce(data.chartData(), function (sum, chart) {
-            return sum + chart.series.reduce(function (sum, series) {
-              return sum + series.values.length;
-            }, 0);
-          }, 0);
-
-          expect(data.flatten()).to.have.length(len);
-        };
-      }
-    });
-
-    describe('getYMin method', function () {
-      var visData;
-      var visDataNeg;
-      var visDataStacked;
-      var minValue = 4;
-      var minValueNeg = -41;
-      var minValueStacked = 15;
-
-      beforeEach(function () {
-        visData = new Data(dataSeries, {});
-        visDataNeg = new Data(dataSeriesNeg, {});
-        visDataStacked = new Data(dataStacked, { type: 'histogram' });
-      });
-
-      // The first value in the time series is less than the min date in the
-      // date range. It also has the largest y value. This value should be excluded
-      // when calculating the Y max value since it falls outside of the range.
-      it('should return the Y domain min value', function () {
-        expect(visData.getYMin()).to.be(minValue);
-        expect(visDataNeg.getYMin()).to.be(minValueNeg);
-        expect(visDataStacked.getYMin()).to.be(minValueStacked);
-      });
-
-      it('should have a minimum date value that is greater than the max value within the date range', function () {
-        var series = _.pluck(visData.chartData(), 'series');
-        var stackedSeries = _.pluck(visDataStacked.chartData(), 'series');
-        expect(_.min(series.values, function (d) { return d.x; })).to.be.greaterThan(minValue);
-        expect(_.min(stackedSeries.values, function (d) { return d.x; })).to.be.greaterThan(minValueStacked);
-      });
-
-      it('allows passing a value getter for manipulating the values considered', function () {
-        var realMin = visData.getYMin();
-        var multiplier = 13.2;
-        expect(visData.getYMin(function (d) { return d.y * multiplier; })).to.be(realMin * multiplier);
-      });
-    });
-
-    describe('getYMax method', function () {
-      var visData;
-      var visDataNeg;
-      var visDataStacked;
-      var maxValue = 41;
-      var maxValueNeg = -4;
-      var maxValueStacked = 115;
-
-      beforeEach(function () {
-        visData = new Data(dataSeries, {});
-        visDataNeg = new Data(dataSeriesNeg, {});
-        visDataStacked = new Data(dataStacked, { type: 'histogram' });
-      });
-
-      // The first value in the time series is less than the min date in the
-      // date range. It also has the largest y value. This value should be excluded
-      // when calculating the Y max value since it falls outside of the range.
-      it('should return the Y domain min value', function () {
-        expect(visData.getYMax()).to.be(maxValue);
-        expect(visDataNeg.getYMax()).to.be(maxValueNeg);
-        expect(visDataStacked.getYMax()).to.be(maxValueStacked);
-      });
-
-      it('should have a minimum date value that is greater than the max value within the date range', function () {
-        var series = _.pluck(visData.chartData(), 'series');
-        var stackedSeries = _.pluck(visDataStacked.chartData(), 'series');
-        expect(_.min(series, function (d) { return d.x; })).to.be.greaterThan(maxValue);
-        expect(_.min(stackedSeries, function (d) { return d.x; })).to.be.greaterThan(maxValueStacked);
-      });
-
-      it('allows passing a value getter for manipulating the values considered', function () {
-        var realMax = visData.getYMax();
-        var multiplier = 13.2;
-        expect(visData.getYMax(function (d) { return d.y * multiplier; })).to.be(realMax * multiplier);
-      });
-    });
-
-    describe('geohashGrid methods', function () {
-      var data;
-      var geohashGridData = {
-        hits: 3954,
-        rows: [{
-          title: 'Top 5 _type: apache',
-          label: 'Top 5 _type: apache',
-          geoJson: {
-            type: 'FeatureCollection',
-            features: [],
-            properties: {
-              min: 2,
-              max: 331,
-              zoom: 3,
-              center: [
-                47.517200697839414,
-                -112.06054687499999
-              ]
-            }
-          }
-        }, {
-          title: 'Top 5 _type: nginx',
-          label: 'Top 5 _type: nginx',
-          geoJson: {
-            type: 'FeatureCollection',
-            features: [],
-            properties: {
-              min: 1,
-              max: 88,
-              zoom: 3,
-              center: [
-                47.517200697839414,
-                -112.06054687499999
-              ]
-            }
-          }
-        }]
-      };
-
-      beforeEach(function () {
-        data = new Data(geohashGridData, {});
-      });
-
-      describe('getVisData', function () {
-        it('should return the rows property', function () {
-          var visData = data.getVisData();
-          expect(visData).to.eql(geohashGridData.rows);
-        });
-      });
-
-      describe('getGeoExtents', function () {
-        it('should return the min and max geoJson properties', function () {
-          var minMax = data.getGeoExtents();
-          expect(minMax.min).to.be(1);
-          expect(minMax.max).to.be(331);
-        });
-      });
-    });
-
-    describe('null value check', function () {
-      it('should return false', function () {
-        var data = new Data(rowsData, {});
-        expect(data.hasNullValues()).to.be(false);
-      });
-
-      it('should return true', function () {
-        var nullRowData = { rows: rowsData.rows.slice(0) };
-        nullRowData.rows.push({
-          'label': 'e',
-          'series': [
-            {
-              'label': '200',
-              'values': [{x: 0, y: 1}, {x: 1, y: null}, {x: 2, y: 3}]
-            }
-          ]
-        });
-
-        var data = new Data(nullRowData, {});
-        expect(data.hasNullValues()).to.be(true);
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/vislib/lib/dispatch.js b/test/unit/specs/vislib/lib/dispatch.js
deleted file mode 100644
index ec3ae226215a3..0000000000000
--- a/test/unit/specs/vislib/lib/dispatch.js
+++ /dev/null
@@ -1,155 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var d3 = require('d3');
-
-  // Data
-  var data = require('vislib_fixtures/mock_data/date_histogram/_series');
-
-  angular.module('DispatchClass', ['kibana']);
-
-  describe('VisLib Dispatch Class Test Suite', function () {
-
-    function destroyVis(vis) {
-      $(vis.el).remove();
-      vis = null;
-    }
-
-    function getEls(el, n, type) {
-      return d3.select(el).data(new Array(n)).enter().append(type);
-    }
-
-    describe('', function () {
-      var vis;
-      var SimpleEmitter;
-
-      beforeEach(module('AreaChartFactory'));
-      beforeEach(inject(function (Private) {
-        vis = Private(require('vislib_fixtures/_vis_fixture'))();
-        vis.render(data);
-        SimpleEmitter = require('utils/SimpleEmitter');
-      }));
-
-      afterEach(function () {
-        destroyVis(vis);
-      });
-
-      it('extends the SimpleEmitter class', function () {
-        var events = _.pluck(vis.handler.charts, 'events');
-        expect(events.length).to.be.above(0);
-        events.forEach(function (dispatch) {
-          expect(dispatch).to.be.a(SimpleEmitter);
-        });
-      });
-    });
-
-    describe('Stock event handlers', function () {
-      var vis;
-
-      beforeEach(module('AreaChartFactory'));
-      beforeEach(inject(function (Private) {
-        vis = Private(require('vislib_fixtures/_vis_fixture'))();
-        require('css!components/vislib/styles/main');
-
-        vis.on('brush', _.noop);
-
-        vis.render(data);
-      }));
-
-      afterEach(function () {
-        destroyVis(vis);
-      });
-
-      describe('addEvent method', function () {
-        it('returns a function that binds the passed event to a selection', function () {
-          var chart = _.first(vis.handler.charts);
-          var apply = chart.events.addEvent('event', _.noop);
-          expect(apply).to.be.a('function');
-
-          var els = getEls(vis.el, 3, 'div');
-          apply(els);
-          els.each(function () {
-            expect(d3.select(this).on('event')).to.be(_.noop);
-          });
-        });
-      });
-
-      // test the addHoverEvent, addClickEvent, addBrushEvent methods by
-      // checking that they return function which bind the events expected
-      function checkBoundAddMethod(name, event) {
-        describe(name + ' method', function () {
-          it('should be a function', function () {
-            vis.handler.charts.forEach(function (chart) {
-              expect(chart.events[name]).to.be.a('function');
-            });
-          });
-
-          it('returns a function that binds ' + event + ' events to a selection', function () {
-            var chart = _.first(vis.handler.charts);
-            var apply = chart.events[name](d3.select(document.createElement('svg')));
-            expect(apply).to.be.a('function');
-
-            var els = getEls(vis.el, 3, 'div');
-            apply(els);
-            els.each(function () {
-              expect(d3.select(this).on(event)).to.be.a('function');
-            });
-          });
-        });
-      }
-
-      checkBoundAddMethod('addHoverEvent', 'mouseover');
-      checkBoundAddMethod('addMouseoutEvent', 'mouseout');
-      checkBoundAddMethod('addClickEvent', 'click');
-      checkBoundAddMethod('addBrushEvent', 'mousedown');
-
-      describe('addMousePointer method', function () {
-        it('should be a function', function () {
-          vis.handler.charts.forEach(function (chart) {
-            var pointer = chart.events.addMousePointer;
-
-            expect(_.isFunction(pointer)).to.be(true);
-          });
-        });
-      });
-    });
-
-    describe('Custom event handlers', function () {
-      it('should attach whatever gets passed on vis.on() to chart.events', function (done) {
-        var vis;
-        var chart;
-        module('AreaChartFactory');
-        inject(function (Private) {
-          vis = Private(require('vislib_fixtures/_vis_fixture'))();
-          vis.on('someEvent', _.noop);
-          vis.render(data);
-
-          vis.handler.charts.forEach(function (chart) {
-            expect(chart.events.listenerCount('someEvent')).to.be(1);
-          });
-
-          destroyVis(vis);
-          done();
-        });
-      });
-
-      it('can be added after rendering', function () {
-        var vis;
-        var chart;
-        module('AreaChartFactory');
-        inject(function (Private) {
-          vis = Private(require('vislib_fixtures/_vis_fixture'))();
-          vis.render(data);
-          vis.on('someEvent', _.noop);
-
-          vis.handler.charts.forEach(function (chart) {
-            expect(chart.events.listenerCount('someEvent')).to.be(1);
-          });
-
-          destroyVis(vis);
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/vislib/lib/error_handler.js b/test/unit/specs/vislib/lib/error_handler.js
deleted file mode 100644
index 30835c39c671b..0000000000000
--- a/test/unit/specs/vislib/lib/error_handler.js
+++ /dev/null
@@ -1,42 +0,0 @@
-define(function (require) {
-
-  var angular = require('angular');
-  angular.module('ErrorHandlerFactory', ['kibana']);
-
-  describe('VisLib ErrorHandler Test Suite', function () {
-    var ErrorHandler;
-    var errorHandler;
-
-    beforeEach(function () {
-      module('ErrorHandlerFactory');
-    });
-
-    beforeEach(function () {
-      inject(function (Private) {
-        ErrorHandler = Private(require('components/vislib/lib/_error_handler'));
-        errorHandler = new ErrorHandler();
-      });
-    });
-
-    describe('validateWidthandHeight Method', function () {
-      it('should throw an error when width and/or height is 0', function () {
-        expect(function () {
-          errorHandler.validateWidthandHeight(0, 200);
-        }).to.throwError();
-        expect(function () {
-          errorHandler.validateWidthandHeight(200, 0);
-        }).to.throwError();
-      });
-
-      it('should throw an error when width and/or height is NaN', function () {
-        expect(function () {
-          errorHandler.validateWidthandHeight(null, 200);
-        }).to.throwError();
-        expect(function () {
-          errorHandler.validateWidthandHeight(200, null);
-        }).to.throwError();
-      });
-    });
-
-  });
-});
diff --git a/test/unit/specs/vislib/lib/handler/handler.js b/test/unit/specs/vislib/lib/handler/handler.js
deleted file mode 100644
index 2bc968f622193..0000000000000
--- a/test/unit/specs/vislib/lib/handler/handler.js
+++ /dev/null
@@ -1,143 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var $ = require('jquery');
-
-  // Data
-  var series = require('vislib_fixtures/mock_data/date_histogram/_series');
-  var columns = require('vislib_fixtures/mock_data/date_histogram/_columns');
-  var rows = require('vislib_fixtures/mock_data/date_histogram/_rows');
-  var stackedSeries = require('vislib_fixtures/mock_data/date_histogram/_stacked_series');
-  var dateHistogramArray = [
-    series,
-    columns,
-    rows,
-    stackedSeries
-  ];
-  var names = [
-    'series',
-    'columns',
-    'rows',
-    'stackedSeries'
-  ];
-
-  angular.module('HandlerBaseClass', ['kibana']);
-
-  dateHistogramArray.forEach(function (data, i) {
-    describe('VisLib Handler Test Suite for ' + names[i] + ' Data', function () {
-      var Handler;
-      var vis;
-      var events;
-
-      beforeEach(function () {
-        module('HandlerBaseClass');
-      });
-
-      beforeEach(function () {
-        inject(function (Private) {
-          Handler = Private(require('components/vislib/lib/handler/handler'));
-          vis = Private(require('vislib_fixtures/_vis_fixture'))();
-          require('css!components/vislib/styles/main');
-
-          events = [
-            'click',
-            'brush'
-          ];
-
-          vis.render(data);
-        });
-      });
-
-      afterEach(function () {
-        $(vis.el).remove();
-        vis = null;
-      });
-
-      describe('render Method', function () {
-        it('should render charts', function () {
-          expect(vis.handler.charts.length).to.be.greaterThan(0);
-          vis.handler.charts.forEach(function (chart) {
-            expect($(chart.chartEl).find('svg').length).to.be(1);
-          });
-        });
-      });
-
-      describe('enable Method', function () {
-        var charts;
-
-        beforeEach(function () {
-          charts = vis.handler.charts;
-
-          charts.forEach(function (chart) {
-            events.forEach(function (event) {
-              vis.handler.enable(event, chart);
-            });
-          });
-        });
-
-        it('should add events to chart and emit to the Events class', function () {
-          charts.forEach(function (chart) {
-            events.forEach(function (event) {
-              expect(chart.events.listenerCount(event)).to.be.above(0);
-            });
-          });
-        });
-      });
-
-      describe('disable Method', function () {
-        var charts;
-
-        beforeEach(function () {
-          charts = vis.handler.charts;
-
-          charts.forEach(function (chart) {
-            events.forEach(function (event) {
-              vis.handler.disable(event, chart);
-            });
-          });
-        });
-
-        it('should remove events from the chart', function () {
-          charts.forEach(function (chart) {
-            events.forEach(function (event) {
-              expect(chart.events.listenerCount(event)).to.be(0);
-            });
-          });
-        });
-
-      });
-
-      describe('removeAll Method', function () {
-        beforeEach(function () {
-          inject(function () {
-            vis.handler.removeAll(vis.el);
-          });
-        });
-
-        it('should remove all DOM elements from the el', function () {
-          expect($(vis.el).children().length).to.be(0);
-        });
-      });
-
-      describe('error Method', function () {
-        beforeEach(function () {
-          vis.handler.error('This is an error!');
-        });
-
-        it('should return an error classed DOM element with a text message', function () {
-          expect($(vis.el).find('.error').length).to.be(1);
-          expect($('.error h4').html()).to.be('This is an error!');
-        });
-      });
-
-      describe('destroy Method', function () {
-        beforeEach(function () {
-          vis.handler.destroy();
-        });
-
-        it('should destroy all the charts in the visualization', function () {
-          expect(vis.handler.charts.length).to.be(0);
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/vislib/lib/layout/layout.js b/test/unit/specs/vislib/lib/layout/layout.js
deleted file mode 100644
index cea1cf0ba2983..0000000000000
--- a/test/unit/specs/vislib/lib/layout/layout.js
+++ /dev/null
@@ -1,150 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var $ = require('jquery');
-
-  // Data
-  var series = require('vislib_fixtures/mock_data/date_histogram/_series');
-  var columns = require('vislib_fixtures/mock_data/date_histogram/_columns');
-  var rows = require('vislib_fixtures/mock_data/date_histogram/_rows');
-  var stackedSeries = require('vislib_fixtures/mock_data/date_histogram/_stacked_series');
-  var dateHistogramArray = [
-    series,
-    columns,
-    rows,
-    stackedSeries
-  ];
-  var names = [
-    'series',
-    'columns',
-    'rows',
-    'stackedSeries'
-  ];
-
-  angular.module('LayoutFactory', ['kibana']);
-
-  dateHistogramArray.forEach(function (data, i) {
-    describe('Vislib Layout Class Test Suite for ' + names[i] + ' Data', function () {
-      var Layout;
-      var vis;
-      var numberOfCharts;
-      var testLayout;
-
-      beforeEach(function () {
-        module('LayoutFactory');
-        module('XAxisSplitFactory');
-      });
-
-      beforeEach(function () {
-        inject(function (d3, Private) {
-          Layout = Private(require('components/vislib/lib/layout/layout'));
-          vis = Private(require('vislib_fixtures/_vis_fixture'))();
-          require('css!components/vislib/styles/main');
-
-          vis.render(data);
-          numberOfCharts = vis.handler.charts.length;
-        });
-      });
-
-      afterEach(function () {
-        $(vis.el).remove();
-        vis = null;
-      });
-
-      describe('createLayout Method', function () {
-        it('should append all the divs', function () {
-          expect($(vis.el).find('.vis-wrapper').length).to.be(1);
-          expect($(vis.el).find('.y-axis-col-wrapper').length).to.be(1);
-          expect($(vis.el).find('.vis-col-wrapper').length).to.be(1);
-          expect($(vis.el).find('.legend-col-wrapper').length).to.be(1);
-          expect($(vis.el).find('.y-axis-col').length).to.be(1);
-          expect($(vis.el).find('.y-axis-title').length).to.be(1);
-          expect($(vis.el).find('.y-axis-div-wrapper').length).to.be(1);
-          expect($(vis.el).find('.y-axis-spacer-block').length).to.be(1);
-          expect($(vis.el).find('.chart-wrapper').length).to.be(numberOfCharts);
-          expect($(vis.el).find('.x-axis-wrapper').length).to.be(1);
-          expect($(vis.el).find('.x-axis-div-wrapper').length).to.be(1);
-          expect($(vis.el).find('.x-axis-title').length).to.be(1);
-        });
-      });
-
-      describe('layout Method', function () {
-        beforeEach(function () {
-          testLayout = new Layout(vis.el, vis.data, 'histogram');
-        });
-
-        it('should append a div with the correct class name', function () {
-          expect($(vis.el).find('.chart').length).to.be(numberOfCharts);
-        });
-
-        it('should bind data to the DOM element', function () {
-          expect(!!$(vis.el).find('.chart').data()).to.be(true);
-        });
-
-        it('should create children', function () {
-          expect(typeof $(vis.el).find('.x-axis-div')).to.be('object');
-        });
-
-        it('should call split function when provided', function () {
-          expect(typeof $(vis.el).find('.x-axis-div')).to.be('object');
-        });
-
-        it('should throw errors when incorrect arguments provided', function () {
-          expect(function () {
-            testLayout.layout({
-              parent: vis.el,
-              type: undefined,
-              class: 'chart'
-            });
-          }).to.throwError();
-
-          expect(function () {
-            testLayout.layout({
-              type: 'div',
-              class: 'chart'
-            });
-          }).to.throwError();
-
-          expect(function () {
-            testLayout.layout({
-              parent: 'histogram',
-              type: 'div'
-            });
-          }).to.throwError();
-
-          expect(function () {
-            testLayout.layout({
-              parent: vis.el,
-              type: function (d) { return d; },
-              class: 'chart'
-            });
-          }).to.throwError();
-        });
-      });
-
-      describe('appendElem Method', function () {
-        beforeEach(function () {
-          vis.handler.layout.appendElem(vis.el, 'svg', 'column');
-          vis.handler.layout.appendElem('.visualize-chart', 'div', 'test');
-        });
-
-        it('should append DOM element to el with a class name', function () {
-          expect(typeof $(vis.el).find('.column')).to.be('object');
-          expect(typeof $(vis.el).find('.test')).to.be('object');
-        });
-      });
-
-      describe('removeAll Method', function () {
-        beforeEach(function () {
-          inject(function (d3) {
-            d3.select(vis.el).append('div').attr('class', 'visualize');
-            vis.handler.layout.removeAll(vis.el);
-          });
-        });
-
-        it('should remove all DOM elements from the el', function () {
-          expect($(vis.el).children().length).to.be(0);
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/vislib/lib/layout/layout_types.js b/test/unit/specs/vislib/lib/layout/layout_types.js
deleted file mode 100644
index 0ffa73846e789..0000000000000
--- a/test/unit/specs/vislib/lib/layout/layout_types.js
+++ /dev/null
@@ -1,31 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-
-  angular.module('LayoutTypeFactory', ['kibana']);
-
-  describe('Vislib Layout Types Test Suite', function () {
-    var layoutType;
-    var layoutFunc;
-
-    beforeEach(function () {
-      module('LayoutTypeFactory');
-    });
-
-    beforeEach(function () {
-      inject(function (d3, Private) {
-        layoutType = Private(require('components/vislib/lib/layout/layout_types'));
-        layoutFunc = layoutType.histogram;
-      });
-    });
-
-    it('should be an object', function () {
-      expect(_.isObject(layoutType)).to.be(true);
-    });
-
-    it('should return a function', function () {
-      expect(typeof layoutFunc).to.be('function');
-    });
-  });
-
-});
diff --git a/test/unit/specs/vislib/lib/layout/splits/column_chart/splits.js b/test/unit/specs/vislib/lib/layout/splits/column_chart/splits.js
deleted file mode 100644
index c69461440c342..0000000000000
--- a/test/unit/specs/vislib/lib/layout/splits/column_chart/splits.js
+++ /dev/null
@@ -1,278 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var $ = require('jquery');
-
-  angular.module('ChartSplitFactory', ['kibana']);
-  angular.module('ChartTitleSplitFactory', ['kibana']);
-  angular.module('XAxisSplitFactory', ['kibana']);
-  angular.module('YAxisSplitFactory', ['kibana']);
-
-  describe('Vislib Split Function Test Suite', function () {
-    describe('Column Chart', function () {
-      var chartSplit;
-      var chartTitleSplit;
-      var xAxisSplit;
-      var yAxisSplit;
-      var el;
-      var data = {
-        rows: [
-          {
-            hits      : 621,
-            label     : '',
-            ordered   : {
-              date    : true,
-              interval: 30000,
-              max     : 1408734982458,
-              min     : 1408734082458
-            },
-            series    : [
-              {
-                values: [
-                  {
-                    x: 1408734060000,
-                    y: 8
-                  },
-                  {
-                    x: 1408734090000,
-                    y: 23
-                  },
-                  {
-                    x: 1408734120000,
-                    y: 30
-                  },
-                  {
-                    x: 1408734150000,
-                    y: 28
-                  },
-                  {
-                    x: 1408734180000,
-                    y: 36
-                  },
-                  {
-                    x: 1408734210000,
-                    y: 30
-                  },
-                  {
-                    x: 1408734240000,
-                    y: 26
-                  },
-                  {
-                    x: 1408734270000,
-                    y: 22
-                  },
-                  {
-                    x: 1408734300000,
-                    y: 29
-                  },
-                  {
-                    x: 1408734330000,
-                    y: 24
-                  }
-                ]
-              }
-            ],
-            xAxisLabel: 'Date Histogram',
-            yAxisLabel: 'Count'
-          },
-          {
-            hits      : 621,
-            label     : '',
-            ordered   : {
-              date    : true,
-              interval: 30000,
-              max     : 1408734982458,
-              min     : 1408734082458
-            },
-            series    : [
-              {
-                values: [
-                  {
-                    x: 1408734060000,
-                    y: 8
-                  },
-                  {
-                    x: 1408734090000,
-                    y: 23
-                  },
-                  {
-                    x: 1408734120000,
-                    y: 30
-                  },
-                  {
-                    x: 1408734150000,
-                    y: 28
-                  },
-                  {
-                    x: 1408734180000,
-                    y: 36
-                  },
-                  {
-                    x: 1408734210000,
-                    y: 30
-                  },
-                  {
-                    x: 1408734240000,
-                    y: 26
-                  },
-                  {
-                    x: 1408734270000,
-                    y: 22
-                  },
-                  {
-                    x: 1408734300000,
-                    y: 29
-                  },
-                  {
-                    x: 1408734330000,
-                    y: 24
-                  }
-                ]
-              }
-            ],
-            xAxisLabel: 'Date Histogram',
-            yAxisLabel: 'Count'
-          }
-        ]
-      };
-
-      beforeEach(function () {
-        module('ChartSplitFactory');
-        module('ChartTitleSplitFactory');
-        module('XAxisSplitFactory');
-        module('YAxisSplitFactory');
-      });
-
-      beforeEach(function () {
-        inject(function (d3, Private) {
-          chartSplit = Private(require('components/vislib/lib/layout/splits/column_chart/chart_split'));
-          chartTitleSplit = Private(require('components/vislib/lib/layout/splits/column_chart/chart_title_split'));
-          xAxisSplit = Private(require('components/vislib/lib/layout/splits/column_chart/x_axis_split'));
-          yAxisSplit = Private(require('components/vislib/lib/layout/splits/column_chart/y_axis_split'));
-
-          el = d3.select('body').append('div')
-            .attr('class', 'visualization')
-            .datum(data);
-        });
-      });
-
-      afterEach(function () {
-        el.remove();
-      });
-
-      describe('chart split function', function () {
-        var fixture;
-
-        beforeEach(function () {
-          inject(function (d3) {
-            fixture = d3.select('.visualization').call(chartSplit);
-          });
-        });
-
-        afterEach(function () {
-          fixture.remove();
-        });
-
-        it('should append the correct number of divs', function () {
-          expect($('.chart').length).to.be(2);
-        });
-
-        it('should add the correct class name', function () {
-          expect(!!$('.chart-wrapper-row').length).to.be(true);
-        });
-      });
-
-      describe('chart title split function', function () {
-        var newEl;
-        var fixture;
-
-        beforeEach(function () {
-          inject(function (d3) {
-            el.append('div').attr('class', 'x-axis-chart-title');
-            el.append('div').attr('class', 'y-axis-chart-title');
-            d3.select('.x-axis-chart-title').call(chartTitleSplit);
-            d3.select('.y-axis-chart-title').call(chartTitleSplit);
-
-            newEl = d3.select('body').append('div')
-              .attr('class', 'series')
-              .datum({ series: []});
-
-            newEl.append('div').attr('class', 'x-axis-chart-title');
-            newEl.append('div').attr('class', 'y-axis-chart-title');
-            newEl.select('.x-axis-chart-title').call(chartTitleSplit);
-            newEl.select('.y-axis-chart-title').call(chartTitleSplit);
-
-            fixture = newEl.selectAll(this.childNodes)[0].length;
-          });
-        });
-
-        afterEach(function () {
-          newEl.remove();
-        });
-
-        it('should append the correct number of divs', function () {
-          expect($('.chart-title').length).to.be(2);
-        });
-
-        it('should remove the correct div', function () {
-          expect($('.y-axis-chart-title').length).to.be(1);
-          expect($('.x-axis-chart-title').length).to.be(0);
-        });
-
-        it('should remove all chart title divs when only one chart is rendered', function () {
-          expect(fixture).to.be(0);
-        });
-      });
-
-      describe('x axis split function', function () {
-        var fixture;
-        var divs;
-
-        beforeEach(function () {
-          inject(function (d3) {
-            fixture = d3.select('body').append('div')
-              .attr('class', 'columns')
-              .datum({ columns: [{}, {}] });
-            d3.select('.columns').call(xAxisSplit);
-            divs = d3.selectAll('.x-axis-div')[0];
-          });
-        });
-
-        afterEach(function () {
-          fixture.remove();
-          $(divs).remove();
-        });
-
-        it('should append the correct number of divs', function () {
-          expect(divs.length).to.be(2);
-        });
-      });
-
-      describe('y axis split function', function () {
-        var fixture;
-        var divs;
-
-        beforeEach(function () {
-          inject(function (d3) {
-            fixture = d3.select('body').append('div')
-              .attr('class', 'rows')
-              .datum({ rows: [{}, {}] });
-
-            d3.select('.rows').call(yAxisSplit);
-
-            divs = d3.selectAll('.y-axis-div')[0];
-          });
-        });
-
-        afterEach(function () {
-          fixture.remove();
-          $(divs).remove();
-        });
-
-        it('should append the correct number of divs', function () {
-          expect(divs.length).to.be(2);
-        });
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/vislib/lib/layout/types/column_layout.js b/test/unit/specs/vislib/lib/layout/types/column_layout.js
deleted file mode 100644
index ff98f2816a68e..0000000000000
--- a/test/unit/specs/vislib/lib/layout/types/column_layout.js
+++ /dev/null
@@ -1,96 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-
-  angular.module('ColumnLayoutFactory', ['kibana']);
-
-  describe('Vislib Column Layout Test Suite', function () {
-    var layoutType;
-    var columnLayout;
-    var el;
-    var data = {
-      hits: 621,
-      label: '',
-      ordered: {
-        date: true,
-        interval: 30000,
-        max: 1408734982458,
-        min: 1408734082458
-      },
-      series: [
-        {
-          values: [
-            {
-              x: 1408734060000,
-              y: 8
-            },
-            {
-              x: 1408734090000,
-              y: 23
-            },
-            {
-              x: 1408734120000,
-              y: 30
-            },
-            {
-              x: 1408734150000,
-              y: 28
-            },
-            {
-              x: 1408734180000,
-              y: 36
-            },
-            {
-              x: 1408734210000,
-              y: 30
-            },
-            {
-              x: 1408734240000,
-              y: 26
-            },
-            {
-              x: 1408734270000,
-              y: 22
-            },
-            {
-              x: 1408734300000,
-              y: 29
-            },
-            {
-              x: 1408734330000,
-              y: 24
-            }
-          ]
-        }
-      ],
-      xAxisLabel: 'Date Histogram',
-      yAxisLabel: 'Count'
-    };
-
-    beforeEach(function () {
-      module('ColumnLayoutFactory');
-    });
-
-    beforeEach(function () {
-      inject(function (d3, Private) {
-        layoutType = Private(require('components/vislib/lib/layout/layout_types'));
-        el = d3.select('body').append('div').attr('class', 'visualization');
-        columnLayout = layoutType.histogram(el, data);
-      });
-    });
-
-    afterEach(function () {
-      el.remove();
-    });
-
-    it('should return an array of objects', function () {
-      expect(_.isArray(columnLayout)).to.be(true);
-      expect(_.isObject(columnLayout[0])).to.be(true);
-    });
-
-    it('should throw an error when the wrong number or no arguments provided', function () {
-      expect(function () { layoutType.histogram(el); }).to.throwError();
-    });
-  });
-
-});
diff --git a/test/unit/specs/vislib/lib/legend.js b/test/unit/specs/vislib/lib/legend.js
deleted file mode 100644
index f21bb7f56aee5..0000000000000
--- a/test/unit/specs/vislib/lib/legend.js
+++ /dev/null
@@ -1,130 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-  var $ = require('jquery');
-
-  var slices = require('vislib_fixtures/mock_data/histogram/_slices');
-  var stackedSeries = require('vislib_fixtures/mock_data/date_histogram/_stacked_series');
-  var histogramSlices = require('vislib_fixtures/mock_data/histogram/_slices');
-
-  var dataArray = [
-    stackedSeries,
-    slices,
-    histogramSlices,
-    stackedSeries,
-    stackedSeries
-  ];
-
-  var chartTypes = [
-    'histogram',
-    'pie',
-    'pie',
-    'area',
-    'line'
-  ];
-
-  var chartSelectors = {
-    histogram: '.chart rect',
-    pie: '.chart path',
-    area: '.chart path',
-    line: '.chart circle'
-  };
-
-  angular.module('LegendFactory', ['kibana']);
-
-  dataArray.forEach(function (data, i) {
-    describe('Vislib Legend Class Test Suite for ' + chartTypes[i] + ' data', function () {
-      var visLibParams = {
-        type: chartTypes[i],
-        addLegend: true
-      };
-      var Legend;
-      var vis;
-      var $el;
-
-      beforeEach(function () {
-        module('LegendFactory');
-      });
-
-      beforeEach(function () {
-        inject(function (Private, d3) {
-          vis = Private(require('vislib_fixtures/_vis_fixture'))(visLibParams);
-          Legend = Private(require('components/vislib/lib/legend'));
-          require('css!components/vislib/styles/main');
-          $el = d3.select('body').append('div').attr('class', 'fake-legend');
-
-          vis.render(data);
-        });
-      });
-
-      afterEach(function () {
-        $(vis.el).remove();
-        $('.fake-legend').remove();
-        vis = null;
-      });
-
-      describe('legend item label matches vis item label', function () {
-        it('should match the slice label', function () {
-          var chartType = chartTypes[i];
-          var paths = $(vis.el).find(chartSelectors[chartType]).toArray();
-          var items = vis.handler.legend.labels;
-
-          items.forEach(function (d) {
-            var path = _.find(paths, function (path) {
-              return path.getAttribute('data-label') === String(d.label);
-            });
-
-            expect(path).to.be.ok();
-          });
-        });
-      });
-
-      describe('header method', function () {
-        it('should append the legend header', function () {
-          expect($(vis.el).find('.header').length).to.be(1);
-          expect($(vis.el).find('.column-labels').length).to.be(1);
-        });
-      });
-
-      describe('list method', function () {
-        it('should append the legend list', function () {
-          expect($(vis.el).find('.legend-ul').length).to.be(1);
-        });
-        it('should contain a list of items', function () {
-          expect($(vis.el).find('li').length).to.be.greaterThan(1);
-        });
-        it('should not return an undefined value', function () {
-          var emptyObject = {
-            label: ''
-          };
-          var labels = [emptyObject, emptyObject, emptyObject];
-          var args = {
-            _attr: {isOpen: true},
-            color: function () { return 'blue'; }
-          };
-
-          Legend.prototype._list($el, labels, args);
-
-          $el.selectAll('li').each(function (d) {
-            expect(d.label).not.to.be(undefined);
-          });
-        });
-      });
-
-      describe('render method', function () {
-        it('should create a legend toggle', function () {
-          expect($('.legend-toggle').length).to.be(1);
-        });
-
-        it('should have an onclick listener', function () {
-          expect(!!$('.legend-toggle')[0].__onclick).to.be(true);
-          expect(!!$('li.color')[0].__onclick).to.be(true);
-        });
-
-        it('should attach onmouseover listener', function () {
-          expect(!!$('li.color')[0].__onmouseover).to.be(true);
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/vislib/lib/resize_checker.js b/test/unit/specs/vislib/lib/resize_checker.js
deleted file mode 100644
index 5f7542c405eaa..0000000000000
--- a/test/unit/specs/vislib/lib/resize_checker.js
+++ /dev/null
@@ -1,201 +0,0 @@
-define(function (require) {
-  describe('Vislib Resize Checker', function () {
-    var $ = require('jquery');
-    var _ = require('lodash');
-    var Promise = require('bluebird');
-
-    var sinon = require('test_utils/auto_release_sinon');
-    require('test_utils/no_digest_promises').activateForSuite();
-
-    var ResizeChecker;
-    var EventEmitter;
-    var checker;
-    var reflowWatcher;
-    var reflowSpies = {};
-
-    beforeEach(module('kibana'));
-
-    beforeEach(inject(function (Private) {
-      window.DISABLE_RESIZE_CHECKER = false;
-      ResizeChecker = Private(require('components/vislib/lib/resize_checker'));
-      EventEmitter = Private(require('factories/events'));
-      reflowWatcher = Private(require('components/reflow_watcher'));
-      reflowSpies.on = sinon.spy(reflowWatcher, 'on');
-      reflowSpies.off = sinon.spy(reflowWatcher, 'off');
-
-      var $el = $(document.createElement('div'))
-      .appendTo('body')
-      .css('visibility', 'hidden')
-      .get(0);
-
-      checker = new ResizeChecker($el);
-    }));
-
-    afterEach(function () {
-      window.DISABLE_RESIZE_CHECKER = true;
-      checker.$el.remove();
-      checker.destroy();
-    });
-
-    describe('basic functionality', function () {
-      it('is an event emitter', function () {
-        expect(checker).to.be.a(EventEmitter);
-      });
-
-      it('listens for the "reflow" event of the reflowWatchers', function () {
-        expect(reflowSpies.on).to.have.property('callCount', 1);
-        var call = reflowSpies.on.getCall(0);
-        expect(call.args[0]).to.be('reflow');
-      });
-
-      it('emits a "resize" event when the el is resized', function (done) {
-        checker.on('resize', function () {
-          done();
-        });
-
-        checker.$el.text('haz contents');
-        checker.check();
-      });
-    });
-
-    describe('#read', function () {
-      it('gets the proper dimensions for the element', function () {
-        var dimensions = checker.read();
-        var windowWidth = document.documentElement.clientWidth;
-
-        expect(dimensions.w).to.equal(windowWidth);
-        expect(dimensions.h).to.equal(0);
-      });
-    });
-
-    describe('#saveSize', function () {
-      it('calls #read() when no arg is passed', function () {
-        var stub = sinon.stub(checker, 'read').returns({});
-
-        checker.saveSize();
-
-        expect(stub).to.have.property('callCount', 1);
-      });
-
-      it('saves the size of the element', function () {
-        var football = {};
-        checker.saveSize(football);
-        expect(checker).to.have.property('_savedSize', football);
-      });
-
-      it('returns false if the size matches the previous value', function () {
-        expect(checker.saveSize(checker._savedSize)).to.be(false);
-      });
-
-      it('returns true if the size is different than previous value', function () {
-        expect(checker.saveSize({})).to.be(true);
-      });
-    });
-
-    describe('#check()', function () {
-      var emit;
-
-      beforeEach(function () {
-        emit = sinon.stub(checker, 'emit');
-
-        // prevent the checker from auto-checking
-        checker.destroy();
-        checker.startSchedule = checker.continueSchedule = _.noop;
-      });
-
-      it('does not emit "resize" immediately after a resize, but waits for changes to stop', function () {
-        expect(checker).to.have.property('_isDirty', false);
-
-        checker.$el.css('height', 100);
-        checker.check();
-
-        expect(checker).to.have.property('_isDirty', true);
-        expect(emit).to.have.property('callCount', 0);
-
-        // no change in el size
-        checker.check();
-
-        expect(checker).to.have.property('_isDirty', false);
-        expect(emit).to.have.property('callCount', 1);
-      });
-
-      it('emits "resize" based on MS_MAX_RESIZE_DELAY, even if el\'s constantly changing size', function () {
-        var steps = _.random(5, 10);
-        this.slow(steps * 10);
-
-        // we are going to fake the delay using the fake clock
-        var msStep = Math.floor(ResizeChecker.MS_MAX_RESIZE_DELAY / (steps - 1));
-        var clock = sinon.useFakeTimers();
-
-        _.times(steps, function step(i) {
-          checker.$el.css('height', 100 + i);
-          checker.check();
-
-          expect(checker).to.have.property('_isDirty', true);
-          expect(emit).to.have.property('callCount', i > steps ? 1 : 0);
-
-          clock.tick(msStep); // move the clock forward one step
-        });
-
-      });
-    });
-
-    describe('#destroy()', function () {
-      it('removes the "reflow" event from the reflowWatcher', function () {
-        var onCall = reflowSpies.on.getCall(0);
-        var handler = onCall.args[1];
-
-        checker.destroy();
-        expect(reflowSpies.off).to.have.property('callCount', 1);
-        expect(reflowSpies.off.calledWith('reflow', handler)).to.be.ok();
-      });
-
-      it('clears the timeout', function () {
-        var spy = sinon.spy(window, 'clearTimeout');
-        checker.destroy();
-        expect(spy).to.have.property('callCount', 1);
-      });
-    });
-
-    describe('scheduling', function () {
-      var clock;
-      var schedule;
-
-      beforeEach(function () {
-        // prevent the checker from running automatically
-        checker.destroy();
-        clock = sinon.useFakeTimers();
-
-        schedule = [];
-        _.times(25, function () {
-          schedule.push(_.random(3, 250));
-        });
-      });
-
-      it('walks the schedule, using each value as it\'s next timeout', function () {
-        var timerId = checker.startSchedule(schedule);
-
-        // start at 0 even though "start" used the first slot, we will still check it
-        for (var i = 0; i < schedule.length; i++) {
-          expect(clock.timeouts[timerId]).to.have.property('callAt', schedule[i]);
-          timerId = checker.continueSchedule();
-        }
-      });
-
-      it('repeats the last value in the schedule', function () {
-        var timerId = checker.startSchedule(schedule);
-
-        // start at 1, and go until there is one left
-        for (var i = 1; i < schedule.length - 1; i++) {
-          timerId = checker.continueSchedule();
-        }
-
-        var last = _.last(schedule);
-        _.times(5, function () {
-          var timer = clock.timeouts[checker.continueSchedule()];
-          expect(timer).to.have.property('callAt', last);
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/vislib/lib/x_axis.js b/test/unit/specs/vislib/lib/x_axis.js
deleted file mode 100644
index de5ab11167751..0000000000000
--- a/test/unit/specs/vislib/lib/x_axis.js
+++ /dev/null
@@ -1,231 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-  var $ = require('jquery');
-
-  angular.module('XAxisFactory', ['kibana']);
-
-  describe('Vislib xAxis Class Test Suite', function () {
-    var XAxis;
-    var Data;
-    var xAxis;
-    var el;
-    var fixture;
-    var dataObj;
-    var data = {
-      hits: 621,
-      label: '',
-      ordered: {
-        date: true,
-        interval: 30000,
-        max: 1408734982458,
-        min: 1408734082458
-      },
-      series: [
-        {
-          values: [
-            {
-              x: 1408734060000,
-              y: 8
-            },
-            {
-              x: 1408734090000,
-              y: 23
-            },
-            {
-              x: 1408734120000,
-              y: 30
-            },
-            {
-              x: 1408734150000,
-              y: 28
-            },
-            {
-              x: 1408734180000,
-              y: 36
-            },
-            {
-              x: 1408734210000,
-              y: 30
-            },
-            {
-              x: 1408734240000,
-              y: 26
-            },
-            {
-              x: 1408734270000,
-              y: 22
-            },
-            {
-              x: 1408734300000,
-              y: 29
-            },
-            {
-              x: 1408734330000,
-              y: 24
-            }
-          ]
-        }
-      ],
-      xAxisFormatter: function (thing) {
-        return new Date(thing);
-      },
-      xAxisLabel: 'Date Histogram',
-      yAxisLabel: 'Count'
-    };
-
-    beforeEach(function () {
-      module('XAxisFactory');
-    });
-
-    beforeEach(function () {
-      inject(function (d3, Private) {
-        Data = Private(require('components/vislib/lib/data'));
-        XAxis = Private(require('components/vislib/lib/x_axis'));
-
-        el = d3.select('body').append('div')
-          .attr('class', 'x-axis-wrapper')
-          .style('height', '40px');
-
-        fixture = el.append('div')
-          .attr('class', 'x-axis-div');
-
-        dataObj = new Data(data, {});
-        xAxis = new XAxis({
-          el: $('.x-axis-div')[0],
-          xValues: dataObj.xValues(),
-          ordered: dataObj.get('ordered'),
-          xAxisFormatter: dataObj.get('xAxisFormatter'),
-          _attr: {
-            margin: { top: 0, right: 0, bottom: 0, left: 0 }
-          }
-        });
-      });
-    });
-
-    afterEach(function () {
-      fixture.remove();
-      el.remove();
-    });
-
-    describe('render Method', function () {
-      beforeEach(function () {
-        xAxis.render();
-      });
-
-      it('should append an svg to div', function () {
-        expect(el.selectAll('svg').length).to.be(1);
-      });
-
-      it('should append a g element to the svg', function () {
-        expect(el.selectAll('svg').select('g').length).to.be(1);
-      });
-
-      it('should append ticks with text', function () {
-        expect(!!el.selectAll('svg').selectAll('.tick text')).to.be(true);
-      });
-    });
-
-    describe('getScale, getDomain, getTimeDomain, getOrdinalDomain, and getRange Methods', function () {
-      var ordered;
-      var timeScale;
-      var timeDomain;
-      var ordinalScale;
-      var ordinalDomain;
-      var width;
-      var range;
-
-      beforeEach(function () {
-        timeScale = xAxis.getScale();
-        timeDomain = xAxis.getDomain(timeScale);
-        range = xAxis.getRange(timeDomain, width);
-        xAxis.ordered = {};
-        ordinalScale = xAxis.getScale();
-        ordinalDomain = ordinalScale.domain(['this', 'should', 'be', 'an', 'array']);
-        width = $('.x-axis-div').width();
-      });
-
-      it('should return a function', function () {
-        expect(_.isFunction(timeScale)).to.be(true);
-        expect(_.isFunction(ordinalScale)).to.be(true);
-      });
-
-      it('should return the correct domain', function () {
-        expect(_.isDate(timeDomain.domain()[0])).to.be(true);
-        expect(_.isDate(timeDomain.domain()[1])).to.be(true);
-      });
-
-      it('should return the min and max dates', function () {
-        expect(timeDomain.domain()[0].toDateString()).to.be(new Date(1408734060000).toDateString());
-        expect(timeDomain.domain()[1].toDateString()).to.be(new Date(1408734330000).toDateString());
-      });
-
-      it('should return an ordinal scale', function () {
-        expect(ordinalDomain.domain()[0]).to.be('this');
-        expect(ordinalDomain.domain()[4]).to.be('array');
-      });
-
-      it('should return an array of values', function () {
-        expect(_.isArray(ordinalDomain.domain())).to.be(true);
-      });
-
-      it('should return the correct range', function () {
-        expect(range.range()[0]).to.be(0);
-        expect(range.range()[1]).to.be(width);
-      });
-    });
-
-    describe('getXScale Method', function () {
-      var width;
-      var xScale;
-
-      beforeEach(function () {
-        width = $('.x-axis-div').width();
-        xScale = xAxis.getXScale(width);
-      });
-
-      it('should return a function', function () {
-        expect(_.isFunction(xScale)).to.be(true);
-      });
-
-      it('should return a domain', function () {
-        expect(_.isDate(xScale.domain()[0])).to.be(true);
-        expect(_.isDate(xScale.domain()[1])).to.be(true);
-      });
-
-      it('should return a range', function () {
-        expect(xScale.range()[0]).to.be(0);
-        expect(xScale.range()[1]).to.be(width);
-      });
-    });
-
-    describe('getXAxis Method', function () {
-      var width;
-      var axis;
-
-      beforeEach(function () {
-        width = $('.x-axis-div').width();
-        xAxis.getXAxis(width);
-      });
-
-      it('should create an xAxis function on the xAxis class', function () {
-        expect(_.isFunction(xAxis.xAxis)).to.be(true);
-      });
-
-      it('should create an xScale function on the xAxis class', function () {
-        expect(_.isFunction(xAxis.xScale)).to.be(true);
-      });
-
-      it('should create an xAxisFormatter function on the xAxis class', function () {
-        expect(_.isFunction(xAxis.xAxisFormatter)).to.be(true);
-      });
-    });
-
-    describe('draw Method', function () {
-      it('should be a function', function () {
-        expect(_.isFunction(xAxis.draw())).to.be(true);
-      });
-    });
-
-  });
-});
diff --git a/test/unit/specs/vislib/lib/y_axis.js b/test/unit/specs/vislib/lib/y_axis.js
deleted file mode 100644
index c94a6749fd008..0000000000000
--- a/test/unit/specs/vislib/lib/y_axis.js
+++ /dev/null
@@ -1,410 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var d3 = require('d3');
-  var $ = require('jquery');
-
-  var YAxis;
-  var Data;
-  var el;
-  var buildYAxis;
-  var yAxis;
-  var yAxisDiv;
-
-  var timeSeries = [
-    1408734060000,
-    1408734090000,
-    1408734120000,
-    1408734150000,
-    1408734180000,
-    1408734210000,
-    1408734240000,
-    1408734270000,
-    1408734300000,
-    1408734330000
-  ];
-
-  var defaultGraphData = [
-    [ 8, 23, 30, 28, 36, 30, 26, 22, 29, 24 ],
-    [ 2, 13, 20, 18, 26, 20, 16, 12, 19, 14 ]
-  ];
-
-  function makeSeriesData(data) {
-    return timeSeries.map(function (timestamp, i) {
-      return {
-        x: timestamp,
-        y: data[i] || 0
-      };
-    });
-  }
-
-  function createData(seriesData) {
-    var data = {
-      hits: 621,
-      label: 'test',
-      ordered: {
-        date: true,
-        interval: 30000,
-        max: 1408734982458,
-        min: 1408734082458
-      },
-      series: seriesData.map(function (series) {
-        return { values: makeSeriesData(series) };
-      }),
-      xAxisLabel: 'Date Histogram',
-      yAxisLabel: 'Count'
-    };
-
-    var node = $('<div>').css({
-      height: 40,
-      width: 40
-    })
-    .appendTo('body')
-    .addClass('y-axis-wrapper')
-    .get(0);
-
-    el = d3.select(node).datum(data);
-
-    yAxisDiv = el.append('div')
-    .attr('class', 'y-axis-div');
-
-    var dataObj = new Data(data, {
-      defaultYMin: true
-    });
-
-    buildYAxis = function (params) {
-      return new YAxis(_.merge({}, params, {
-        el: node,
-        yMin: dataObj.getYMin(),
-        yMax: dataObj.getYMax(),
-        _attr: {
-          margin: { top: 0, right: 0, bottom: 0, left: 0 },
-          defaultYMin: true,
-          setYExtents: false,
-          yAxis: {}
-        }
-      }));
-    };
-
-    yAxis = buildYAxis();
-  }
-
-  describe('Vislib yAxis Class Test Suite', function () {
-    var d3Provider;
-
-    beforeEach(module('kibana'));
-
-    beforeEach(inject(function (Private, _d3_) {
-      d3Provider = _d3_;
-      Data = Private(require('components/vislib/lib/data'));
-      YAxis = Private(require('components/vislib/lib/y_axis'));
-
-      expect($('.y-axis-wrapper')).to.have.length(0);
-    }));
-
-    afterEach(function () {
-      el.remove();
-      yAxisDiv.remove();
-    });
-
-    describe('render Method', function () {
-      beforeEach(function () {
-        createData(defaultGraphData);
-        expect(d3.select(yAxis.el).selectAll('.y-axis-div')).to.have.length(1);
-        yAxis.render();
-      });
-
-      it('should append an svg to div', function () {
-        expect(el.selectAll('svg').length).to.be(1);
-      });
-
-      it('should append a g element to the svg', function () {
-        expect(el.selectAll('svg').select('g').length).to.be(1);
-      });
-
-      it('should append ticks with text', function () {
-        expect(!!el.selectAll('svg').selectAll('.tick text')).to.be(true);
-      });
-    });
-
-    describe('getYScale Method', function () {
-      var yScale;
-      var graphData;
-      var domain;
-      var height = 50;
-
-      function checkDomain(min, max) {
-        var domain = yScale.domain();
-        expect(domain[0]).to.be.lessThan(min + 1);
-        expect(domain[1]).to.be.greaterThan(max - 1);
-        return domain;
-      }
-
-      function checkRange() {
-        expect(yScale.range()[0]).to.be(height);
-        expect(yScale.range()[1]).to.be(0);
-      }
-
-      describe('API', function () {
-        beforeEach(function () {
-          createData(defaultGraphData);
-          yScale = yAxis.getYScale(height);
-        });
-
-        it('should return a function', function () {
-          expect(_.isFunction(yScale)).to.be(true);
-        });
-      });
-
-      describe('should return log values', function () {
-        var domain;
-        var extents;
-
-        it('should return 1', function () {
-          yAxis._attr.scale = 'log';
-          extents = [0, 400];
-          domain = yAxis._getExtents(extents);
-
-          // Log scales have a yMin value of 1
-          expect(domain[0]).to.be(1);
-        });
-      });
-
-      describe('positive values', function () {
-        beforeEach(function () {
-          graphData = defaultGraphData;
-          createData(graphData);
-          yScale = yAxis.getYScale(height);
-        });
-
-
-        it('should have domain between 0 and max value', function () {
-          var min = 0;
-          var max = _.max(_.flattenDeep(graphData));
-          var domain = checkDomain(min, max);
-          expect(domain[1]).to.be.greaterThan(0);
-          checkRange();
-        });
-      });
-
-      describe('negative values', function () {
-        beforeEach(function () {
-          graphData = [
-            [ -8, -23, -30, -28, -36, -30, -26, -22, -29, -24 ],
-            [ -22, -8, -30, -4, 0, 0, -3, -22, -14, -24 ]
-          ];
-          createData(graphData);
-          yScale = yAxis.getYScale(height);
-        });
-
-        it('should have domain between min value and 0', function () {
-          var min = _.min(_.flattenDeep(graphData));
-          var max = 0;
-          var domain = checkDomain(min, max);
-          expect(domain[0]).to.be.lessThan(0);
-          checkRange();
-        });
-      });
-
-      describe('positive and negative values', function () {
-        beforeEach(function () {
-          graphData = [
-            [ 8, 23, 30, 28, 36, 30, 26, 22, 29, 24 ],
-            [ 22, 8, -30, -4, 0, 0, 3, -22, 14, 24 ]
-          ];
-          createData(graphData);
-          yScale = yAxis.getYScale(height);
-        });
-
-        it('should have domain between min and max values', function () {
-          var min = _.min(_.flattenDeep(graphData));
-          var max = _.max(_.flattenDeep(graphData));
-          var domain = checkDomain(min, max);
-          expect(domain[0]).to.be.lessThan(0);
-          expect(domain[1]).to.be.greaterThan(0);
-          checkRange();
-        });
-      });
-
-      describe('validate user defined values', function () {
-        beforeEach(function () {
-          yAxis._attr.mode = 'stacked';
-          yAxis._attr.setYExtents = false;
-          yAxis._attr.yAxis = {};
-        });
-
-        it('should throw a NaN error', function () {
-          var min = 'Not a number';
-          var max = 12;
-
-          expect(function () {
-            yAxis._validateUserExtents(min, max);
-          }).to.throwError();
-        });
-
-        it('should return a decimal value', function () {
-          yAxis._attr.mode = 'percentage';
-          yAxis._attr.setYExtents = true;
-          domain = [];
-          domain[0] = yAxis._attr.yAxis.min = 20;
-          domain[1] = yAxis._attr.yAxis.max = 80;
-          var newDomain = yAxis._validateUserExtents(domain);
-
-          expect(newDomain[0]).to.be(domain[0] / 100);
-          expect(newDomain[1]).to.be(domain[1] / 100);
-        });
-
-        it('should return the user defined value', function () {
-          domain = [20, 50];
-          var newDomain = yAxis._validateUserExtents(domain);
-
-          expect(newDomain[0]).to.be(domain[0]);
-          expect(newDomain[1]).to.be(domain[1]);
-        });
-      });
-
-      describe('should throw an error when', function () {
-        it('min === max', function () {
-          var min = 12;
-          var max = 12;
-
-          expect(function () {
-            yAxis._validateAxisExtents(min, max);
-          }).to.throwError();
-        });
-
-        it('min > max', function () {
-          var min = 30;
-          var max = 10;
-
-          expect(function () {
-            yAxis._validateAxisExtents(min, max);
-          }).to.throwError();
-        });
-      });
-    });
-
-    describe('getScaleType method', function () {
-      var fnNames = ['linear', 'log', 'square root'];
-
-      it('should return a function', function () {
-        fnNames.forEach(function (fnName) {
-          expect(yAxis._getScaleType(fnName)).to.be.a(Function);
-        });
-
-        // if no value is provided to the function, scale should default to a linear scale
-        expect(yAxis._getScaleType()).to.be.a(Function);
-      });
-
-      it('should throw an error if function name is undefined', function () {
-        expect(function () {
-          yAxis._getScaleType('square');
-        }).to.throwError();
-      });
-    });
-
-    describe('_logDomain method', function () {
-      it('should throw an error', function () {
-        expect(function () {
-          yAxis._logDomain(-10, -5);
-        }).to.throwError();
-        expect(function () {
-          yAxis._logDomain(-10, 5);
-        }).to.throwError();
-        expect(function () {
-          yAxis._logDomain(0, -5);
-        }).to.throwError();
-      });
-
-      it('should return a yMin value of 1', function () {
-        var yMin = yAxis._logDomain(0, 200)[0];
-        expect(yMin).to.be(1);
-      });
-    });
-
-    describe('getYAxis method', function () {
-      var mode, yMax, yScale;
-      beforeEach(function () {
-        createData(defaultGraphData);
-        mode = yAxis._attr.mode;
-        yMax = yAxis.yMax;
-        yScale = yAxis.getYScale;
-      });
-
-      afterEach(function () {
-        yAxis._attr.mode = mode;
-        yAxis.yMax = yMax;
-        yAxis.getYScale = yScale;
-      });
-
-      it('should use percentage format for percentages', function () {
-        yAxis._attr.mode = 'percentage';
-        var tickFormat = yAxis.getYAxis().tickFormat();
-        expect(tickFormat(1)).to.be('100%');
-      });
-
-      it('should use decimal format for small values', function () {
-        yAxis.yMax = 1;
-        var tickFormat = yAxis.getYAxis().tickFormat();
-        expect(tickFormat(0.8)).to.be('0.8');
-      });
-
-      it('should throw an error if yScale is NaN', function () {
-        yAxis.getYScale = function () { return NaN; };
-        expect(function () {
-          yAxis.getYAxis();
-        }).to.throwError();
-      });
-    });
-
-    describe('draw Method', function () {
-      beforeEach(function () {
-        createData(defaultGraphData);
-      });
-
-      it('should be a function', function () {
-        expect(_.isFunction(yAxis.draw())).to.be(true);
-      });
-    });
-
-    describe('tickScale Method', function () {
-      beforeEach(function () {
-        createData(defaultGraphData);
-      });
-
-      it('should return the correct number of ticks', function () {
-        expect(yAxis.tickScale(1000)).to.be(11);
-        expect(yAxis.tickScale(40)).to.be(3);
-        expect(yAxis.tickScale(20)).to.be(0);
-      });
-    });
-
-    describe('#tickFormat()', function () {
-      var formatter = function () {};
-
-      it('returns a basic number formatter by default', function () {
-        var yAxis = buildYAxis();
-        expect(yAxis.tickFormat()).to.not.be(formatter);
-        expect(yAxis.tickFormat()(1)).to.be('1');
-      });
-
-      it('returns the yAxisFormatter when passed', function () {
-        var yAxis = buildYAxis({
-          yAxisFormatter: formatter
-        });
-        expect(yAxis.tickFormat()).to.be(formatter);
-      });
-
-      it('returns a percentage formatter when the vis is in percentage mode', function () {
-        var yAxis = buildYAxis({
-          yAxisFormatter: formatter,
-          _attr: {
-            mode: 'percentage'
-          }
-        });
-
-        expect(yAxis.tickFormat()).to.not.be(formatter);
-        expect(yAxis.tickFormat()(1)).to.be('100%');
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/vislib/vis.js b/test/unit/specs/vislib/vis.js
deleted file mode 100644
index 85bbcb5f0704e..0000000000000
--- a/test/unit/specs/vislib/vis.js
+++ /dev/null
@@ -1,266 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-
-  var series = require('vislib_fixtures/mock_data/date_histogram/_series');
-  var columns = require('vislib_fixtures/mock_data/date_histogram/_columns');
-  var rows = require('vislib_fixtures/mock_data/date_histogram/_rows');
-  var stackedSeries = require('vislib_fixtures/mock_data/date_histogram/_stacked_series');
-  var dataArray = [
-    series,
-    columns,
-    rows,
-    stackedSeries
-  ];
-  var names = [
-    'series',
-    'columns',
-    'rows',
-    'stackedSeries'
-  ];
-
-  var angular = require('angular');
-  angular.module('VisFactory', ['kibana']);
-
-  dataArray.forEach(function (data, i) {
-    describe('VisLib Vis Test Suite for ' + names[i] + ' Data', function () {
-      var beforeEvent = 'click';
-      var afterEvent = 'brush';
-      var vis;
-      var secondVis;
-      var numberOfCharts;
-
-      beforeEach(function () {
-        module('VisFactory');
-      });
-
-      beforeEach(function () {
-        inject(function (d3, Private) {
-          vis = Private(require('vislib_fixtures/_vis_fixture'))();
-          secondVis = Private(require('vislib_fixtures/_vis_fixture'))();
-          require('css!components/vislib/styles/main');
-        });
-      });
-
-      afterEach(function () {
-        $(vis.el).remove();
-        $(secondVis.el).remove();
-        vis = null;
-      });
-
-      describe('render Method', function () {
-        beforeEach(function () {
-          vis.render(data);
-          numberOfCharts = vis.handler.charts.length;
-        });
-
-        it('should bind data to this object', function () {
-          expect(_.isObject(vis.data)).to.be(true);
-        });
-
-        it('should instantiate a handler object', function () {
-          expect(_.isObject(vis.handler)).to.be(true);
-        });
-
-        it('should append a chart', function () {
-          expect($('.chart').length).to.be(numberOfCharts);
-        });
-
-      });
-
-      describe('resize Method', function () {
-        beforeEach(function () {
-          vis.render(data);
-          vis.resize();
-          numberOfCharts = vis.handler.charts.length;
-        });
-
-        it('should throw an error', function () {
-          expect(function () {
-            vis.data = undefined;
-            vis.render();
-          }).to.throwError();
-        });
-
-        it('should resize the visualization', function () {
-          expect(vis.handler.charts.length).to.be(numberOfCharts);
-        });
-      });
-
-      describe('destroy Method', function () {
-        beforeEach(function () {
-          vis.render(data);
-          secondVis.render(data);
-          secondVis.destroy();
-        });
-
-        it('should remove all DOM elements from el', function () {
-          expect($(secondVis.el).find('.vis-wrapper').length).to.be(0);
-        });
-
-        it('should not remove visualizations that have not been destroyed', function () {
-          expect($(vis.el).find('.vis-wrapper').length).to.be(1);
-        });
-      });
-
-      describe('set Method', function () {
-        beforeEach(function () {
-          vis.render(data);
-          vis.set('addLegend', false);
-          vis.set('offset', 'wiggle');
-        });
-
-        it('should set an attribute', function () {
-          expect(vis.get('addLegend')).to.be(false);
-          expect(vis.get('offset')).to.be('wiggle');
-        });
-      });
-
-      describe('get Method', function () {
-        beforeEach(function () {
-          vis.render(data);
-        });
-
-        it('should get attribue values', function () {
-          expect(vis.get('addLegend')).to.be(true);
-          expect(vis.get('addTooltip')).to.be(true);
-          expect(vis.get('type')).to.be('histogram');
-        });
-      });
-
-      describe('on Method', function () {
-        var events = [
-          beforeEvent,
-          afterEvent
-        ];
-        var listeners;
-        var listener1;
-        var listener2;
-
-        beforeEach(function () {
-          listeners = [
-            listener1 = function () {},
-            listener2 = function () {}
-          ];
-
-          // Add event and listeners to chart
-          listeners.forEach(function (listener) {
-            vis.on(beforeEvent, listener);
-          });
-
-          // Render chart
-          vis.render(data);
-
-          // Add event after charts have rendered
-          listeners.forEach(function (listener) {
-            vis.on(afterEvent, listener);
-          });
-        });
-
-        afterEach(function () {
-          vis.off(beforeEvent);
-          vis.off(afterEvent);
-        });
-
-        it('should add an event and its listeners', function () {
-          listeners.forEach(function (listener) {
-            expect(vis.listeners(beforeEvent)).to.contain(listener);
-          });
-
-          listeners.forEach(function (listener) {
-            expect(vis.listeners(afterEvent)).to.contain(listener);
-          });
-        });
-
-        it('should cause a listener for each event to be attached to each chart', function () {
-          var charts = vis.handler.charts;
-
-          charts.forEach(function (chart, i) {
-            expect(chart.events.listenerCount(beforeEvent)).to.be.above(0);
-            expect(chart.events.listenerCount(afterEvent)).to.be.above(0);
-          });
-        });
-      });
-
-      describe('off Method', function () {
-        var listeners;
-        var listener1;
-        var listener2;
-
-        beforeEach(function () {
-          listeners = [];
-          listener1 = function () {};
-          listener2 = function () {};
-          listeners.push(listener1);
-          listeners.push(listener2);
-
-          // Add event and listeners to chart
-          listeners.forEach(function (listener) {
-            vis.on(beforeEvent, listener);
-          });
-
-          // Turn off event listener before chart rendered
-          vis.off(beforeEvent, listener1);
-
-          // Render chart
-          vis.render(data);
-
-          // Add event after charts have rendered
-          listeners.forEach(function (listener) {
-            vis.on(afterEvent, listener);
-          });
-
-          // Turn off event listener after chart is rendered
-          vis.off(afterEvent, listener1);
-        });
-
-        afterEach(function () {
-          vis.off(beforeEvent);
-          vis.off(afterEvent);
-        });
-
-        it('should remove a listener', function () {
-          var charts = vis.handler.charts;
-
-          expect(vis.listeners(beforeEvent)).to.not.contain(listener1);
-          expect(vis.listeners(beforeEvent)).to.contain(listener2);
-
-          expect(vis.listeners(afterEvent)).to.not.contain(listener1);
-          expect(vis.listeners(afterEvent)).to.contain(listener2);
-
-          // Events should still be attached to charts
-          charts.forEach(function (chart) {
-            expect(chart.events.listenerCount(beforeEvent)).to.be.above(0);
-            expect(chart.events.listenerCount(afterEvent)).to.be.above(0);
-          });
-        });
-
-        it('should remove the event and all listeners when only event passed an argument', function () {
-          var charts = vis.handler.charts;
-          vis.off(afterEvent);
-
-          // should remove 'brush' event
-          expect(vis.listeners(beforeEvent)).to.contain(listener2);
-          expect(vis.listeners(afterEvent)).to.not.contain(listener2);
-
-          // should remove the event from the charts
-          charts.forEach(function (chart) {
-            expect(chart.events.listenerCount(beforeEvent)).to.be.above(0);
-            expect(chart.events.listenerCount(afterEvent)).to.be(0);
-          });
-        });
-
-        it('should remove the event from the chart when the last listener is removed', function () {
-          var charts = vis.handler.charts;
-          vis.off(afterEvent, listener2);
-
-          expect(vis.listenerCount(afterEvent)).to.be(0);
-
-          charts.forEach(function (chart) {
-            expect(chart.events.listenerCount(afterEvent)).to.be(0);
-          });
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/vislib/visualizations/area_chart.js b/test/unit/specs/vislib/visualizations/area_chart.js
deleted file mode 100644
index 00a6cb5d0d7fa..0000000000000
--- a/test/unit/specs/vislib/visualizations/area_chart.js
+++ /dev/null
@@ -1,279 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-  var $ = require('jquery');
-
-  // Data
-  var seriesPos = require('vislib_fixtures/mock_data/date_histogram/_series');
-  var seriesPosNeg = require('vislib_fixtures/mock_data/date_histogram/_series_pos_neg');
-  var seriesNeg = require('vislib_fixtures/mock_data/date_histogram/_series_neg');
-  var termColumns = require('vislib_fixtures/mock_data/terms/_columns');
-  var rangeRows = require('vislib_fixtures/mock_data/range/_rows');
-  var stackedSeries = require('vislib_fixtures/mock_data/date_histogram/_stacked_series');
-
-  var dataArray = [
-    seriesPos,
-    seriesPosNeg,
-    seriesNeg,
-    termColumns,
-    rangeRows,
-    stackedSeries,
-  ];
-
-  var names = [
-    'series pos',
-    'series pos neg',
-    'series neg',
-    'term columns',
-    'range rows',
-    'stackedSeries',
-  ];
-
-  var visLibParams = {
-    type: 'area',
-    addLegend: true,
-    addTooltip: true
-  };
-
-  angular.module('AreaChartFactory', ['kibana']);
-
-  dataArray.forEach(function (data, i) {
-    describe('VisLib Area Chart Test Suite for ' + names[i] + ' Data', function () {
-      var vis;
-
-      beforeEach(function () {
-        module('AreaChartFactory');
-      });
-
-      beforeEach(function () {
-        inject(function (Private) {
-          vis = Private(require('vislib_fixtures/_vis_fixture'))(visLibParams);
-          require('css!components/vislib/styles/main');
-
-          vis.on('brush', _.noop);
-
-          vis.render(data);
-        });
-      });
-
-      afterEach(function () {
-        $(vis.el).remove();
-        vis = null;
-      });
-
-      describe('checkIfEnoughData method throws an error when not enough data', function () {
-        var notEnoughData;
-
-        beforeEach(function () {
-          inject(function () {
-            notEnoughData = require('vislib_fixtures/mock_data/not_enough_data/_one_point');
-            require('css!components/vislib/styles/main');
-
-            vis.render(notEnoughData);
-          });
-        });
-
-        it('should throw a Not Enough Data Error', function () {
-          var chart = {
-            chartData: notEnoughData
-          };
-
-          expect(function () {
-            vis.handler.ChartClass.prototype.checkIfEnoughData.apply(chart);
-          }).to.throwError();
-        });
-      });
-
-      describe('checkIfEnoughData method should not throw an error when enough data', function () {
-        var enoughData;
-
-        beforeEach(function () {
-          inject(function () {
-            enoughData = require('vislib_fixtures/mock_data/date_histogram/_series');
-            require('css!components/vislib/styles/main');
-
-            vis.render(enoughData);
-          });
-        });
-
-        it('should not throw a Not Enough Data Error', function () {
-          vis.handler.charts.forEach(function (chart) {
-            expect(function () {
-              chart.checkIfEnoughData();
-            }).to.not.throwError();
-          });
-        });
-      });
-
-      describe('stackData method', function () {
-        var stackedData;
-        var isStacked;
-
-        beforeEach(function () {
-          vis.handler.charts.forEach(function (chart) {
-            stackedData = chart.stackData(chart.chartData);
-
-            isStacked = stackedData.every(function (arr) {
-              return arr.every(function (d) {
-                return _.isNumber(d.y0);
-              });
-            });
-          });
-        });
-
-        it('should append a d.y0 key to the data object', function () {
-          expect(isStacked).to.be(true);
-        });
-      });
-
-      describe('addPath method', function () {
-        it('should append a area paths', function () {
-          vis.handler.charts.forEach(function (chart) {
-            expect($(chart.chartEl).find('path').length).to.be.greaterThan(0);
-          });
-        });
-      });
-
-      describe('addCircleEvents method', function () {
-        var circle;
-        var brush;
-        var d3selectedCircle;
-        var onBrush;
-        var onClick;
-        var onMouseOver;
-
-        beforeEach(function () {
-          inject(function (d3) {
-            vis.handler.charts.forEach(function (chart) {
-              circle = $(chart.chartEl).find('circle')[0];
-              brush = $(chart.chartEl).find('.brush');
-              d3selectedCircle = d3.select(circle)[0][0];
-
-              // d3 instance of click and hover
-              onBrush = (!!brush);
-              onClick = (!!d3selectedCircle.__onclick);
-              onMouseOver = (!!d3selectedCircle.__onmouseover);
-            });
-          });
-        });
-
-        // D3 brushing requires that a g element is appended that
-        // listens for mousedown events. This g element includes
-        // listeners, however, I was not able to test for the listener
-        // function being present. I will need to update this test
-        // in the future.
-        it('should attach a brush g element', function () {
-          vis.handler.charts.forEach(function () {
-            expect(onBrush).to.be(true);
-          });
-        });
-
-        it('should attach a click event', function () {
-          vis.handler.charts.forEach(function () {
-            expect(onClick).to.be(true);
-          });
-        });
-
-        it('should attach a hover event', function () {
-          vis.handler.charts.forEach(function () {
-            expect(onMouseOver).to.be(true);
-          });
-        });
-      });
-
-      describe('addCircles method', function () {
-        it('should append circles', function () {
-          vis.handler.charts.forEach(function (chart) {
-            expect($(chart.chartEl).find('circle').length).to.be.greaterThan(0);
-          });
-        });
-
-        it('should not draw circles where d.y === 0', function () {
-          vis.handler.charts.forEach(function (chart) {
-            var series = chart.chartData.series;
-            var isZero = series.some(function (d) {
-              return d.y === 0;
-            });
-            var circles = $.makeArray($(chart.chartEl).find('circle'));
-            var isNotDrawn = circles.some(function (d) {
-              return d.__data__.y === 0;
-            });
-
-            if (isZero) {
-              expect(isNotDrawn).to.be(false);
-            }
-          });
-        });
-      });
-
-      // Cannot seem to get these tests to work on the box
-      // They however pass in the browsers
-      //describe('addClipPath method', function () {
-      //  it('should append a clipPath', function () {
-      //    vis.handler.charts.forEach(function (chart) {
-      //      expect($(chart.chartEl).find('clipPath').length).to.be(1);
-      //    });
-      //  });
-      //});
-
-      describe('draw method', function () {
-        it('should return a function', function () {
-          vis.handler.charts.forEach(function (chart) {
-            expect(_.isFunction(chart.draw())).to.be(true);
-          });
-        });
-
-        it('should return a yMin and yMax', function () {
-          vis.handler.charts.forEach(function (chart) {
-            var yAxis = chart.handler.yAxis;
-
-            expect(yAxis.domain[0]).to.not.be(undefined);
-            expect(yAxis.domain[1]).to.not.be(undefined);
-          });
-        });
-
-        it('should render a zero axis line', function () {
-          vis.handler.charts.forEach(function (chart) {
-            var yAxis = chart.handler.yAxis;
-
-            if (yAxis.yMin < 0 && yAxis.yMax > 0) {
-              expect($(chart.chartEl).find('line.zero-line').length).to.be(1);
-            }
-          });
-        });
-      });
-
-      describe('containerTooSmall error', function () {
-        beforeEach(function () {
-          $(vis.el).height(0);
-          $(vis.el).width(0);
-        });
-
-        it('should throw an error', function () {
-          vis.handler.charts.forEach(function (chart) {
-            expect(function () {
-              chart.render();
-            }).to.throwError();
-          });
-        });
-      });
-
-      describe('defaultYExtents is true', function () {
-        beforeEach(function () {
-          vis._attr.defaultYExtents = true;
-          vis.render(data);
-        });
-
-        it('should return yAxis extents equal to data extents', function () {
-          vis.handler.charts.forEach(function (chart) {
-            var yAxis = chart.handler.yAxis;
-            var yVals = [vis.handler.data.getYMin(), vis.handler.data.getYMax()];
-
-            expect(yAxis.domain[0]).to.equal(yVals[0]);
-            expect(yAxis.domain[1]).to.equal(yVals[1]);
-          });
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/vislib/visualizations/chart.js b/test/unit/specs/vislib/visualizations/chart.js
deleted file mode 100644
index ead142115df4c..0000000000000
--- a/test/unit/specs/vislib/visualizations/chart.js
+++ /dev/null
@@ -1,133 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-
-  angular.module('ChartBaseClass', ['kibana']);
-  angular.module('ColumnChartFactory', ['kibana']);
-
-  describe('VisLib _chart Test Suite', function () {
-    var ColumnChart;
-    var Chart;
-    var Data;
-    var Vis;
-    var chartData = {};
-    var vis;
-    var el;
-    var myChart;
-    var config;
-    var data = {
-      hits      : 621,
-      label     : '',
-      ordered   : {
-        date: true,
-        interval: 30000,
-        max     : 1408734982458,
-        min     : 1408734082458
-      },
-      series    : [
-        {
-          values: [
-            {
-              x: 1408734060000,
-              y: 8
-            },
-            {
-              x: 1408734090000,
-              y: 23
-            },
-            {
-              x: 1408734120000,
-              y: 30
-            },
-            {
-              x: 1408734150000,
-              y: 28
-            },
-            {
-              x: 1408734180000,
-              y: 36
-            },
-            {
-              x: 1408734210000,
-              y: 30
-            },
-            {
-              x: 1408734240000,
-              y: 26
-            },
-            {
-              x: 1408734270000,
-              y: 22
-            },
-            {
-              x: 1408734300000,
-              y: 29
-            },
-            {
-              x: 1408734330000,
-              y: 24
-            }
-          ]
-        }
-      ],
-      tooltipFormatter: function (datapoint) {
-        return datapoint;
-      },
-      xAxisFormatter: function (thing) {
-        return thing;
-      },
-      xAxisLabel: 'Date Histogram',
-      yAxisLabel: 'Count'
-    };
-
-    beforeEach(function () {
-      module('ChartBaseClass');
-      module('ColumnChartFactory');
-    });
-
-    beforeEach(function () {
-      inject(function (d3, Private) {
-        Vis = Private(require('components/vislib/vis'));
-        Data = Private(require('components/vislib/lib/data'));
-        ColumnChart = Private(require('components/vislib/visualizations/column_chart'));
-        Chart = Private(require('components/vislib/visualizations/_chart'));
-
-        el = d3.select('body').append('div').attr('class', 'column-chart');
-
-        config = {
-          type: 'histogram',
-          shareYAxis: true,
-          addTooltip: true,
-          addLegend: true,
-          stack: d3.layout.stack(),
-        };
-
-        vis = new Vis(el[0][0], config);
-        vis.data = new Data(data, config);
-
-        myChart = new ColumnChart(vis, el, chartData);
-      });
-    });
-
-    afterEach(function () {
-      el.remove();
-    });
-
-    it('should be a constructor for visualization modules', function () {
-      expect(myChart instanceof Chart).to.be(true);
-    });
-
-    it('should have a render method', function () {
-      expect(typeof myChart.render === 'function').to.be(true);
-    });
-
-    it('should destroy the chart element', function () {
-      // Once destroy is called, a chart should not be able to be drawn
-      myChart.destroy();
-
-      expect(function () {
-        myChart.draw();
-      }).to.throwError();
-    });
-
-  });
-});
diff --git a/test/unit/specs/vislib/visualizations/column_chart.js b/test/unit/specs/vislib/visualizations/column_chart.js
deleted file mode 100644
index c8d869fd1ccfe..0000000000000
--- a/test/unit/specs/vislib/visualizations/column_chart.js
+++ /dev/null
@@ -1,209 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var d3 = require('d3');
-
-  // Data
-  var series = require('vislib_fixtures/mock_data/date_histogram/_series');
-  var seriesPosNeg = require('vislib_fixtures/mock_data/date_histogram/_series_pos_neg');
-  var seriesNeg = require('vislib_fixtures/mock_data/date_histogram/_series_neg');
-  var termsColumns = require('vislib_fixtures/mock_data/terms/_columns');
-  //var histogramRows = require('vislib_fixtures/mock_data/histogram/_rows');
-  var stackedSeries = require('vislib_fixtures/mock_data/date_histogram/_stacked_series');
-
-  // tuple, with the format [description, mode, data]
-  var dataTypesArray = [
-    ['series', 'stacked', series],
-    ['series with positive and negative values', 'stacked', seriesPosNeg],
-    ['series with negative values', 'stacked', seriesNeg],
-    ['terms columns', 'grouped', termsColumns],
-    // ['histogram rows', 'percentage', histogramRows],
-    ['stackedSeries', 'stacked', stackedSeries],
-  ];
-
-  angular.module('ColumnChartFactory', ['kibana']);
-
-  dataTypesArray.forEach(function (dataType, i) {
-    var name = dataType[0];
-    var mode = dataType[1];
-    var data = dataType[2];
-
-    describe('VisLib Column Chart Test Suite for ' + name + ' Data', function () {
-      var vis;
-      var visLibParams = {
-        type: 'histogram',
-        addLegend: true,
-        addTooltip: true,
-        mode: mode
-      };
-
-      beforeEach(function () {
-        module('AreaChartFactory');
-      });
-
-      beforeEach(function () {
-        inject(function (Private) {
-          vis = Private(require('vislib_fixtures/_vis_fixture'))(visLibParams);
-          require('css!components/vislib/styles/main');
-
-          vis.on('brush', _.noop);
-          vis.render(data);
-        });
-      });
-
-      afterEach(function () {
-        $(vis.el).remove();
-        vis = null;
-      });
-
-      describe('stackData method', function () {
-        var stackedData;
-        var isStacked;
-
-        beforeEach(function () {
-          vis.handler.charts.forEach(function (chart) {
-            stackedData = chart.stackData(chart.chartData);
-
-            isStacked = stackedData.every(function (arr) {
-              return arr.every(function (d) {
-                return _.isNumber(d.y0);
-              });
-            });
-          });
-        });
-
-        it('should append a d.y0 key to the data object', function () {
-          expect(isStacked).to.be(true);
-        });
-      });
-
-      describe('addBars method', function () {
-        it('should append rects', function () {
-          var numOfSeries;
-          var numOfValues;
-          var product;
-
-          vis.handler.charts.forEach(function (chart) {
-            numOfSeries = chart.chartData.series.length;
-            numOfValues = chart.chartData.series[0].values.length;
-            product = numOfSeries * numOfValues;
-            expect($(chart.chartEl).find('.series rect')).to.have.length(product);
-          });
-        });
-      });
-
-      describe('updateBars method', function () {
-        beforeEach(function () {
-          vis.handler._attr.mode = 'grouped';
-          vis.render(vis.data);
-        });
-
-        it('should returned grouped bars', function () {
-          vis.handler.charts.forEach(function (chart) {});
-        });
-      });
-
-      describe('addBarEvents method', function () {
-        function checkChart(chart) {
-          var rect = $(chart.chartEl).find('.series rect').get(0);
-
-          // check for existance of stuff and things
-          return {
-            click: !!rect.__onclick,
-            mouseOver: !!rect.__onmouseover,
-            // D3 brushing requires that a g element is appended that
-            // listens for mousedown events. This g element includes
-            // listeners, however, I was not able to test for the listener
-            // function being present. I will need to update this test
-            // in the future.
-            brush: !!d3.select('.brush')[0][0]
-          };
-        }
-
-        it('should attach the brush if data is a set of ordered dates', function () {
-          vis.handler.charts.forEach(function (chart) {
-            var has = checkChart(chart);
-            var ordered = vis.handler.data.get('ordered');
-            var date = Boolean(ordered && ordered.date);
-            expect(has.brush).to.be(date);
-          });
-        });
-
-        it('should attach a click event', function () {
-          vis.handler.charts.forEach(function (chart) {
-            var has = checkChart(chart);
-            expect(has.click).to.be(true);
-          });
-        });
-
-        it('should attach a hover event', function () {
-          vis.handler.charts.forEach(function (chart) {
-            var has = checkChart(chart);
-            expect(has.mouseOver).to.be(true);
-          });
-        });
-      });
-
-      describe('draw method', function () {
-        it('should return a function', function () {
-          vis.handler.charts.forEach(function (chart) {
-            expect(_.isFunction(chart.draw())).to.be(true);
-          });
-        });
-
-        it('should return a yMin and yMax', function () {
-          vis.handler.charts.forEach(function (chart) {
-            var yAxis = chart.handler.yAxis;
-
-            expect(yAxis.domain[0]).to.not.be(undefined);
-            expect(yAxis.domain[1]).to.not.be(undefined);
-          });
-        });
-
-        it('should render a zero axis line', function () {
-          vis.handler.charts.forEach(function (chart) {
-            var yAxis = chart.handler.yAxis;
-
-            if (yAxis.yMin < 0 && yAxis.yMax > 0) {
-              expect($(chart.chartEl).find('line.zero-line').length).to.be(1);
-            }
-          });
-        });
-      });
-
-      describe('containerTooSmall error', function () {
-        beforeEach(function () {
-          $(vis.el).height(0);
-          $(vis.el).width(0);
-        });
-
-        it('should throw an error', function () {
-          vis.handler.charts.forEach(function (chart) {
-            expect(function () {
-              chart.render();
-            }).to.throwError();
-          });
-        });
-      });
-
-      describe('defaultYExtents is true', function () {
-        beforeEach(function () {
-          vis._attr.defaultYExtents = true;
-          vis.render(data);
-        });
-
-        it('should return yAxis extents equal to data extents', function () {
-          vis.handler.charts.forEach(function (chart) {
-            var yAxis = chart.handler.yAxis;
-            var min = vis.handler.data.getYMin();
-            var max = vis.handler.data.getYMax();
-
-            expect(yAxis.domain[0]).to.equal(min);
-            expect(yAxis.domain[1]).to.equal(max);
-          });
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/vislib/visualizations/line_chart.js b/test/unit/specs/vislib/visualizations/line_chart.js
deleted file mode 100644
index da9ebdb116f37..0000000000000
--- a/test/unit/specs/vislib/visualizations/line_chart.js
+++ /dev/null
@@ -1,194 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-  var $ = require('jquery');
-
-  // Data
-  var seriesPos = require('vislib_fixtures/mock_data/date_histogram/_series');
-  var seriesPosNeg = require('vislib_fixtures/mock_data/date_histogram/_series_pos_neg');
-  var seriesNeg = require('vislib_fixtures/mock_data/date_histogram/_series_neg');
-  var histogramColumns = require('vislib_fixtures/mock_data/histogram/_columns');
-  var rangeRows = require('vislib_fixtures/mock_data/range/_rows');
-  var termSeries = require('vislib_fixtures/mock_data/terms/_series');
-
-  var dataTypes = [
-    ['series pos', seriesPos],
-    ['series pos neg', seriesPosNeg],
-    ['series neg', seriesNeg],
-    ['histogram columns', histogramColumns],
-    ['range rows', rangeRows],
-    ['term series', termSeries],
-  ];
-
-  angular.module('LineChartFactory', ['kibana']);
-
-  describe('VisLib Line Chart', function () {
-    dataTypes.forEach(function (type, i) {
-      var name = type[0];
-      var data = type[1];
-
-      describe(name + ' Data', function () {
-        var vis;
-
-        beforeEach(function () {
-          module('LineChartFactory');
-        });
-
-        beforeEach(function () {
-          var visLibParams = {
-            type: 'line',
-            addLegend: true,
-            addTooltip: true,
-            drawLinesBetweenPoints: true
-          };
-
-          inject(function (Private) {
-            vis = Private(require('vislib_fixtures/_vis_fixture'))(visLibParams);
-            require('css!components/vislib/styles/main');
-
-            vis.on('brush', _.noop);
-
-            vis.render(data);
-          });
-        });
-
-        afterEach(function () {
-          $(vis.el).remove();
-          vis = null;
-        });
-
-        describe('addCircleEvents method', function () {
-          var circle;
-          var brush;
-          var d3selectedCircle;
-          var onBrush;
-          var onClick;
-          var onMouseOver;
-
-          beforeEach(function () {
-            inject(function (d3) {
-              vis.handler.charts.forEach(function (chart) {
-                circle = $(chart.chartEl).find('.circle')[0];
-                brush = $(chart.chartEl).find('.brush');
-                d3selectedCircle = d3.select(circle)[0][0];
-
-                // d3 instance of click and hover
-                onBrush = (!!brush);
-                onClick = (!!d3selectedCircle.__onclick);
-                onMouseOver = (!!d3selectedCircle.__onmouseover);
-              });
-            });
-          });
-
-          // D3 brushing requires that a g element is appended that
-          // listens for mousedown events. This g element includes
-          // listeners, however, I was not able to test for the listener
-          // function being present. I will need to update this test
-          // in the future.
-          it('should attach a brush g element', function () {
-            vis.handler.charts.forEach(function () {
-              expect(onBrush).to.be(true);
-            });
-          });
-
-          it('should attach a click event', function () {
-            vis.handler.charts.forEach(function () {
-              expect(onClick).to.be(true);
-            });
-          });
-
-          it('should attach a hover event', function () {
-            vis.handler.charts.forEach(function () {
-              expect(onMouseOver).to.be(true);
-            });
-          });
-        });
-
-        describe('addCircles method', function () {
-          it('should append circles', function () {
-            vis.handler.charts.forEach(function (chart) {
-              expect($(chart.chartEl).find('circle').length).to.be.greaterThan(0);
-            });
-          });
-        });
-
-        describe('addLines method', function () {
-          it('should append a paths', function () {
-            vis.handler.charts.forEach(function (chart) {
-              expect($(chart.chartEl).find('path').length).to.be.greaterThan(0);
-            });
-          });
-        });
-
-        // Cannot seem to get these tests to work on the box
-        // They however pass in the browsers
-        //describe('addClipPath method', function () {
-        //  it('should append a clipPath', function () {
-        //    vis.handler.charts.forEach(function (chart) {
-        //      expect($(chart.chartEl).find('clipPath').length).to.be(1);
-        //    });
-        //  });
-        //});
-
-        describe('draw method', function () {
-          it('should return a function', function () {
-            vis.handler.charts.forEach(function (chart) {
-              expect(chart.draw()).to.be.a(Function);
-            });
-          });
-
-          it('should return a yMin and yMax', function () {
-            vis.handler.charts.forEach(function (chart) {
-              var yAxis = chart.handler.yAxis;
-
-              expect(yAxis.domain[0]).to.not.be(undefined);
-              expect(yAxis.domain[1]).to.not.be(undefined);
-            });
-          });
-
-          it('should render a zero axis line', function () {
-            vis.handler.charts.forEach(function (chart) {
-              var yAxis = chart.handler.yAxis;
-
-              if (yAxis.yMin < 0 && yAxis.yMax > 0) {
-                expect($(chart.chartEl).find('line.zero-line').length).to.be(1);
-              }
-            });
-          });
-        });
-
-        describe('containerTooSmall error', function () {
-          beforeEach(function () {
-            $(vis.el).height(0);
-            $(vis.el).width(0);
-          });
-
-          it('should throw an error', function () {
-            vis.handler.charts.forEach(function (chart) {
-              expect(function () {
-                chart.render();
-              }).to.throwError();
-            });
-          });
-        });
-
-        describe('defaultYExtents is true', function () {
-          beforeEach(function () {
-            vis._attr.defaultYExtents = true;
-            vis.render(data);
-          });
-
-          it('should return yAxis extents equal to data extents', function () {
-            vis.handler.charts.forEach(function (chart) {
-              var yAxis = chart.handler.yAxis;
-              var yVals = [vis.handler.data.getYMin(), vis.handler.data.getYMax()];
-
-              expect(yAxis.domain[0]).to.equal(yVals[0]);
-              expect(yAxis.domain[1]).to.equal(yVals[1]);
-            });
-          });
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/vislib/visualizations/pie_chart.js b/test/unit/specs/vislib/visualizations/pie_chart.js
deleted file mode 100644
index 5ada4c29de76f..0000000000000
--- a/test/unit/specs/vislib/visualizations/pie_chart.js
+++ /dev/null
@@ -1,308 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var fixtures = require('fixtures/fake_hierarchical_data');
-
-  angular.module('PieChartFactory', ['kibana']);
-
-  var rowAgg = [
-    { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-    { type: 'terms', schema: 'split', params: { field: 'extension', rows: true }},
-    { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
-    { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
-  ];
-
-  var colAgg = [
-    { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-    { type: 'terms', schema: 'split', params: { field: 'extension', row: false }},
-    { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
-    { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
-  ];
-
-  var sliceAgg = [
-    { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-    { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
-    { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
-  ];
-
-  var aggArray = [
-    rowAgg,
-    colAgg,
-    sliceAgg
-  ];
-
-  var names = [
-    'rows',
-    'columns',
-    'slices'
-  ];
-
-  var sizes = [
-    0,
-    5,
-    15,
-    30,
-    60,
-    120
-  ];
-
-  describe('No global chart settings', function () {
-    var visLibParams1 = {
-      el: '<div class=chart1></div>',
-      type: 'pie',
-      addLegend: true,
-      addTooltip: true
-    };
-    var visLibParams2 = {
-      el: '<div class=chart2></div>',
-      type: 'pie',
-      addLegend: true,
-      addTooltip: true
-    };
-    var chart1;
-    var chart2;
-    var Vis;
-    var indexPattern;
-    var buildHierarchicalData;
-    var data1;
-    var data2;
-
-    beforeEach(function () {
-      module('PieChartFactory');
-    });
-
-    beforeEach(function () {
-      inject(function (d3, Private) {
-        chart1 = Private(require('vislib_fixtures/_vis_fixture'))(visLibParams1);
-        chart2 = Private(require('vislib_fixtures/_vis_fixture'))(visLibParams2);
-        Vis = Private(require('components/vis/vis'));
-        indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-        buildHierarchicalData = Private(require('components/agg_response/hierarchical/build_hierarchical_data'));
-        require('css!components/vislib/styles/main');
-
-        var id_1 = 1;
-        var id_2 = 1;
-        var stubVis1 = new Vis(indexPattern, {
-          type: 'pie',
-          aggs: rowAgg
-        });
-        var stubVis2 = new Vis(indexPattern, {
-          type: 'pie',
-          aggs: colAgg
-        });
-
-        // We need to set the aggs to a known value.
-        _.each(stubVis1.aggs, function (agg) {
-          agg.id = 'agg_' + id_1++;
-        });
-        _.each(stubVis2.aggs, function (agg) {
-          agg.id = 'agg_' + id_2++;
-        });
-
-        data1 = buildHierarchicalData(stubVis1, fixtures.threeTermBuckets);
-        data2 = buildHierarchicalData(stubVis2, fixtures.threeTermBuckets);
-
-        chart1.render(data1);
-        chart2.render(data2);
-      });
-    });
-
-    afterEach(function () {
-      $('.visualize-chart').remove();
-      chart1 = null;
-      chart2 = null;
-    });
-
-    it('should render chart titles for all charts', function () {
-      expect($(chart1.el).find('.y-axis-chart-title').length).to.be(1);
-      expect($(chart2.el).find('.x-axis-chart-title').length).to.be(1);
-    });
-
-    describe('_validatePieData method', function () {
-      var allZeros = [
-        { slices: { children: [] } },
-        { slices: { children: [] } },
-        { slices: { children: [] } }
-      ];
-
-      var someZeros = [
-        { slices: { children: [{}] } },
-        { slices: { children: [{}] } },
-        { slices: { children: [] } }
-      ];
-
-      var noZeros = [
-        { slices: { children: [{}] } },
-        { slices: { children: [{}] } },
-        { slices: { children: [{}] } }
-      ];
-
-      it('should throw an error when all charts contain zeros', function () {
-        expect(function () {
-          chart1.ChartClass.prototype._validatePieData(allZeros);
-        }).to.throwError();
-      });
-
-      it('should not throw an error when only some or no charts contain zeros', function () {
-        expect(function () {
-          chart1.ChartClass.prototype._validatePieData(someZeros);
-        }).to.not.throwError();
-        expect(function () {
-          chart1.ChartClass.prototype._validatePieData(noZeros);
-        }).to.not.throwError();
-      });
-    });
-  });
-
-  aggArray.forEach(function (dataAgg, i) {
-    describe('Vislib PieChart Class Test Suite for ' + names[i] + ' data', function () {
-      var visLibParams = {
-        type: 'pie',
-        addLegend: true,
-        addTooltip: true
-      };
-      var vis;
-      var Vis;
-      var indexPattern;
-      var buildHierarchicalData;
-      var data;
-
-      beforeEach(function () {
-        module('PieChartFactory');
-      });
-
-      beforeEach(function () {
-        inject(function (d3, Private) {
-          vis = Private(require('vislib_fixtures/_vis_fixture'))(visLibParams);
-          Vis = Private(require('components/vis/vis'));
-          indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-          buildHierarchicalData = Private(require('components/agg_response/hierarchical/build_hierarchical_data'));
-          require('css!components/vislib/styles/main');
-
-          var id = 1;
-          var stubVis = new Vis(indexPattern, {
-            type: 'pie',
-            aggs: dataAgg
-          });
-
-          // We need to set the aggs to a known value.
-          _.each(stubVis.aggs, function (agg) { agg.id = 'agg_' + id++; });
-
-          data = buildHierarchicalData(stubVis, fixtures.threeTermBuckets);
-
-          vis.render(data);
-        });
-      });
-
-      afterEach(function () {
-        $(vis.el).remove();
-        vis = null;
-      });
-
-      describe('addPathEvents method', function () {
-        var path;
-        var d3selectedPath;
-        var onClick;
-        var onMouseOver;
-
-        beforeEach(function () {
-          inject(function (d3) {
-            vis.handler.charts.forEach(function (chart) {
-              path = $(chart.chartEl).find('path')[0];
-              d3selectedPath = d3.select(path)[0][0];
-
-              // d3 instance of click and hover
-              onClick = (!!d3selectedPath.__onclick);
-              onMouseOver = (!!d3selectedPath.__onmouseover);
-            });
-          });
-        });
-
-        it('should attach a click event', function () {
-          vis.handler.charts.forEach(function () {
-            expect(onClick).to.be(true);
-          });
-        });
-
-        it('should attach a hover event', function () {
-          vis.handler.charts.forEach(function () {
-            expect(onMouseOver).to.be(true);
-          });
-        });
-      });
-
-      describe('addPath method', function () {
-        var width;
-        var height;
-        var svg;
-        var slices;
-
-        beforeEach(function () {
-          inject(function (d3) {
-            vis.handler.charts.forEach(function (chart) {
-              width = $(chart.chartEl).width();
-              height = $(chart.chartEl).height();
-              svg = d3.select($(chart.chartEl).find('svg')[0]);
-              slices = chart.chartData.slices;
-            });
-          });
-        });
-
-        it('should return an SVG object', function () {
-          vis.handler.charts.forEach(function (chart) {
-            expect(_.isObject(chart.addPath(width, height, svg, slices))).to.be(true);
-          });
-        });
-
-        it('should draw path elements', function () {
-          vis.handler.charts.forEach(function (chart) {
-
-            // test whether path elements are drawn
-            expect($(chart.chartEl).find('path').length).to.be.greaterThan(0);
-          });
-        });
-      });
-
-      describe('draw method', function () {
-        it('should return a function', function () {
-          vis.handler.charts.forEach(function (chart) {
-            expect(_.isFunction(chart.draw())).to.be(true);
-          });
-        });
-      });
-
-      sizes.forEach(function (size) {
-        describe('containerTooSmall error', function () {
-          it('should throw an error', function () {
-            // 20px is the minimum height and width
-            vis.handler.charts.forEach(function (chart) {
-              $(chart.chartEl).height(size);
-              $(chart.chartEl).width(size);
-
-              if (size < 20) {
-                expect(function () {
-                  chart.render();
-                }).to.throwError();
-              }
-            });
-          });
-
-          it('should not throw an error', function () {
-            vis.handler.charts.forEach(function (chart) {
-              $(chart.chartEl).height(size);
-              $(chart.chartEl).width(size);
-
-              if (size > 20) {
-                expect(function () {
-                  chart.render();
-                }).to.not.throwError();
-              }
-            });
-          });
-        });
-      });
-
-    });
-  });
-});
diff --git a/test/unit/specs/vislib/visualizations/tile_maps/map.js b/test/unit/specs/vislib/visualizations/tile_maps/map.js
deleted file mode 100644
index fb3af70fb9904..0000000000000
--- a/test/unit/specs/vislib/visualizations/tile_maps/map.js
+++ /dev/null
@@ -1,198 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var L = require('leaflet');
-
-  var sinon = require('test_utils/auto_release_sinon');
-  var geoJsonData = require('vislib_fixtures/mock_data/geohash/_geo_json');
-
-  // // Data
-  // var dataArray = [
-  //   ['geojson', require('vislib_fixtures/mock_data/geohash/_geo_json')],
-  //   ['columns', require('vislib_fixtures/mock_data/geohash/_columns')],
-  //   ['rows', require('vislib_fixtures/mock_data/geohash/_rows')],
-  // ];
-
-  // // TODO: Test the specific behavior of each these
-  // var mapTypes = [
-  //   'Scaled Circle Markers',
-  //   'Shaded Circle Markers',
-  //   'Shaded Geohash Grid',
-  //   'Heatmap'
-  // ];
-
-  angular.module('MapFactory', ['kibana']);
-
-  describe('TileMap Map Tests', function () {
-    this.timeout(0);
-    var $mockMapEl = $('<div>');
-    var Map;
-    var leafletStubs = {};
-    var leafletMocks = {};
-
-    beforeEach(function () {
-      module('MapFactory');
-      inject(function (Private) {
-        // mock parts of leaflet
-        leafletMocks.tileLayer = { on: sinon.stub() };
-        leafletMocks.map = { on: sinon.stub() };
-        leafletStubs.tileLayer = sinon.stub(L, 'tileLayer', _.constant(leafletMocks.tileLayer));
-        leafletStubs.map = sinon.stub(L, 'map', _.constant(leafletMocks.map));
-
-        Map = Private(require('components/vislib/visualizations/_map'));
-      });
-    });
-
-    describe('instantiation', function () {
-      var map;
-      var createStub;
-
-      beforeEach(function () {
-        createStub = sinon.stub(Map.prototype, '_createMap', _.noop);
-        map = new Map($mockMapEl, geoJsonData, {});
-      });
-
-      it('should create the map', function () {
-        expect(createStub.callCount).to.equal(1);
-      });
-
-      it('should add zoom controls', function () {
-        var mapOptions = createStub.firstCall.args[0];
-
-        expect(mapOptions).to.be.an('object');
-        if (mapOptions.zoomControl) expect(mapOptions.zoomControl).to.be.ok();
-        else expect(mapOptions.zoomControl).to.be(undefined);
-      });
-    });
-
-    describe('createMap', function () {
-      var map;
-      var mapStubs;
-
-      beforeEach(function () {
-        mapStubs = {
-          destroy: sinon.stub(Map.prototype, 'destroy'),
-          attachEvents: sinon.stub(Map.prototype, '_attachEvents'),
-          addMarkers: sinon.stub(Map.prototype, '_addMarkers'),
-        };
-
-        map = new Map($mockMapEl, geoJsonData, {});
-      });
-
-      it('should create the create leaflet objects', function () {
-        expect(leafletStubs.tileLayer.callCount).to.equal(1);
-        expect(leafletStubs.map.callCount).to.equal(1);
-
-        var callArgs = leafletStubs.map.firstCall.args;
-        var mapOptions = callArgs[1];
-        expect(callArgs[0]).to.be($mockMapEl.get(0));
-        expect(mapOptions).to.have.property('zoom');
-        expect(mapOptions).to.have.property('center');
-      });
-
-      it('should attach events and add markers', function () {
-        expect(mapStubs.attachEvents.callCount).to.equal(1);
-        expect(mapStubs.addMarkers.callCount).to.equal(1);
-      });
-
-      it('should call destroy only if a map exists', function () {
-        expect(mapStubs.destroy.callCount).to.equal(0);
-        map._createMap({});
-        expect(mapStubs.destroy.callCount).to.equal(1);
-      });
-    });
-
-    describe('attachEvents', function () {
-      var map;
-
-      beforeEach(function () {
-        sinon.stub(Map.prototype, '_createMap', function () {
-          this._tileLayer = leafletMocks.tileLayer;
-          this.map = leafletMocks.map;
-          this._attachEvents();
-        });
-        map = new Map($mockMapEl, geoJsonData, {});
-      });
-
-      it('should attach interaction events', function () {
-        var expectedTileEvents = ['tileload'];
-        var expectedMapEvents = ['draw:created', 'moveend', 'zoomend', 'unload'];
-        var matchedEvents = {
-          tiles: 0,
-          maps: 0,
-        };
-
-        _.times(leafletMocks.tileLayer.on.callCount, function (index) {
-          var ev = leafletMocks.tileLayer.on.getCall(index).args[0];
-          if (_.includes(expectedTileEvents, ev)) matchedEvents.tiles++;
-        });
-        expect(matchedEvents.tiles).to.equal(expectedTileEvents.length);
-
-        _.times(leafletMocks.map.on.callCount, function (index) {
-          var ev = leafletMocks.map.on.getCall(index).args[0];
-          if (_.includes(expectedMapEvents, ev)) matchedEvents.maps++;
-        });
-        expect(matchedEvents.maps).to.equal(expectedMapEvents.length);
-      });
-    });
-
-
-    describe('addMarkers', function () {
-      var map;
-      var createStub;
-
-      beforeEach(function () {
-        sinon.stub(Map.prototype, '_createMap');
-        createStub = sinon.stub(Map.prototype, '_createMarkers', _.constant({ addLegend: _.noop }));
-        map = new Map($mockMapEl, geoJsonData, {});
-      });
-
-      it('should pass the map options to the marker', function () {
-        map._addMarkers();
-
-        var args = createStub.firstCall.args[0];
-        expect(args).to.have.property('tooltipFormatter');
-        expect(args).to.have.property('valueFormatter');
-        expect(args).to.have.property('attr');
-      });
-
-      it('should destroy existing markers', function () {
-        var destroyStub = sinon.stub();
-        map._markers = { destroy: destroyStub };
-        map._addMarkers();
-
-        expect(destroyStub.callCount).to.be(1);
-      });
-    });
-
-    describe('getDataRectangles', function () {
-      var map;
-
-      beforeEach(function () {
-        sinon.stub(Map.prototype, '_createMap');
-        map = new Map($mockMapEl, geoJsonData, {});
-      });
-
-      it('should return an empty array if no data', function () {
-        map = new Map($mockMapEl, {}, {});
-        var rects = map._getDataRectangles();
-        expect(rects).to.have.length(0);
-      });
-
-      it('should return an array of arrays of rectangles', function () {
-        var rects = map._getDataRectangles();
-        _.times(5, function () {
-          var index = _.random(rects.length - 1);
-          var rect = rects[index];
-          var featureRect = geoJsonData.geoJson.features[index].properties.rectangle;
-          expect(rect.length).to.equal(featureRect.length);
-
-          // should swap the array
-          var checkIndex = _.random(rect.length - 1);
-          expect(rect[checkIndex]).to.eql(featureRect[checkIndex]);
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/vislib/visualizations/tile_maps/markers.js b/test/unit/specs/vislib/visualizations/tile_maps/markers.js
deleted file mode 100644
index 8d20245167cab..0000000000000
--- a/test/unit/specs/vislib/visualizations/tile_maps/markers.js
+++ /dev/null
@@ -1,373 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var L = require('leaflet');
-  var sinon = require('test_utils/auto_release_sinon');
-  var geoJsonData = require('vislib_fixtures/mock_data/geohash/_geo_json');
-  // defaults to roughly the lower 48 US states
-  var defaultSWCoords = [13.496, -143.789];
-  var defaultNECoords = [55.526, -57.919];
-  var bounds = {};
-  var MarkerType;
-  var map;
-
-  angular.module('MarkerFactory', ['kibana']);
-
-  function setBounds(southWest, northEast) {
-    bounds.southWest = L.latLng(southWest || defaultSWCoords);
-    bounds.northEast = L.latLng(northEast || defaultNECoords);
-  }
-
-  function getBounds() {
-    return L.latLngBounds(bounds.southWest, bounds.northEast);
-  }
-
-  var mockMap = {
-    addLayer: _.noop,
-    closePopup: _.noop,
-    getBounds: getBounds,
-    removeControl: _.noop,
-    removeLayer: _.noop,
-    getZoom: _.constant(5)
-  };
-
-  describe('Marker Tests', function () {
-    var mapData;
-    var markerLayer;
-
-    function createMarker(MarkerClass, geoJson) {
-      mapData = _.assign({}, geoJsonData.geoJson, geoJson || {});
-      mapData.properties.allmin = mapData.properties.min;
-      mapData.properties.allmax = mapData.properties.max;
-
-      return new MarkerClass(mockMap, mapData, {
-        valueFormatter: geoJsonData.valueFormatter
-      });
-    }
-
-    beforeEach(function () {
-      setBounds();
-    });
-
-    afterEach(function () {
-      if (markerLayer) {
-        markerLayer.destroy();
-        markerLayer = undefined;
-      }
-    });
-
-    describe('Base Methods', function () {
-      var MarkerClass;
-
-      beforeEach(function () {
-        module('MarkerFactory');
-        inject(function (Private) {
-          MarkerClass = Private(require('components/vislib/visualizations/marker_types/base_marker'));
-          markerLayer = createMarker(MarkerClass);
-        });
-      });
-
-      describe('filterToMapBounds', function () {
-        it('should not filter any features', function () {
-          // set bounds to the entire world
-          setBounds([-87.252, -343.828], [87.252, 343.125]);
-          var boundFilter = markerLayer._filterToMapBounds();
-          var mapFeature = mapData.features.filter(boundFilter);
-
-          expect(mapFeature.length).to.equal(mapData.features.length);
-        });
-
-        it('should filter out data points that are outside of the map bounds', function () {
-          // set bounds to roughly US southwest
-          setBounds([31.690, -124.387], [42.324, -102.919]);
-          var boundFilter = markerLayer._filterToMapBounds();
-          var mapFeature = mapData.features.filter(boundFilter);
-
-          expect(mapFeature.length).to.be.lessThan(mapData.features.length);
-        });
-      });
-
-      describe('legendQuantizer', function () {
-        it('should return a range of hex colors', function () {
-          var minColor = markerLayer._legendQuantizer(mapData.properties.allmin);
-          var maxColor = markerLayer._legendQuantizer(mapData.properties.allmax);
-
-          expect(minColor.substring(0, 1)).to.equal('#');
-          expect(minColor).to.have.length(7);
-          expect(maxColor.substring(0, 1)).to.equal('#');
-          expect(maxColor).to.have.length(7);
-          expect(minColor).to.not.eql(maxColor);
-        });
-
-        it('should return a color with 1 color', function () {
-          var geoJson = { properties: { min: 1, max: 1 } };
-          markerLayer = createMarker(MarkerClass, geoJson);
-
-          // ensure the quantizer domain is correct
-          var color = markerLayer._legendQuantizer(1);
-          expect(color).to.not.be(undefined);
-          expect(color.substring(0, 1)).to.equal('#');
-
-          // should always get the same color back
-          _.times(5, function () {
-            var num = _.random(0, 100);
-            var randColor = markerLayer._legendQuantizer(0);
-            expect(randColor).to.equal(color);
-          });
-        });
-      });
-
-      describe('applyShadingStyle', function () {
-        it('should return a style object', function () {
-          var style = markerLayer.applyShadingStyle(100);
-          expect(style).to.be.an('object');
-
-          var keys = _.keys(style);
-          var expected = ['fillColor', 'color'];
-          _.each(expected, function (key) {
-            expect(keys).to.contain(key);
-          });
-        });
-
-        it('should use the legendQuantizer', function () {
-          var spy = sinon.spy(markerLayer, '_legendQuantizer');
-          var style = markerLayer.applyShadingStyle(100);
-          expect(spy.callCount).to.equal(1);
-        });
-      });
-
-      describe('showTooltip', function () {
-        it('should use the tooltip formatter', function () {
-          var content;
-          var sample = _.sample(mapData.features);
-
-          var stub = sinon.stub(markerLayer, '_tooltipFormatter', function (val) {
-            return;
-          });
-
-          markerLayer._showTooltip(sample);
-
-          expect(stub.callCount).to.equal(1);
-          expect(stub.firstCall.calledWith(sample)).to.be(true);
-        });
-      });
-
-      describe('addLegend', function () {
-        var addToSpy;
-        var leafletControlStub;
-
-        beforeEach(function () {
-          addToSpy = sinon.spy();
-          leafletControlStub = sinon.stub(L, 'control', function (options) {
-            return {
-              addTo: addToSpy
-            };
-          });
-        });
-
-        it('should do nothing if there is already a legend', function () {
-          markerLayer._legend = { legend: 'exists' }; // anything truthy
-
-          markerLayer.addLegend();
-          expect(leafletControlStub.callCount).to.equal(0);
-        });
-
-        it('should create a leaflet control', function () {
-          markerLayer.addLegend();
-          expect(leafletControlStub.callCount).to.equal(1);
-          expect(addToSpy.callCount).to.equal(1);
-          expect(addToSpy.firstCall.calledWith(markerLayer.map)).to.be(true);
-          expect(markerLayer._legend).to.have.property('onAdd');
-        });
-
-        it('should use the value formatter', function () {
-          var formatterSpy = sinon.spy(markerLayer, '_valueFormatter');
-          // called twice for every legend color defined
-          var expectedCallCount = markerLayer._legendColors.length * 2;
-
-          markerLayer.addLegend();
-          var legend = markerLayer._legend.onAdd();
-
-          expect(formatterSpy.callCount).to.equal(expectedCallCount);
-          expect(legend).to.be.a(HTMLDivElement);
-        });
-      });
-    });
-
-    describe('Shaded Circles', function () {
-      beforeEach(function () {
-        module('MarkerFactory');
-        inject(function (Private) {
-          var MarkerClass = Private(require('components/vislib/visualizations/marker_types/shaded_circles'));
-          markerLayer = createMarker(MarkerClass);
-        });
-      });
-
-      describe('geohashMinDistance method', function () {
-        it('should return a finite number', function () {
-          var sample = _.sample(mapData.features);
-          var distance = markerLayer._geohashMinDistance(sample);
-
-          expect(distance).to.be.a('number');
-          expect(_.isFinite(distance)).to.be(true);
-        });
-      });
-    });
-
-    describe('Scaled Circles', function () {
-      var zoom;
-
-      beforeEach(function () {
-        module('MarkerFactory');
-
-        zoom = _.random(1, 18);
-        sinon.stub(mockMap, 'getZoom', _.constant(zoom));
-
-        inject(function (Private) {
-          var MarkerClass = Private(require('components/vislib/visualizations/marker_types/scaled_circles'));
-          markerLayer = createMarker(MarkerClass);
-        });
-      });
-
-      describe('radiusScale method', function () {
-        var valueArray = [10, 20, 30, 40, 50, 60];
-        var max = _.max(valueArray);
-        var prev = -1;
-
-        it('should return 0 for value of 0', function () {
-          expect(markerLayer._radiusScale(0)).to.equal(0);
-        });
-
-        it('should return a scaled value for negative and positive numbers', function () {
-          var upperBound = markerLayer._radiusScale(max);
-          var results = [];
-
-          function roundValue(value) {
-            // round number to 6 decimal places
-            var r = Math.pow(10, 6);
-            return Math.round(value * r) / r;
-          }
-
-          _.each(valueArray, function (value, i) {
-            var ratio = Math.pow(value / max, 0.5);
-            var comparison = ratio * upperBound;
-            var radius = markerLayer._radiusScale(value);
-            var negRadius = markerLayer._radiusScale(value * -1);
-            results.push(radius);
-
-            expect(negRadius).to.equal(radius);
-            expect(roundValue(radius)).to.equal(roundValue(comparison));
-
-            // check that the radius is getting larger
-            if (i > 0) {
-              expect(radius).to.be.above(results[i - 1]);
-            }
-          });
-        });
-      });
-    });
-
-    describe('Heatmaps', function () {
-      beforeEach(function () {
-        module('MarkerFactory');
-
-        inject(function (Private) {
-          var MarkerClass = Private(require('components/vislib/visualizations/marker_types/heatmap'));
-          markerLayer = createMarker(MarkerClass);
-        });
-      });
-
-      describe('dataToHeatArray', function () {
-        var max;
-
-        beforeEach(function () {
-          max = mapData.properties.allmax;
-        });
-
-        it('should return an array or values for each feature', function () {
-          var arr = markerLayer._dataToHeatArray(max);
-          expect(arr).to.be.an('array');
-          expect(arr).to.have.length(mapData.features.length);
-
-        });
-
-        it('should return an array item with lat, lng, metric for each feature', function () {
-          _.times(3, function () {
-            var arr = markerLayer._dataToHeatArray(max);
-            var index = _.random(mapData.features.length - 1);
-            var feature = mapData.features[index];
-            var featureValue = feature.properties.value;
-            var featureArr = feature.geometry.coordinates.slice(0).concat(featureValue);
-            expect(arr[index]).to.eql(featureArr);
-          });
-        });
-
-        it('should return an array item with lat, lng, normalized metric for each feature', function () {
-          _.times(5, function () {
-            markerLayer._attr.heatNormalizeData = true;
-
-            var arr = markerLayer._dataToHeatArray(max);
-            var index = _.random(mapData.features.length - 1);
-            var feature = mapData.features[index];
-            var featureValue = parseInt(feature.properties.value / max * 100);
-            var featureArr = feature.geometry.coordinates.slice(0).concat(featureValue);
-            expect(arr[index]).to.eql(featureArr);
-          });
-        });
-      });
-
-      describe('tooltipProximity', function () {
-        it('should return true if feature is close enough to event latlng', function () {
-          _.times(5, function () {
-            var feature = _.sample(mapData.features);
-            var point = markerLayer._getLatLng(feature);
-            var arr = markerLayer._tooltipProximity(point, feature);
-            expect(arr).to.be(true);
-          });
-        });
-
-        it('should return false if feature is not close enough to event latlng', function () {
-          _.times(5, function () {
-            var feature = _.sample(mapData.features);
-            var point = L.latLng(90, -180);
-            var arr = markerLayer._tooltipProximity(point, feature);
-            expect(arr).to.be(false);
-          });
-        });
-      });
-
-      describe('nearestFeature', function () {
-        it('should return nearest geoJson feature object', function () {
-          _.times(5, function () {
-            var feature = _.sample(mapData.features);
-            var point = markerLayer._getLatLng(feature);
-            var nearestPoint = markerLayer._nearestFeature(point);
-            expect(nearestPoint).to.equal(feature);
-          });
-        });
-      });
-
-      describe('getLatLng', function () {
-        it('should return a leaflet latLng object', function () {
-          var feature = _.sample(mapData.features);
-          var latLng = markerLayer._getLatLng(feature);
-          var compare = L.latLng(feature.geometry.coordinates.slice(0).reverse());
-          expect(latLng).to.eql(compare);
-        });
-
-        it('should memoize the result', function () {
-          var spy = sinon.spy(L, 'latLng');
-          var feature = _.sample(mapData.features);
-
-          markerLayer._getLatLng(feature);
-          expect(spy.callCount).to.be(1);
-
-          markerLayer._getLatLng(feature);
-          expect(spy.callCount).to.be(1);
-        });
-      });
-    });
-
-  });
-});
diff --git a/test/unit/specs/vislib/visualizations/tile_maps/tile_map.js b/test/unit/specs/vislib/visualizations/tile_maps/tile_map.js
deleted file mode 100644
index bdac1b59d3e74..0000000000000
--- a/test/unit/specs/vislib/visualizations/tile_maps/tile_map.js
+++ /dev/null
@@ -1,137 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var sinon = require('test_utils/auto_release_sinon');
-
-  var geoJsonData = require('vislib_fixtures/mock_data/geohash/_geo_json');
-  var MockMap = require('fixtures/tilemap_map');
-  var mockChartEl = $('<div>');
-
-  var TileMap;
-  var extentsStub;
-
-
-  angular.module('TileMapFactory', ['kibana']);
-
-  function createTileMap(handler, chartEl, chartData) {
-    handler = handler || {};
-    chartEl = chartEl || mockChartEl;
-    chartData = chartData || geoJsonData;
-
-    var tilemap = new TileMap(handler, chartEl, chartData);
-    return tilemap;
-  }
-
-  describe('TileMap Tests', function () {
-    var tilemap;
-
-    beforeEach(function () {
-      module('TileMapFactory');
-      inject(function (Private) {
-        Private.stub(require('components/vislib/visualizations/_map'), MockMap);
-        TileMap = Private(require('components/vislib/visualizations/tile_map'));
-        extentsStub = sinon.stub(TileMap.prototype, '_appendGeoExtents', _.noop);
-      });
-    });
-
-    beforeEach(function () {
-      tilemap = createTileMap();
-    });
-
-    it('should inherit props from chartData', function () {
-      _.each(geoJsonData, function (val, prop) {
-        expect(tilemap).to.have.property(prop, val);
-      });
-    });
-
-    it('should append geoExtents', function () {
-      expect(extentsStub.callCount).to.equal(1);
-    });
-
-    describe('draw', function () {
-      it('should return a function', function () {
-        expect(tilemap.draw()).to.be.a('function');
-      });
-
-      it('should call destroy for clean state', function () {
-        var destroySpy = sinon.spy(tilemap, 'destroy');
-        tilemap.draw();
-        expect(destroySpy.callCount).to.equal(1);
-      });
-    });
-
-    describe('appendMap', function () {
-      var $selection;
-
-      beforeEach(function () {
-        $selection = $('<div>');
-        expect(tilemap.maps).to.have.length(0);
-        tilemap._appendMap($selection);
-      });
-
-      it('should add the tilemap class', function () {
-        expect($selection.hasClass('tilemap')).to.equal(true);
-      });
-
-      it('should append maps and required controls', function () {
-        expect(tilemap.maps).to.have.length(1);
-        var map = tilemap.maps[0];
-        expect(map.addTitle.callCount).to.equal(0);
-        expect(map.addFitControl.callCount).to.equal(1);
-        expect(map.addBoundingControl.callCount).to.equal(1);
-      });
-
-      it('should only add controls if data exists', function () {
-        var noData = {
-          geoJson: {
-            features: [],
-            properties: {},
-            hits: 20
-          }
-        };
-        var tilemap = createTileMap(null, null, noData);
-
-        tilemap._appendMap($selection);
-        expect(tilemap.maps).to.have.length(1);
-
-        var map = tilemap.maps[0];
-        expect(map.addTitle.callCount).to.equal(0);
-        expect(map.addFitControl.callCount).to.equal(0);
-        expect(map.addBoundingControl.callCount).to.equal(0);
-      });
-
-      it('should append title if set in the data object', function () {
-        var mapTitle = 'Test Title';
-        var tilemap = createTileMap(null, null, _.assign({ title: mapTitle }, geoJsonData));
-        tilemap._appendMap($selection);
-        var map = tilemap.maps[0];
-
-        expect(map.addTitle.callCount).to.equal(1);
-        expect(map.addTitle.firstCall.calledWith(mapTitle)).to.equal(true);
-      });
-    });
-
-    describe('destroy', function () {
-      var maps = [];
-      var mapCount = 5;
-
-      beforeEach(function () {
-        _.times(mapCount, function () {
-          maps.push(new MockMap());
-        });
-        tilemap.maps = maps;
-        expect(tilemap.maps).to.have.length(mapCount);
-        tilemap.destroy();
-      });
-
-      it('should destroy all the maps', function () {
-        expect(tilemap.maps).to.have.length(0);
-        expect(maps).to.have.length(mapCount);
-        _.each(maps, function (map) {
-          expect(map.destroy.callCount).to.equal(1);
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit/specs/vislib/visualizations/time_marker.js b/test/unit/specs/vislib/visualizations/time_marker.js
deleted file mode 100644
index d2e5d3cf9090f..0000000000000
--- a/test/unit/specs/vislib/visualizations/time_marker.js
+++ /dev/null
@@ -1,127 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var fixtures = require('fixtures/fake_hierarchical_data');
-  var series = require('vislib_fixtures/mock_data/date_histogram/_series');
-  var terms = require('vislib_fixtures/mock_data/terms/_columns');
-
-  angular.module('TimeMarkerFactory', ['kibana']);
-  describe('VisLib Time Marker Test Suite', function () {
-    var height = 50;
-    var color = '#ff0000';
-    var opacity = 0.5;
-    var width = 3;
-    var customClass = 'custom-time-marker';
-    var dateMathTimes = ['now-1m', 'now-5m', 'now-15m'];
-    var myTimes = dateMathTimes.map(function (dateMathString) {
-      return {
-        time: dateMathString,
-        class: customClass,
-        color: color,
-        opacity: opacity,
-        width: width
-      };
-    });
-    var getExtent = function (dataArray, func) {
-      return func(dataArray, function (obj) {
-        return func(obj.values, function (d) {
-          return d.x;
-        });
-      });
-    };
-    var times = [];
-    var TimeMarker;
-    var defaultMarker;
-    var customMarker;
-    var selection;
-    var xScale;
-    var minDomain;
-    var maxDomain;
-    var domain;
-
-    beforeEach(function () {
-      module('TimeMarkerFactory');
-    });
-
-    beforeEach(function () {
-      inject(function (d3, Private) {
-        TimeMarker = Private(require('components/vislib/visualizations/time_marker'));
-        minDomain = getExtent(series.series, d3.min);
-        maxDomain = getExtent(series.series, d3.max);
-        domain = [minDomain, maxDomain];
-        xScale = d3.time.scale().domain(domain).range([0, 500]);
-        defaultMarker = new TimeMarker(times, xScale, height);
-        customMarker = new TimeMarker(myTimes, xScale, height);
-
-        selection = d3.select('body').append('div').attr('class', 'marker');
-        selection.datum(series);
-      });
-    });
-
-    afterEach(function () {
-      selection.remove('*');
-      selection = null;
-      defaultMarker = null;
-    });
-
-    describe('_isTimeBaseChart method', function () {
-      var boolean;
-      var newSelection;
-
-      it('should return true when data is time based', function () {
-        boolean = defaultMarker._isTimeBasedChart(selection);
-        expect(boolean).to.be(true);
-      });
-
-      it('should return false when data is not time based', function () {
-        newSelection = selection.datum(terms);
-        boolean = defaultMarker._isTimeBasedChart(newSelection);
-        expect(boolean).to.be(false);
-      });
-    });
-
-    describe('render method', function () {
-      var lineArray;
-
-      beforeEach(function () {
-        defaultMarker.render(selection);
-        customMarker.render(selection);
-        lineArray = document.getElementsByClassName('custom-time-marker');
-      });
-
-      it('should render the default line', function () {
-        expect(!!$('line.time-marker').length).to.be(true);
-      });
-
-      it('should render the custom (user defined) lines', function () {
-        expect($('line.custom-time-marker').length).to.be(myTimes.length);
-      });
-
-      it('should set the class', function () {
-        Array.prototype.forEach.call(lineArray, function (line) {
-          expect(line.getAttribute('class')).to.be(customClass);
-        });
-      });
-
-      it('should set the stroke', function () {
-        Array.prototype.forEach.call(lineArray, function (line) {
-          expect(line.getAttribute('stroke')).to.be(color);
-        });
-      });
-
-      it('should set the stroke-opacity', function () {
-        Array.prototype.forEach.call(lineArray, function (line) {
-          expect(+line.getAttribute('stroke-opacity')).to.be(opacity);
-        });
-      });
-
-      it('should set the stroke-width', function () {
-        Array.prototype.forEach.call(lineArray, function (line) {
-          expect(+line.getAttribute('stroke-width')).to.be(width);
-        });
-      });
-    });
-
-  });
-});
\ No newline at end of file
diff --git a/test/unit/specs/vislib/visualizations/vis_types.js b/test/unit/specs/vislib/visualizations/vis_types.js
deleted file mode 100644
index 3830b5a2d4811..0000000000000
--- a/test/unit/specs/vislib/visualizations/vis_types.js
+++ /dev/null
@@ -1,31 +0,0 @@
-define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
-
-  angular.module('VisTypeFactory', ['kibana']);
-
-  describe('Vislib Vis Types Test Suite', function () {
-    var visTypes;
-    var visFunc;
-
-    beforeEach(function () {
-      module('VisTypeFactory');
-    });
-
-    beforeEach(function () {
-      inject(function (d3, Private) {
-        visTypes = Private(require('components/vislib/visualizations/vis_types'));
-        visFunc = visTypes.histogram;
-      });
-    });
-
-    it('should be an object', function () {
-      expect(_.isObject(visTypes)).to.be(true);
-    });
-
-    it('should return a function', function () {
-      expect(typeof visFunc).to.be('function');
-    });
-  });
-
-});
diff --git a/test/unit/tasks/utils/updateVersion.js b/test/unit/tasks/utils/updateVersion.js
deleted file mode 100644
index 7ef3c0cd8c794..0000000000000
--- a/test/unit/tasks/utils/updateVersion.js
+++ /dev/null
@@ -1,33 +0,0 @@
-var updateVersion = require('../../../../tasks/utils/updateVersion');
-var expect = require('expect.js');
-
-describe('tasks/utils/updateVersion', function () {
-
-  it('applies a basic "minor" update', function () {
-    expect(updateVersion('1.4.1', 'minor')).to.be('1.5.0');
-  });
-
-  it('accepts a number for a version name', function () {
-    expect(updateVersion('1.5.5', 'minor=10')).to.be('1.10.0');
-  });
-
-  it('clears the tag and updates all lower version ids', function () {
-    expect(updateVersion('0.0.1-beta2', 'major=4')).to.be('4.0.0');
-  });
-
-  it('updates just a tag', function () {
-    expect(updateVersion('4.0.0-beta1', 'tag=beta2')).to.be('4.0.0-beta2');
-  });
-
-  it('clears a tag', function () {
-    expect(updateVersion('4.0.0-rc1', 'tag=')).to.be('4.0.0');
-  });
-
-  it('adds a tag, bumping the minor version', function () {
-    expect(updateVersion('4.0.0', 'tag=snapshot')).to.be('4.1.0-snapshot');
-  });
-
-  it('changes a tag', function () {
-    expect(updateVersion('4.1.0-snapshot', 'tag=rc1')).to.be('4.1.0-rc1');
-  });
-});
diff --git a/test/utils/Nonsense.js b/test/utils/Nonsense.js
deleted file mode 100644
index 9930a119d4c1f..0000000000000
--- a/test/utils/Nonsense.js
+++ /dev/null
@@ -1,330 +0,0 @@
-(function() {
-  // random number generator from http://baagoe.org/en/wiki/Better_random_numbers_for_javascript
-  var DATA;
-
-  function hash (data) {
-    var h, i, n;
-
-    n = 0xefc8249d;
-
-    data = data.toString();
-
-    for (i = 0; i < data.length; i++) {
-      n += data.charCodeAt(i);
-      h = 0.02519603282416938 * n;
-      n = h >>> 0;
-      h -= n;
-      h *= n;
-      n = h >>> 0;
-      h -= n;
-      n += h * 0x100000000; // 2^32
-    }
-
-    return (n >>> 0) * 2.3283064365386963e-10; // 2^-32
-  }
-
-  // private random helper
-  function rnd () {
-    var t = 2091639 * this.s0 + this.c * 2.3283064365386963e-10; // 2^-32
-
-    this.c = t | 0;
-    this.s0 = this.s1;
-    this.s1 = this.s2;
-    this.s2 = t - this.c;
-    return this.s2;
-  }
-
-  function Nonsense () {
-    this.sow.apply(this, arguments);
-  }
-
-  Nonsense.prototype.sow = function () {
-    var i, seeds, seed;
-
-    this.s0 = hash(' ');
-    this.s1 = hash(this.s0);
-    this.s2 = hash(this.s1);
-    this.c = 1;
-
-    seeds = Array.prototype.slice.call(arguments);
-
-    for (i = 0; seed = seeds[i++];) {
-      this.s0 -= hash(seed);
-      this.s0 += ~~(this.s0 < 0);
-
-      this.s1 -= hash(seed);
-      this.s1 += ~~(this.s1 < 0);
-
-      this.s2 -= hash(seed);
-      this.s2 += ~~(this.s2 < 0);
-    }
-  };
-
-
-  Nonsense.prototype.uint32 = function () {
-    return rnd.apply(this) * 0x100000000; // 2^32
-  };
-
-  Nonsense.prototype.fract32 = function () {
-    return rnd.apply(this) + (rnd.apply(this) * 0x200000 | 0) * 1.1102230246251565e-16; // 2^-53
-  };
-
-  Nonsense.prototype.bool = function () {
-    return this.uint32() & 0x1 ? true : false;
-  };
-
-  Nonsense.prototype.integer = function() {
-    return this.uint32();
-  };
-
-  Nonsense.prototype.frac = function() {
-    return this.fract32();
-  };
-
-  Nonsense.prototype.real = function() {
-    return this.uint32() + this.fract32();
-  };
-
-  Nonsense.prototype.integerInRange = function(min, max) {
-    return Math.floor(this.realInRange(min, max));
-  };
-
-  Nonsense.prototype.realInRange = function(min, max) {
-    min = min || 0;
-    max = max || 0;
-    return this.frac() * (max - min) + min;
-  };
-
-  Nonsense.prototype.normal = function() {
-    return 1 - 2 * this.frac();
-  };
-
-  Nonsense.prototype.uuid = function() {
-    // from https://gist.github.com/1308368
-    var a, b;
-    for (
-      b=a='';
-      a++<36;
-      b+=~a%5|a*3&4?(a^15?8^this.frac()*(a^20?16:4):4).toString(16):'-'
-    );
-    return b;
-  };
-
-  Nonsense.prototype.pick = function(ary) {
-    return ary[this.integerInRange(0, ary.length)];
-  };
-
-  Nonsense.prototype.weightedPick = function(ary) {
-    return ary[~~(Math.pow(this.frac(), 2) * ary.length)];
-  };
-
-  // Language  ----------------------------------------------------------------
-  Nonsense.prototype.word = function() {
-    return this.pick(DATA.lipsum);
-  };
-
-  Nonsense.prototype.words = function(num) {
-    num = num || 3;
-    var ret = [];
-    for (var i = 0; i < num; i++) {
-      ret.push(this.pick(DATA.lipsum));
-    }
-    return ret.join(' ');
-  };
-
-  Nonsense.prototype.sentence = function() {
-    var ret;
-    ret = this.words(this.integerInRange(2, 16)).replace(/[a-z]/, function(m) {
-      return m.toUpperCase();
-    });
-    return ret + '.';
-  };
-
-  Nonsense.prototype.sentences = function(num) {
-    num = num || 3;
-    var ret = [];
-    for (var i = 0; i < num; i++) {
-      ret.push(this.sentence());
-    }
-    return ret.join(' ');
-  };
-
-  // Time  --------------------------------------------------------------------
-  Nonsense.prototype.timestamp = function(a, b) {
-    return this.realInRange(a || 946684800000, b || 1577862000000);
-  };
-
-  // People  ------------------------------------------------------------------
-  Nonsense.prototype.gender = function () {
-    return this.bool() ? 'male' : 'female';
-  };
-
-  Nonsense.prototype.firstName = function(gender) {
-    gender = gender || this.gender();
-    return "" + (this.pick(DATA.names.first[gender]));
-  };
-
-  Nonsense.prototype.lastName = function() {
-    return "" + (this.pick(DATA.names.last));
-  };
-
-  Nonsense.prototype.name = function(gender) {
-    return "" + (this.firstName(gender)) + " " + (this.lastName());
-  };
-
-  Nonsense.prototype.jobTitle = function() {
-    return "" + (this.pick(DATA.departments)) + " " + (this.pick(DATA.positions));
-  };
-
-  Nonsense.prototype.buzzPhrase = function() {
-    return "" + (this.pick(DATA.buzz.verbs)) + " " + (this.pick(DATA.buzz.adjectives)) + " " + (this.pick(DATA.buzz.nouns));
-  };
-
-  // Dataset  -----------------------------------------------------------------
-  DATA = {
-    lipsum: [
-      "lorem", "ipsum", "dolor", "sit", "amet", "consectetur",
-      "adipiscing", "elit", "nunc", "sagittis", "tortor", "ac", "mi",
-      "pretium", "sed", "convallis", "massa", "pulvinar", "curabitur",
-      "non", "turpis", "velit", "vitae", "rutrum", "odio", "aliquam",
-      "sapien", "orci", "tempor", "sed", "elementum", "sit", "amet",
-      "tincidunt", "sed", "risus", "etiam", "nec", "lacus", "id", "ante",
-      "hendrerit", "malesuada", "donec", "porttitor", "magna", "eget",
-      "libero", "pharetra", "sollicitudin", "aliquam", "mattis", "mattis",
-      "massa", "et", "porta", "morbi", "vitae", "magna", "augue",
-      "vestibulum", "at", "lectus", "sed", "tellus", "facilisis",
-      "tincidunt", "suspendisse", "eros", "magna", "consequat", "at",
-      "sollicitudin", "ac", "vestibulum", "vel", "dolor", "in", "egestas",
-      "lacus", "quis", "lacus", "placerat", "et", "molestie", "ipsum",
-      "scelerisque", "nullam", "sit", "amet", "tortor", "dui", "aenean",
-      "pulvinar", "odio", "nec", "placerat", "fringilla", "neque", "dolor"
-    ],
-    names: {
-      first: {
-        // Top names from 1913-2012
-        // Data from http://www.ssa.gov/OACT/babynames/decades/century.html
-        male: [
-          "James", "John", "Robert", "Michael", "William", "David", "Richard",
-          "Joseph", "Charles", "Thomas", "Christopher", "Daniel", "Matthew",
-          "Donald", "Anthony", "Paul", "Mark", "George", "Steven", "Kenneth",
-          "Andrew", "Edward", "Brian", "Joshua", "Kevin", "Ronald", "Timothy",
-          "Jason", "Jeffrey", "Gary", "Ryan", "Nicholas", "Eric", "Stephen",
-          "Jacob", "Larry", "Frank", "Jonathan", "Scott", "Justin", "Raymond",
-          "Brandon", "Gregory", "Samuel", "Patrick", "Benjamin", "Jack",
-          "Dennis", "Jerry", "Alexander", "Tyler", "Douglas", "Henry", "Peter",
-          "Walter", "Aaron", "Jose", "Adam", "Harold", "Zachary", "Nathan",
-          "Carl", "Kyle", "Arthur", "Gerald", "Lawrence", "Roger", "Albert",
-          "Keith", "Jeremy", "Terry", "Joe", "Sean", "Willie", "Jesse",
-          "Ralph", "Billy", "Austin", "Bruce", "Christian", "Roy", "Bryan",
-          "Eugene", "Louis", "Harry", "Wayne", "Ethan", "Jordan", "Russell",
-          "Alan", "Philip", "Randy", "Juan", "Howard", "Vincent", "Bobby",
-          "Dylan", "Johnny", "Phillip", "Craig"
-        ],
-
-        female: [
-          "Mary", "Patricia", "Elizabeth", "Jennifer", "Linda", "Barbara",
-          "Susan", "Margaret", "Jessica", "Dorothy", "Sarah", "Karen", "Nancy",
-          "Betty", "Lisa", "Sandra", "Helen", "Donna", "Ashley", "Kimberly",
-          "Carol", "Michelle", "Amanda", "Emily", "Melissa", "Laura", "Deborah",
-          "Stephanie", "Rebecca", "Sharon", "Cynthia", "Ruth", "Kathleen",
-          "Anna", "Shirley", "Amy", "Angela", "Virginia", "Brenda", "Pamela",
-          "Catherine", "Katherine", "Nicole", "Christine", "Janet", "Debra",
-          "Carolyn", "Samantha", "Rachel", "Heather", "Maria", "Diane",
-          "Frances", "Joyce", "Julie", "Martha", "Joan", "Evelyn", "Kelly",
-          "Christina", "Emma", "Lauren", "Alice", "Judith", "Marie", "Doris",
-          "Ann", "Jean", "Victoria", "Cheryl", "Megan", "Kathryn", "Andrea",
-          "Jacqueline", "Gloria", "Teresa", "Janice", "Sara", "Rose", "Julia",
-          "Hannah", "Theresa", "Judy", "Mildred", "Grace", "Beverly", "Denise",
-          "Marilyn", "Amber", "Danielle", "Brittany", "Diana", "Jane", "Lori",
-          "Olivia", "Tiffany", "Kathy", "Tammy", "Crystal", "Madison"
-        ]
-      },
-
-      last: [
-        "Smith", "Johnson", "Williams", "Jones", "Brown", "Davis",
-        "Miller", "Wilson", "Moore", "Taylor", "Anderson", "Thomas",
-        "Jackson", "White", "Harris", "Martin", "Thompson", "Garcia",
-        "Martinez", "Robinson", "Clark", "Rodriguez", "Lewis", "Lee",
-        "Walker", "Hall", "Allen", "Young", "Hernandez", "King",
-        "Wright", "Lopez", "Hill", "Scott", "Green", "Adams", "Baker",
-        "Gonzalez", "Nelson", "Carter", "Mitchell", "Perez", "Roberts",
-        "Turner", "Phillips", "Campbell", "Parker", "Evans", "Edwards",
-        "Collins", "Stewart", "Sanchez", "Morris", "Rogers", "Reed",
-        "Cook", "Morgan", "Bell", "Murphy", "Bailey", "Rivera",
-        "Cooper", "Richardson", "Cox", "Howard", "Ward", "Torres",
-        "Peterson", "Gray", "Ramirez", "James", "Watson", "Brooks",
-        "Kelly", "Sanders", "Price", "Bennett", "Wood", "Barnes",
-        "Ross", "Henderson", "Coleman", "Jenkins", "Perry", "Powell",
-        "Long", "Patterson", "Hughes", "Flores", "Washington", "Butler",
-        "Simmons", "Foster", "Gonzales", "Bryant", "Alexander",
-        "Russell", "Griffin", "Diaz", "Hayes"
-      ]
-    },
-
-    departments: ['HR', 'IT', 'Marketing', 'Engineering', 'Sales'],
-
-    positions: ['Director', 'Manager', 'Team Lead', 'Team Member'],
-
-    internet: {
-      tlds: ['.com', '.net', '.org', '.edu', '.co.uk']
-    },
-
-    buzz: {
-      nouns: [
-        "action-items", "applications", "architectures", "bandwidth",
-        "channels", "communities", "content", "convergence",
-        "deliverables", "e-business", "e-commerce", "e-markets",
-        "e-services", "e-tailers", "experiences", "eyeballs",
-        "functionalities", "infomediaries", "infrastructures",
-        "initiatives", "interfaces", "markets", "methodologies",
-        "metrics", "mindshare", "models", "networks", "niches",
-        "paradigms", "partnerships", "platforms", "portals",
-        "relationships", "ROI", "schemas", "solutions", "supply-chains",
-        "synergies", "systems", "technologies", "users", "vortals",
-        "web services", "web-readiness"
-      ],
-      adjectives: [
-        "24/365", "24/7", "B2B", "B2C", "back-end", "best-of-breed",
-        "bleeding-edge", "bricks-and-clicks", "clicks-and-mortar",
-        "collaborative", "compelling", "cross-media", "cross-platform",
-        "customized", "cutting-edge", "distributed", "dot-com",
-        "dynamic", "e-business", "efficient", "end-to-end",
-        "enterprise", "extensible", "frictionless", "front-end",
-        "global", "granular", "holistic", "impactful", "innovative",
-        "integrated", "interactive", "intuitive", "killer",
-        "leading-edge", "magnetic", "mission-critical", "multiplatform",
-        "next-generation", "one-to-one", "open-source",
-        "out-of-the-box", "plug-and-play", "proactive", "real-time",
-        "revolutionary", "rich", "robust", "scalable", "seamless",
-        "sexy", "sticky", "strategic", "synergistic", "transparent",
-        "turn-key", "ubiquitous", "user-centric", "value-added",
-        "vertical", "viral", "virtual", "visionary", "web-enabled",
-        "wireless", "world-class"
-      ],
-      verbs: [
-        "aggregate", "architect", "benchmark", "brand", "cultivate",
-        "deliver", "deploy", "disintermediate", "drive", "e-enable",
-        "embrace", "empower", "enable", "engage", "engineer", "enhance",
-        "envisioneer", "evolve", "expedite", "exploit", "extend",
-        "facilitate", "generate", "grow", "harness", "implement",
-        "incentivize", "incubate", "innovate", "integrate", "iterate",
-        "leverage", "matrix", "maximize", "mesh", "monetize", "morph",
-        "optimize", "orchestrate", "productize", "recontextualize",
-        "redefine", "reintermediate", "reinvent", "repurpose",
-        "revolutionize", "scale", "seize", "strategize", "streamline",
-        "syndicate", "synergize", "synthesize", "target", "transform",
-        "transition", "unleash", "utilize", "visualize", "whiteboard"
-      ]
-    }
-  };
-
-  if (typeof module !== 'undefined') {
-    module.exports = Nonsense;
-  } else if (typeof define == 'function') {
-    define(function () {
-      return Nonsense;
-    });
-  } else {
-    this.Nonsense = Nonsense;
-  }
-}).call(this);
diff --git a/test/utils/agg_param_writer.js b/test/utils/agg_param_writer.js
deleted file mode 100644
index 89e5102c46c97..0000000000000
--- a/test/utils/agg_param_writer.js
+++ /dev/null
@@ -1,106 +0,0 @@
-define(function (require) {
-  return function AggParamWriterHelper(Private) {
-    var _ = require('lodash');
-    var Vis = Private(require('components/vis/vis'));
-    var aggTypes = Private(require('components/agg_types/index'));
-    var visTypes = Private(require('registry/vis_types'));
-    var stubbedLogstashIndexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-
-    /**
-     * Helper object for writing aggParams. Specify an aggType and it will find a vis & schema, and
-     * wire up the supporting objects required to feed in parameters, and get #write() output.
-     *
-     * Use cases:
-     *  - Verify that the interval parameter of the histogram visualization casts its input to a number
-     *    ```js
-     *    it('casts to a number', function () {
-     *      var writer = new AggParamWriter({ aggType: 'histogram' });
-     *      var output = writer.write({ interval : '100/10' });
-     *      expect(output.params.interval).to.be.a('number');
-     *      expect(output.params.interval).to.be(100);
-     *    });
-     *    ```
-     *
-     * @class AggParamWriter
-     * @param {object} opts - describe the properties of this paramWriter
-     * @param {string} opts.aggType - the name of the aggType we want to test. ('histogram', 'filter', etc.)
-     */
-    function AggParamWriter(opts) {
-      var self = this;
-
-      self.aggType = opts.aggType;
-      if (_.isString(self.aggType)) {
-        self.aggType = aggTypes.byName[self.aggType];
-      }
-
-      // not configurable right now, but totally required
-      self.indexPattern = stubbedLogstashIndexPattern;
-
-      // the vis type we will use to write the aggParams
-      self.visType = null;
-
-      // the schema that the aggType satisfies
-      self.visAggSchema = null;
-
-      // find a suitable vis type and schema
-      _.find(visTypes, function (visType) {
-        var schema = _.find(visType.schemas.all, function (schema) {
-          // type, type, type, type, type... :(
-          return schema.group === self.aggType.type;
-        });
-
-        if (schema) {
-          self.visType = visType;
-          self.visAggSchema = schema;
-          return true;
-        }
-      });
-
-      if (!self.aggType || !self.visType || !self.visAggSchema) {
-        throw new Error('unable to find a usable visType and schema for the ' + opts.aggType + ' agg type');
-      }
-
-      self.vis = new Vis(self.indexPattern, {
-        type: self.visType
-      });
-    }
-
-    AggParamWriter.prototype.write = function (paramValues) {
-      var self = this;
-      paramValues = _.clone(paramValues);
-
-      if (self.aggType.params.byName.field && !paramValues.field) {
-        // pick a field rather than force a field to be specified everywhere
-        if (self.aggType.type === 'metrics') {
-          paramValues.field = _.sample(self.indexPattern.fields.byType.number);
-        } else {
-          paramValues.field = _.sample(self.indexPattern.fields.byType.string);
-        }
-      }
-
-      self.vis.setState({
-        type: self.vis.type.name,
-        aggs: [{
-          type: self.aggType,
-          schema: self.visAggSchema,
-          params: paramValues
-        }]
-      });
-
-      var aggConfig = _.find(self.vis.aggs, function (aggConfig) {
-        return aggConfig.type === self.aggType;
-      });
-
-      aggConfig.type.params.forEach(function (param) {
-        if (param.onRequest) {
-          param.onRequest(aggConfig);
-        }
-      });
-
-      return aggConfig.type.params.write(aggConfig);
-    };
-
-    return AggParamWriter;
-
-  };
-});
\ No newline at end of file
diff --git a/test/utils/auto_release_sinon.js b/test/utils/auto_release_sinon.js
deleted file mode 100644
index fee131acbd015..0000000000000
--- a/test/utils/auto_release_sinon.js
+++ /dev/null
@@ -1,63 +0,0 @@
-define(function (require) {
-
-  var sinon = require('sinon/sinon');
-  var _ = require('lodash');
-
-  var toRestore = [];
-  var toWrap = {
-    stub: null,
-    spy: null,
-    useFakeTimers: function (clock) {
-      // timeouts are indexed by their id in an array,
-      // the holes make the .length property "wrong"
-      clock.timeoutCount = function () {
-        return clock.timeoutList().length;
-      };
-
-      clock.timeoutList = function () {
-        return clock.timeouts ? clock.timeouts.filter(Boolean) : [];
-      };
-    }
-  };
-
-  _.forOwn(toWrap, function (modify, method) {
-    var orig = sinon[method];
-    sinon[method] = function () {
-      var obj = orig.apply(sinon, arguments);
-
-      // after each test this list is cleared
-      if (obj.restore) toRestore.push(obj);
-
-      if (typeof modify === 'function') modify(obj);
-
-      return obj;
-    };
-
-    _.forOwn(orig, function (val, name) {
-      sinon[method][name] = val;
-    });
-  });
-
-  // helper
-  sinon.decorateWithSpy = _.restParam(function (props) {
-    return function ($delegate) {
-      props.forEach(function (prop) {
-        sinon.spy($delegate, prop);
-      });
-
-      return $delegate;
-    };
-  });
-
-  afterEach(function () {
-    if (!toRestore.length) return;
-
-    _.each(toRestore, function (obj) {
-      obj.restore();
-    });
-
-    toRestore = [];
-  });
-
-  return sinon;
-});
diff --git a/test/utils/ensure_elasticsearch.js b/test/utils/ensure_elasticsearch.js
deleted file mode 100644
index 68e5dd567caf7..0000000000000
--- a/test/utils/ensure_elasticsearch.js
+++ /dev/null
@@ -1,41 +0,0 @@
-var portscanner = require('portscanner');
-var path = require('path');
-var Promise = require('bluebird');
-var libesvm = require('libesvm');
-
-function startEs() {
-  var options = {
-    version: '1.4.4',
-    directory: path.join(__dirname, '..', '..', 'esvm'),
-    config: {
-      'cluster.name': 'test',
-      'network.host': '127.0.0.1'
-    }
-  };
-  var cluster = libesvm.createCluster(options);
-  return cluster.install().then(function () {
-    return cluster.start();
-  }).then(function () {
-    after(function () {
-      this.timeout(120000);
-      return cluster.shutdown();
-    });
-    return cluster;
-  });
-}
-
-function maybeStartES() {
-  return new Promise(function (resolve, reject) {
-    portscanner.checkPortStatus(9200, '127.0.0.1', function (err, status) {
-      if (err) return reject(err);
-      if (status === 'closed') return startEs().then(resolve);
-      resolve();
-    });
-  });
-}
-
-before(function () {
-  this.timeout(120000);
-  return maybeStartES();
-});
-
diff --git a/test/utils/find_port.js b/test/utils/find_port.js
deleted file mode 100644
index 2cc89e26c9dcd..0000000000000
--- a/test/utils/find_port.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var Promise = require('bluebird');
-var portscanner = require('portscanner');
-module.exports = function findPort(start, end, host) {
-  host = host || 'localhost';
-  return new Promise(function (resolve, reject) {
-    portscanner.findAPortNotInUse(start, end, host, function (err, port) {
-      if (err) return reject(err);
-      resolve(port);
-    });
-  });
-};
-
diff --git a/test/utils/istanbul_reporter/report.clientside.jade b/test/utils/istanbul_reporter/report.clientside.jade
deleted file mode 100644
index 080c206ae231f..0000000000000
--- a/test/utils/istanbul_reporter/report.clientside.jade
+++ /dev/null
@@ -1,406 +0,0 @@
-#coverage
-  h1#overview Coverage
-  #menu
-    li
-      a(href='#overview')
-        | overview
-        span.cov(class=coverageClass(cov.coverage)) #{cov.coverage | 0}
-
-    for dir in cov.dirs
-      li.dirname
-        | #{dir.name || '.'}
-        span.cov &#9733;
-      for file in dir.files
-        li
-          span.cov(class=coverageClass(file.coverage)) #{file.coverage | 0}
-          a(href='##{file.filename}')
-            span.basename= file.relname
-
-    a#logo(href='http://visionmedia.github.io/mocha/') m
-
-
-  #stats(class=coverageClass(cov.coverage))
-    .percentage #{cov.coverage | 0}%
-    .sloc= cov.sloc
-    .hits= cov.hits
-    .misses= cov.misses
-
-  #files
-    for dir in cov.dirs
-      for file in dir.files
-        .file
-          h2(id=file.filename)= file.filename
-          #stats(class=coverageClass(file.coverage))
-            .percentage #{file.coverage | 0}%
-            .sloc= file.sloc
-            .hits= file.hits
-            .misses= file.misses
-
-          table#source
-            thead
-              tr
-                th Line
-                th Hits
-                th Source
-            tbody
-              for line, number in file.source
-                - id = file.filename + ':' + number;
-                if line.coverage > 0
-                  tr.hit(id=id)
-                    td.line: a(href='#' + id)= number
-                    td.hits= line.coverage
-                    td.source= line.source
-                else if 0 === line.coverage
-                  tr.miss(id=id)
-                    td.line: a(href='#' + id)= number
-                    td.hits 0
-                    td.source= line.source
-                else
-                  tr(id=id)
-                    td.line: a(href='#' + id)= number
-                    td.hits
-                    td.source= line.source || ' '
-
-style.
-  body {
-    font: 14px/1.6 "Helvetica Neue", Helvetica, Arial, sans-serif;
-    margin: 0;
-    color: #2C2C2C;
-    border-top: 2px solid #ddd;
-  }
-
-  .coverage-stats {
-    font-size: 12px;
-    margin: 0;
-    padding: 0;
-    color: white;
-    text-align: right;
-    border: none;
-    box-shadow: none;
-    position: fixed;
-    bottom: 40px;
-    right: 10px;
-  }
-
-  #coverage {
-    padding: 60px 60px 350px;
-  }
-
-  h1 a {
-    color: inherit;
-    font-weight: inherit;
-  }
-
-  h1 a:hover {
-    text-decoration: none;
-  }
-
-  .onload h1 {
-    opacity: 1;
-  }
-
-  h2 {
-    width: 80%;
-    margin-top: 80px;
-    margin-bottom: 0;
-    font-weight: 100;
-    letter-spacing: 1px;
-    border-bottom: 1px solid #eee;
-  }
-
-  a {
-    color: #8A6343;
-    font-weight: bold;
-    text-decoration: none;
-  }
-
-  a:hover {
-    text-decoration: underline;
-  }
-
-  ul {
-    margin-top: 20px;
-    padding: 0 15px;
-    width: 100%;
-  }
-
-  ul li {
-    float: left;
-    width: 40%;
-    margin-top: 5px;
-    margin-right: 60px;
-    list-style: none;
-    border-bottom: 1px solid #eee;
-    padding: 5px 0;
-    font-size: 12px;
-  }
-
-  ul::after {
-    content: '.';
-    height: 0;
-    display: block;
-    visibility: hidden;
-    clear: both;
-  }
-
-  code {
-    font: 12px monaco, monospace;
-  }
-
-  pre {
-    margin: 30px;
-    padding: 30px;
-    border: 1px solid #eee;
-    border-bottom-color: #ddd;
-    -webkit-border-radius: 2px;
-    -moz-border-radius: 2px;
-    border-radius: 2px;
-    -webkit-box-shadow: inset 0 0 10px #eee;
-    -moz-box-shadow: inset 0 0 10px #eee;
-    box-shadow: inset 0 0 10px #eee;
-    overflow-x: auto;
-  }
-
-  img {
-    margin: 30px;
-    padding: 1px;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    border-radius: 3px;
-    -webkit-box-shadow: 0 3px 10px #dedede, 0 1px 5px #888;
-    -moz-box-shadow: 0 3px 10px #dedede, 0 1px 5px #888;
-    box-shadow: 0 3px 10px #dedede, 0 1px 5px #888;
-    max-width: 100%;
-  }
-
-  footer {
-    background: #eee;
-    width: 100%;
-    padding: 50px 0;
-    text-align: right;
-    border-top: 1px solid #ddd;
-  }
-
-  footer span {
-    display: block;
-    margin-right: 30px;
-    color: #888;
-    font-size: 12px;
-  }
-
-  #menu {
-    position: fixed;
-    font-size: 12px;
-    overflow-y: auto;
-    top: 0;
-    right: 0;
-    margin: 0;
-    height: 100%;
-    padding: 15px 0;
-    text-align: right;
-    border-left: 1px solid #eee;
-    -moz-box-shadow: 0 0 2px #888
-       , inset 5px 0 20px rgba(0,0,0,.5)
-       , inset 5px 0 3px rgba(0,0,0,.3);
-    -webkit-box-shadow: 0 0 2px #888
-       , inset 5px 0 20px rgba(0,0,0,.5)
-       , inset 5px 0 3px rgba(0,0,0,.3);
-    box-shadow: 0 0 2px #888
-       , inset 5px 0 20px rgba(0,0,0,.5)
-       , inset 5px 0 3px rgba(0,0,0,.3);
-    -webkit-font-smoothing: antialiased;
-    background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGYAAABmCAMAAAAOARRQAAABelBMVEUjJSU6OzshIyM5OjoqKy02NjgsLS01NTYjJCUzNTUgISMlJSc0NTUvMDA6PDwlJyg1NjYoKis2NjYrLS02ODkpKyw0NDYrLC04ODovLzA4Ojo0NDUtLy86OjwjIyU4OTosLS82ODgtLS8hIyQvMTEnKCooKSsrKy0qLCwkJSUnKCkrLCwpKiwwMjIxMzMqLC0tLS0pKissLC00NTYwMDIwMTQpKysoKSovMDEtLzA2OTkxMzUrKywvLy8qKyszNTY5OzsqKiw6OjswMDExNDUoKiozNDUvMDIyNDY1Njg2Njk5OTozMzU0NjY4ODkiIyUiIyQ4OTkuMDEmKCowMjQwMTErLS4qKywwMTMhIiMpKiopKy0tLjAkJScxNDQvLzExNDYyNDQmKCk5OTslJig5OjskJSYxMzQrLS8gISIwMTIoKCk1NTUlJSUnJygwMDA4ODgiIiMhISI8PDw6Ojo5OTkpKSojIyQ7OzsyMjIpKSssLCw6Ozw1NjlrfLakAAAg2UlEQVR42jR6i3ea6rYvPgANIAhVXh8WvkQlioUiFlFcBtAmoiRNdzxqu9p0J7vrdK29zuPeex77nnvO/35n1r1ndHRktI0jTOacv/l7lCBK5UqVpOha/YxmWK7BC4TQFKVXrbYsnimqxuuMVlOQ0XltWjUdCwRJ1M+tC1KudOs9q6+da2adUewG0SC0SwELfHtgDds93VEuydEbl3QMWeNoYkR7b/0x1ZRobGI3mLwzAhePqTAwhg6aogjNsGy7/jwQ4rkdqe7CWLxF8k9LfMVFyRS7VJqtkrW8Vt/bkR8FZJao16ipknbC3Yw2lM7laO6HBEOadEZ2tpf65c4v8e3u7FyU6qbiNNyCuzXZ6pawgnwgmrpTT/Q7w2EZmiIJ0dzWDI7mhQ80IfRnMu2kzA5r5r1pIFoia+/d93HRYp1GV8TbrkWoU/+jdI0Ff6yGwTjT1Hn8J+8m1rKpGiYPuNiHnMtNMIv+zpsk84MYTNW1/+DpwXLvckdOCMYowVNPREe0QlM8xRHXXFhcNDzupwsSmb5pH+0t0RP2Qk+QtI7F1Qm6JRC6ZPBtPq/dq/kH+jxtCljn9TIpW6rQIgmSVyj6lPICIw4N/taka41PFUInth0je9+jO6Kt1G4/a7V2LEgG02B0pHVuCZrgltSKMuIl5SyufUv9mYuQi+mFgzbBEtFo2g+Dh4sSTrLNu8JPh00sQydpb00tqXBvqRN7Q7kqzcnIxCGnvZt/WmJacoOEO6Dcn8Qre03pOCSQxbMOXUuDNx9SxuLz4W1I18gvjViQ67zV0rxdWL8Te/TQkuo8STS41DR48W7L6YP2uWIqiUV8rd6Gbf/rnegKZeG8TpAM6afhGze9JAOxbLjsnUXEbrZ9vLYd7MT32cPF5mKKxmjy7huaoD9n62GOxni3iIJwv0IzZAZjdZkUtolCNLVfYZNaquFjGszVVf+J0vrz4CawoKdHnOzb0NMH7CDBOybfYNJ4rfeMyFNjkFYVTzMFs87rnPGXLUOeNKRVc0LnU7/UIgelzsy3CMuth0YfvnY0wsD3vODUL3eJcKqHQpm8yM3XZQWJxO6Un9iYloyyLpOwN2obHy6W6gbpcb44XmyC+mg+itAcaprGcrwZCqMj/GmtKn0zPvpTz/Cv1dw21XwP3cRupg3H3MF/S71eTKj1YrdwKdc2Mw0fRmb2sFf8lW3aU6JbIZSEPqvXvjM7G/aApyXlXeqKfMq0g/Su3rUGJPSPrtGElgknrZM3xUXqsAP6zMCNVn5u8aJnSNpJv2uru7t2jfRziW2+GuhqfldUNbPk71olwo+46ePUo1U3WKk/e5YK07F/wGRgcpODmQnIlVeHCWBE4puBi2jq28UKpqiN1/4UOrGz59TNYrrQHtd+11sG40BGD+pXdelNqGOg4NXe8W4eacJV/NS9/2Umtym6WQqveqR9xdCMElpxnbkalM4Vf9uaEcWZaKdyibEIjWKxJZPN95niCL3GiaXyssIrHxoLkqkzLCXULN46/f2h3tQJgyip+Tk9EAjJ9aJshq7t8X45aowSKspMSvPf7r9R8yxNptIaHS5ozuEm6luPDApugyNP8OaqiQ4BjaequXA54SLC83eHIY2r+CZp4409Xqw8Aa2oI7XkCrQi+in0w5AqF/kLNrcUz+qkl/lAobY1jSnx5OJNhyXIz3qfNFlXc0TKaglNwdWkWYt9QQ1Kr6W8zue21iNrdJk+N5oCr2O9nEtWKC7IS5J/zdDEYrmnAYfg6agCy+qcgz7ZofeDc4PbUWSvkshWuAc7OjiUyLkj+RAtdlwXJcjxdpkTTHDhK8lBCi8+JtvDVL1W6elmOM++YS0LuSlaP1oUvAeiW3cFnvTr8EbTz1tsSMYdGeZe40sRWu5uAfj7q+ZoKv2FNQ0p5XY1lmlcigHZqTPpabufEVrNuNPi165w3uCVQJHyJqmSJ7ZHnguqwtCmwViIJijj04ba2JNYtB+yORf5gg1/9t9iw4vUpeqiunSAbf+IBdj/b+iG2qrHvuNP0Vd/+ThVZT/lrvHYjjgDbbyxaqgHNM2uhxa1GW3UedZYhMMwM4mQhltouK+IV4NdbIQNM+8Yv311RZk9kT4tiYR4LkyFcuPpdcjuhUuFqBAWRZa11lcZ3gEBlXywsNhrt+plISZP5DlsV9l4EgY6J3yZPTUcMrgaWAT3oI79eSbGEbcJpr6BD8kyDiVt+G0/hXosQN4NFXKlfWIfsIs0BHODVok1/IGnKFHJYIquh8Xo+2+bkQNTGgWmN/fZ0Y33LSj6lr1GyV7mWIKg7ZTRZPGuhF/zjRNcQ1UPtSYgnWQxSs0yrVhwNDcdGMNSNe2JT3WuzbAM3HykyAajS3Uphf6STKEqxLas9EnmnhA/lyj9Uj+JoY7SVgVmGLl46Rm2u98sbkap2lzAdKBG4r6LgulQOSSjQv1GWdQ0jtDUK/mAaqM1Uqjpu4k3Rvfvxv7YTxLSK+wN3E5jVIzmF23uZ7hiH/sVP49D7tvoKp4S8b1LuvRlivVB/algbhcFITYVXvDpLzpDfplR2uD5V4XJFxpjmIpLc9Y5sB2TpBRix7Bme6GZIq+06v3XzNeTcA4obQIKxrnT4C2JpOqD92dbmSX8MGazly5EsZVMvSU1f4RZwyu8iQXbVdeLlZrjuTT1jrY1uk5c7iZ7RsvhhluqAkq4JpVQAg7RJFtSu+xgJ8Pv6O1j5DkLxT8mkbfyRW5DrQmG7hiDIjCgBsADbjuof6YHLGeV6a5Q1Smx9joUXPpdaaDx97A/Wq00oJkdR7ZYuQRfS533JtxO1erduqWOYIt3wh0wpbLuCNIYkwxbswbikCUu2CDCS+Q+7rgVtfRcm+SOcdKPRlZ/rE7wNVUEE39KTS5uvUKN1PUnkloPkyzhyGQ8qkouEjJ3H/VXdqG6asSRiw3ecMlBvDDt8dDhBHXMwZ2Cajzjr7/76T+IavqPYvz6r7//E/3X3+N//h/0QozbjPgPiir69P/8X3/9F/yv8b/827/++98WItPu5/Hvwd8YPf5bp/2/lX/T/+Of/0MJ/lYTa+L/Ef+d9vN/3/2T6P/+jyTzu/evf6U7vxN7B6pJkRtAF6jUr8I+P8RsP/ptGhfqFk+pQ/DgAy6NJtRYJdXmp4gK7WLqLKJ+MaKhGjOojvL+SnIWrkpy0SLHDe4QuyNzaEA15mLMCcmE8Em+4HdOihW4/ZWuppJEmzeAwcDtv7MuLc9y2V5atvxXNe3S4DUMt5/Qy2LM9kSYKiVWBuKlfp4nxTntpuW03JbIlkiRvBXmT23g1I2OYe6IizUHPIq6zm6mbfsbteKmi/sg9J+ocQBMctGFO7iljo8TPN+z3jxw4do+ZwfqoR9dkNTKHyM305GpTkfhcHexVkPVGEbUOjuo9f0UMPHBFlGEx0SLvJvVRKTwW7PSew5oPme+E42+frJa9cGt2njS3dK5kIif2eYbhuSEQXEqMVfUjhGIuin0G0/W5ezJyJQy3SpMLai4M0JUWb5u1k9tny5bd1pPwYBpQuDCXZl62xg4CdVEAtflXHs6JKmP/pH6mOl796Lgopj0o8d5kKh00hxG3OSdEE/QBo9Hgr8JJqAeLDwJohG5j/DGh61Rc/+tf22/8kEnxHNCEjo0ElvvGfESZkqmz2BDcKV1H1buSkhkdg7p1IMGs2s17nYjpblrWuE2K9WEO/hcRp5e9oOF/QBmOaDtgil+oaU6szPrdwW65fOB0KUTsVUn7LFU7J8e6cxJIl9+FHw5MQMzuQJ+4oxMH3iW/5GK+hWuG0T+gTLs+fAjdtUd58TmIUq04EeyRCYCjkldow234aIgR5bqwrtZosZ+6YEqAmDqatJ9lWasz4IquKALPtd92hGI3Z2BdzzZue+REl1Om4DIWD+RrtUTOJLI+S0jHowXXdAxsGLSd40zYNuEUlOGhrwL6c7tcOtUOvpJCP7QBQS19H+GvZn05ewjlVLz+IGKoC9TyfQjLMBNmXCuqqtTdOSukZW48B0HqgSTCBrBnlFvF4CG2Su7yFzqmJFURK3UmTT3ru050r0ptUpMilYnBJWfl2Bv6kPlUuE1kxxpdzui9AubsR2N2boVSu81OulAwBqoSr1LZ0LLYOomyZHmjqnXlP72s8LnDouEJjtodBvdHaG1jMySYO7crWd90MpCRyCG14vb5IE7Arupw/y/RcCm/Tm3zK6zYj8PYNaGldiUfkB/LHWcmf2lVM+mwyU27a0qq2tscrQ/vzBjN26DnntIrOyGizzXK35yKQdYnUABkyN4saz3WD/viF+eCcsXnIajdWYJWaYHRstIis9CS+tqnFGmz2j5uzfr3Z4prqgK4XOT/PyftvjZqIm8lhkfxJ7Ol3CJF1piYBGAG8wtAk56Drw1YwmOpcz+NdfkSpSLplRXLXHL0Rquj6YW/gabqgK7Dgr6NwtH0B/AN7XrN+MVJ6AmXmUuqmQulrNNYPmH0RoDogydOKLo/QbfYNARSQQKISRCzRXU+q9WWJFL3LZW6u34CkeG97xC0NNGaJ0bvK6SnZS3zPskr5EtuCgjMWR5o2x5BqhKmDWJPRe7JMEOyRb5uUKlHaGVtq5ivSOaSliSXp9SQm2qk8MRJh10MAp9QQ2H5t59J8rjiwSZtoIfMGjlLPVNdYl/LBR0AO6WLGDmkLkIPRE45Y9MftdAK/yNu1Hn6tzOQTesgQ+8fSzB19wO91vCnO23vOWQdwJ63SJrYjdfKFW6W281PKs2k8iT9ai1cgJ4sa3xqdvmtxR8/+D1B8AKc2u+6JftryRhMWSQtoSBgIyyQGyxcnELuAasXN12oSriU4RMz1DD6RL0TSV+om7i1Yt+jEE/jnawM8cX/UhN4nkiv/w9eALrzNhXuQfOzFL0Fi6SjF7/4Qn8rLYBoa85cvgAnkCEBP+HPbEnquVXCZsMS/yzYw2Vru60P/+nJPYKkzZFjmbykzUoEqV836T5q3fP/L383dF82tx18/AZgZczMAgyeWYKmSZIqtHL+e+O4ZRcq9VI3g/qPeCoiK4pcgEqdbS0S/Be54sbVQOuJVPNBblIghzeasNu7h/g+Sz1IdhI5lCwq1nUb3Ji4OCIcqQZqtqJ5w7rXrg/DA9IgVmEGhDgGecEwnCTHffXcXs0V3OCEVzYDKS1vp/oX+ng+6XVU86UjA6FMO2RXOOOrqY1GgPvrAk9HV/BXtCu5RuwF8qgdGDLsBcui4E33ymdBip1X8uKyhIWT8qNRDsXz+gvO9UiEC0d8RG4Tf2x8H4slljgHtCBcxHLTWOYJm5H/fCPCzOgf9qgOUxTRZ0Pc6ha5yLuLVT9ntvIa6gacE99mCovdUumTQdRP4RPsS9129eEe2uSvvGh0bV4Y3QPPhPZMqhZWSMa5R0Hc1SGO4IVOQc0FrirlibTVfKRrYkD8kz3b+X65/QkUNaZdrdl3mCap0Hf3YcCw/LiouJYNbqz88UqeDYv93yO7vvXtgl4XCyAO4ODkY6W+83+LZU//p3/zXNGGrUKClCiOnL27iJZbNWDF02XXAOeFlB7IaADoMH1Yqr+UP9biyZDEa/iJt4MDeIz6GKTdLVBfWGVtRN4fdT2rgReX8UXwF2zOrradm4J0nyTgdPnai3RvzpZvCKDUqjOwD/QA6EDaMCLewX6QWYVnHY1sx1bd8ovYnPm1ZvPH+rE20lWjOCnZ66/xDt0QAl15FjfBcZp+i9OU0RNPQ0t3x2pSNWo8eiYudwsnuP1Hq6iH1LJCJynkYsfgJ0p3pF6SoQk2l+jqE8CPk+ziGJRSKjs+W5AO185umPdkYzlK4wl7TC9NxyyDP7ZoyYVoXiuS6SjnInlLWrwz1i8bGTKXX0AVQWkSfIlglW3zRJRJ8bg5VgE6ZEnqNu9B++0GNQvDQJvFize4ESNKBJP+8vA3LM4AX5SIBq08Mob+7QMTCZx4nwP/64+4BnlZC+8WtlP/CXw6t1PwMwkJ3jhP1FiXLhDF/3I6FGUzO2DSi9ABxKyyL9paZxSEz40ZCPQToDAJu1959k7QdbVxgB4icsu2s4zsTPJhcEDo+N1GX4zSk/wriRh8AqwL62972i9HJHd1ydaLXVzvKvOfGGw5RVcUVMiKXFH4APdkQU/dc5BX0YfKTNZYXCW9mb8bc8mufoQP6BbdQmT99ZjoYfr/go4TgQX9IDgztim7wyFeGMfbNaeqj8Dzs38pgcqwSv2hbqB3oSGKWKy+sesY7p57wAHldqE6NDudk/W7s/zjrK4rZFlFvaGxnSZdHbc1y47qDN6xkoK8O3bfr2j41dlJZ71rB4dlDqapPFa8N6xBrprUdtenUCHwxKNhw1uuTBh+9uU45k4REpQABN2bAO9DSLqoIL26gNroWgup5pUMxHUNSq4Gyz47vBPvilpo5f9OYI2ddAqTqmnxXERxQJ3UK8fHbVE9HagHi3+tqNRoNsArdmAxHA5LwtQo9ZAaNKUTljnokljo2x8scqVpEEIPc01fPCdHOCg0DeWBz8D5TVAAfx8aRH5X2ZYNI3ebKDZdeJ+oBDAxmRqJ30Eh2/DaeAy5diVNMpEDmXiPDsGTzBLXy8eVDdJoIafgx/gxMyQi454QrW56nCyeELgSuNNEmYkflF+t3CZQOVRWjKhIuCclmQSlAXT3+4JGG75B4t/5hQ+ldMP4LsAW6z3XmU6IJJwpnGVnsgUZhoY1fZlwTR8wSU7xRejf2uCx9Z5trVTRRJP9KnEb134dEieil6eCOGWgboI7xsqsqM99jfJLTePjygKlH2CVxxsse9QRzTBFjD/Kjqitr/CCTBt/SJ6nLxz7cKP9pFqBpp0lN5y+adKNsZjrPuroemZauH9aTTFD3EKHW8S55XBLFQAt1jgxTQCTwxmx/JyfsZDN1RroN3VaxpSenpIX7K+ZbL8VdlQDcI4Cbzg3QJLa9yVqNxUelu+EtxLVqeekaAvSJkO6sSVqbUajxqhKshNpvZqoeApF0k/0P0ikkwUcbdwc4A1ejN7Oo0O15kG7hTMoK3hZRBCX7YYeLW0wvcXx/18n/u37yLgzBYVBUvORGli+sfRcX/74uD6P4hq+7xu54TlWJLFzT63uwUDwuEDdOjJQqx7JV+ZjaEAPi7t0MMrR4Q8Rkf18uxD6RK0RKh0hL8YU+DeL97i4pa5ZSyAfXKwZRS/8gXcxdZXm62RBDj8U3sN8x95b5PpPs/mCBKYvpaA50pN5Ct/499AFTtwQ5vgeSh+NHrKIi4NVpwM/XzRaNfJD856lPE6M21zWPguFsH7jbLVyEDfRmt4VwrhCJ5VTYmcSPfGgO5clfN+vbaDZ7sakU5+2vZ2WCDY031NxJarVytfDDVtiafcTGO2rJ/taoL3zChN2qmjxofczTOYQPPVQPh0JVtYgdUQINcSiNEEy58UdYXX1MpWUCEBx7LbcGtAm8XWRQTVOaoV3ySri4RShhs/B/0m4jX6OAwXOvcA09bNSG4czEGv/Wey6V/jbTCNTW6awXdNTcA1GsPe1E9fZdGl7R0vyoVpIdJtfC6d32NNErrvq/R+d65VG+YOwRXppXxOCYyGNSf1K3x6VxAW/vtz4EC1SgCOSPdN62sLsoIzuDfg8GwZAbquVO8HIuFP/ToVoeUB7nnwMF35a1wK1tI6fkrqFKhQdeJpwyls0pIy8AZde3/6LUUbFaYJthyUJSU/kqDXTLQElnn0Jr4B2RVghNrmNmoEn7pXIeshPguXVsvwoTdmClq49JJU3LWhHyWTrJL9bRP6VKv3tZoA/th77p5Jw++OEENvyvWy/pNeExiDUVQaXIRGh8xySZTI36yueFaSXo1uJY0RnXYgEOoWWOJHeaVuX/bGNhHsh2yinznl/++NJcE9j6fBPRcBdq9hb8awNw8U7Bl6GM7x69EDOIIbX/npZ++amlHR9L/35mE/2Ss4gb0xCcY4VyTFLRE796vHysLAamqcyO+aFQyJIDBNslbH2/MrAvZiSEIedc/cqjmv4fbda2pXbv+F5a2szSsdkm9noiNURXt8edUhGUF6fSZWd1IJaXKFwD+49R6eCXD4Bkef7j9tRtNMVgW8BhRz/Qpy1TmeYk0doyjZoJSbePOReVHgkFsCFuQJ+Lgc4BxeAsK/cOiNDRmdNw0ctYhn/nQ498dYI5znzGLoJi1rav7Cn88rL3wLePVtDK5gl77Tki3gHEsIAQ2+IKgarj7Y8W1IQzV5V9N+0TjLqbg68WfKcOmBCOj3JkwJhVIkwDhc+JorXuZEPMEh0vvH3x7iqf+VAwXgd4diZiaJD1zHL9Snx6Wfg4IugreyhabQkcir+y5XgDtdx3Avs7lkeeCBwDvZoTUCXx5QrZkcEqWfYEiEYRs/EphmRALSNGR1Iclgdr5VFoELpzF4++f35w3/j0t5ucW3n2ch4PQCLuUXupsPRR7UA5FjSKrMtPcKAZJfagO4lGE7FH3YKMjorpK0ZxAv+i2JkJhtAMWWWFej4RhPR/cJ3DxwocCvXDi4SGZU4cu+K32XndiFWgopAl+0GApcwf1XvymJcFs39jExIBO4yUjU9MExBLQYc9H+W7+IgdESPRpciT+rKZPebVtaVq+1GYO/5xTAL3HASjNTGIgMvdjWbgc7JvdE1zIFpuC0U9ESiZyzBixzxWxj4Kwh8My34q+FK3KNLtmsA1qyrmKSNQOXCPUZd+ONelBTvFoUI/CYsqa/RhtKiyMf2CgSFqEPk59Y3uqnlZ8gFpswfSYyko23yVZYxzKGxGm49Zqxg1l8oz5Ra9XaRwHkuxepmgyhm0SoNy2KlbcEqK+9QqS9PNx9Ihm9U7gsR55SSJ1FBDNnkuWKxIZ0SDpXuOGwZdoUbOMDPHP4vBAgz2VlSEJAHZGJVbYIg7l/FO5KfIVvxC8pPPxMGcNMoevFDeStt2iqztE10n2TA4dgJH76YS9HDhKHD3iCx6ieFX84BAI3QQnngh76f5ruPQVbr5qZmck/5UjDc26lfrOvUBWy0Ogl8bCoOkMOns81TnC3cuUS9KW8+9A+fe3XYZOFUPG1u5epSSmDLw0s5s2F0W30ANeo+zJkJQz9SPZgzwYpEoktofhGVfmLOAB20boCbW1QWq/NpET/hnMecw/uSyAH4NJc3ECOU4nnkK1fj3S/i5dwb3R7k00AqQQUwt7Ie1qV0aY/VQX0J8hLPy7eBNXMHYZYDNxHZ2Qh6AuXJxq+AeRec/Q+JLhZV6hpXwQEzw7bf5v9uUf2vpq3qlhmy0IIGTkwYdCfSAFmqbdo+3XvDTDjFJde0mbeQLcn2n31xaAqJ0ixO/CLsT4I4G4DoncVTgRGNBtsCcjISWT+oeXZ4Iedw/8OsJI1aPnNKLX/60VvcZb94uasRxCkqlPQ11u1Sa2hHvB80WQENxVyzjns0/PiEByyil21Te6oisk3mNCEMrhouCFO3yEZTHHOCMy9eb/4Tmi8cVf3Lf7P53SY2hX3PSN033As3ETIMLHWumWEO9JXHA2y2SIBlIPpLGG2qvNsCIlIr+B1SWAqRKm2w6Blf7U+zCSBwJrfHG5i8J5Gax/cVonMlon7aHJX/gSvucIncRP93XCqkv7D8IFKFsLiBgHqUpXhE3pYjEcV1dk/JD9zFVCfEaQIVX8Jmfz7IIofcBKQ4OaG+C3xC2veX9CD+iAFXDNaGg9eTVxvkbJRJlW4Nk9Wk13kn696jWppRDe/8pDrYMO9ZyxZ98ReKSz9kWKLLyk2zCZgAniCkLJVX3n1M9DYbomyahWiv/KixRIV9hj/oFz87I+HLznbPTjpa+D+bZQnMuRsljTpv90vQUt/pK7jCFnA30B/jtroSF2/m/gpWn1aQs5WeA6ghzF8SdqWI20fghdSeDOCSCmLgTkfaGgGDmw7nHFkRzGtag57IHS2na06I+gzEphXo1w/Zx2BM/jKL2nZoFjHggtFQjYi8nSVRSXIE58RPbBObXk7uuIL9+rs/5Zo7suJInEUxgsiZZAWS25iBtpEiZeBgDtghEoAE0sjcayNq85M4tbu/LF5h51335PsGzQ09O875+vUS89lkWMyNOFoip2PuyWyMP/iU2XIZdfCCJNDjebDoBLQdpy7QQZC7s9c0wjHJervQNDu2jWzBW5MSAJMr7bP+Iv92BkS/GGgzjEn7MF1IRKFwwzbjbS4/slGOmhx9cZrFu7HSEefojNv3r0UaKfKOWzXsq1zEugbzlMDFsacRJJI/iJlK3vtkZ+PLZIVMFlKA32wbq2Kd5T0uCLZ1CPkAfCdzkz2EYscjDcZq2AWfziN2covN4kXE1lQXPPLTNM1xx3tbiepcO/t3SWm4w87qfh99SL0ZnY+LKFPLPeXVM2mIIoVWt+9Nk0I7nY4O79iGYqxZ8RVz289an6NVdJWnSKZvJQCAuHNiVaDxPAFoH392t9wot5t0/qmU95eEWNbU2udUW5sN9JVqcYlvAIfLeYC33oUzzxZgSktsv21mA7Uly1FA5VnoJFh6N244Wmv3YJGFv/TCPryaw+ZORlpZjQdq/2DYXr3EZskfed0G61P09ipTKmlTQ1067Rg5+PAk5FlQ9e0SWbGf2B/08kqymOTMVOznsALHHNFH4LFRKl2F/NOiYFl9khNHnSu9Ak5sq26Ynl/i2fdTle29Y1ugqmR5Yj4YT9pvslFyYCbw0mNFr5rVQm1LvkG27QMq9ph3t8fmn6r6SQ4oSbr5tz+J1kIawGzDxb6VYOvvWhobDTXfBeNv3b4aNm5XUinsCGqG2q/45m3+LoCOsddFceYhRx1Tsss9PLdPfJdErFMjYd3gddjiP0+XQjcRadZP6bwNLySvunFf20Czy6JqdEW2a96KxdYdOryBv1BjbuUq2yCHeh+6sk7fGmmPi50pe/1l5TyPe5oHW9oPnhPswLyf2TFDdCyYlhwBCstv5C1HwlW7xWoGT9XZt4qVj5WryLPLLD6h/5cMLEjWzgCeAIKNsLak92aBqBsHl4AJwl2N4jfvbSkBExGimv0nFvv09uDScQbjx+w4kPQjgjlW+g9ws9VEJvI2k8N6XxVu0uIwovgTFdunG24gBtaDi+y1YLQwZ8mwbip5fVlO3k0n0AEr/ETbtu8Vjkm+nNSiEb7X/3fMjBL5A8PdgG+/FnbexbFFExmEfetXAnisEKy5z44WVPpQZjSy/jzeGn4yDRsFGqhh87QPaDBWhlo37IFbe/C0xynS91d2tP/AJoJS0sVF6iwAAAAAElFTkSuQmCC");
-  }
-
-  #menu::after {
-    display: block;
-    content: '';
-    padding-top: 80px;
-  }
-
-  #logo {
-    position: fixed;
-    bottom: 10px;
-    right: 10px;
-    background: rgba(255,255,255,.1);
-    font-size: 11px;
-    display: block;
-    width: 20px;
-    height: 20px;
-    line-height: 20px;
-    text-align: center;
-    -webkit-border-radius: 20px;
-    -moz-border-radius: 20px;
-    border-radius: 20px;
-    -webkit-box-shadow: 0 0 3px rgba(0,0,0,.2);
-    -moz-box-shadow: 0 0 3px rgba(0,0,0,.2);
-    box-shadow: 0 0 3px rgba(0,0,0,.2);
-    color: inherit;
-  }
-
-  #menu li a {
-    display: block;
-    color: white;
-    padding: 0 35px 0 25px;
-    -webkit-transition: background 300ms;
-    -moz-transition: background 300ms;
-  }
-
-  #menu li {
-    position: relative;
-    list-style: none;
-  }
-
-  #menu a:hover,
-  #menu a.active {
-    text-decoration: none;
-    background: rgba(255,255,255,.1);
-  }
-
-  #menu li:hover .cov {
-    opacity: 1;
-  }
-
-  #menu li.dirname {
-    color: white;
-    opacity: .60;
-    text-align: left;
-    margin: 15px 0px 0 20px;
-    padding: 0 40px 0 0;
-  }
-
-  #menu li .dirname {
-    opacity: .60;
-    padding-right: 2px;
-  }
-
-  #menu li .basename {
-    opacity: 1;
-  }
-
-  #menu .cov {
-    background: rgba(0,0,0,.4);
-    position: absolute;
-    top: 0;
-    right: 8px;
-    font-size: 9px;
-    opacity: .6;
-    text-align: left;
-    width: 17px;
-    -webkit-border-radius: 10px;
-    -moz-border-radius: 10px;
-    border-radius: 10px;
-    padding: 2px 3px;
-    text-align: center;
-    cursor: pointer;
-  }
-
-  #stats:nth-child(2n) {
-    display: inline-block;
-    margin-top: 15px;
-    border: 1px solid #eee;
-    padding: 10px;
-    -webkit-box-shadow: inset 0 0 2px #eee;
-    -moz-box-shadow: inset 0 0 2px #eee;
-    box-shadow: inset 0 0 2px #eee;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-  }
-
-  #stats div {
-    float: left;
-    padding: 0 5px;
-  }
-
-  #stats::after {
-    display: block;
-    content: '';
-    clear: both;
-  }
-
-  #stats .sloc::after {
-    content: ' SLOC';
-    color: #b6b6b6;
-  }
-
-  #stats .percentage::after {
-    content: ' coverage';
-    color: #b6b6b6;
-  }
-
-  #stats .hits,
-  #stats .misses {
-    display: none;
-  }
-
-  .high {
-    color: #00d4b4;
-  }
-  .medium {
-    color: #e87d0d;
-  }
-  .low {
-    color: #d4081a;
-  }
-  .terrible {
-    color: #d4081a;
-    font-weight: bold;
-  }
-
-  table {
-    width: 80%;
-    margin-top: 10px;
-    border-collapse: collapse;
-    border: 1px solid #cbcbcb;
-    color: #363636;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    border-radius: 3px;
-  }
-
-  table thead {
-    display: none;
-  }
-
-  table td.line,
-  table td.hits {
-    width: 20px;
-    background: #eaeaea;
-    text-align: center;
-    padding: 0 10px;
-    font-size: 11px;
-  }
-
-  table td.line a {
-    color: #949494;
-  }
-
-  table td.hits {
-    width: 10px;
-    padding: 2px 5px;
-    color: rgba(0,0,0,.2);
-    background: #f0f0f0;
-  }
-
-  tr.miss td.line,
-  tr.miss td.hits {
-    background: #e6c3c7;
-  }
-
-  tr.miss td {
-    background: #f8d5d8;
-  }
-
-  td.source {
-    padding-left: 15px;
-    line-height: 15px;
-    white-space: pre;
-    font: 12px monaco, monospace;
-  }
-
-  code .comment { color: #ddd }
-  code .init { color: #2F6FAD }
-  code .string { color: #5890AD }
-  code .keyword { color: #8A6343 }
-  code .number { color: #2F6FAD }
\ No newline at end of file
diff --git a/test/utils/istanbul_reporter/report.jade.js b/test/utils/istanbul_reporter/report.jade.js
deleted file mode 100644
index bc2be2fd7ec8c..0000000000000
--- a/test/utils/istanbul_reporter/report.jade.js
+++ /dev/null
@@ -1,331 +0,0 @@
-define(['jade'], function(jade) { if(jade && jade['runtime'] !== undefined) { jade = jade.runtime; }
-
-return function template(locals) {
-var buf = [];
-var jade_mixins = {};
-var jade_interp;
-;var locals_for_with = (locals || {});(function (cov, coverageClass, id, undefined) {
-buf.push("<div id=\"coverage\"><h1 id=\"overview\">Coverage</h1><div id=\"menu\"><li><a href=\"#overview\">overview<span" + (jade.cls(['cov',coverageClass(cov.coverage)], [null,true])) + ">" + (jade.escape((jade_interp = cov.coverage | 0) == null ? '' : jade_interp)) + "</span></a></li>");
-// iterate cov.dirs
-;(function(){
-  var $$obj = cov.dirs;
-  if ('number' == typeof $$obj.length) {
-
-    for (var $index = 0, $$l = $$obj.length; $index < $$l; $index++) {
-      var dir = $$obj[$index];
-
-buf.push("<li class=\"dirname\">" + (jade.escape((jade_interp = dir.name || '.') == null ? '' : jade_interp)) + "<span class=\"cov\">&#9733;</span></li>");
-// iterate dir.files
-;(function(){
-  var $$obj = dir.files;
-  if ('number' == typeof $$obj.length) {
-
-    for (var $index = 0, $$l = $$obj.length; $index < $$l; $index++) {
-      var file = $$obj[$index];
-
-buf.push("<li><span" + (jade.cls(['cov',coverageClass(file.coverage)], [null,true])) + ">" + (jade.escape((jade_interp = file.coverage | 0) == null ? '' : jade_interp)) + "</span><a" + (jade.attr("href", '#' + (file.filename) + '', true, false)) + "><span class=\"basename\">" + (jade.escape(null == (jade_interp = file.relname) ? "" : jade_interp)) + "</span></a></li>");
-    }
-
-  } else {
-    var $$l = 0;
-    for (var $index in $$obj) {
-      $$l++;      var file = $$obj[$index];
-
-buf.push("<li><span" + (jade.cls(['cov',coverageClass(file.coverage)], [null,true])) + ">" + (jade.escape((jade_interp = file.coverage | 0) == null ? '' : jade_interp)) + "</span><a" + (jade.attr("href", '#' + (file.filename) + '', true, false)) + "><span class=\"basename\">" + (jade.escape(null == (jade_interp = file.relname) ? "" : jade_interp)) + "</span></a></li>");
-    }
-
-  }
-}).call(this);
-
-    }
-
-  } else {
-    var $$l = 0;
-    for (var $index in $$obj) {
-      $$l++;      var dir = $$obj[$index];
-
-buf.push("<li class=\"dirname\">" + (jade.escape((jade_interp = dir.name || '.') == null ? '' : jade_interp)) + "<span class=\"cov\">&#9733;</span></li>");
-// iterate dir.files
-;(function(){
-  var $$obj = dir.files;
-  if ('number' == typeof $$obj.length) {
-
-    for (var $index = 0, $$l = $$obj.length; $index < $$l; $index++) {
-      var file = $$obj[$index];
-
-buf.push("<li><span" + (jade.cls(['cov',coverageClass(file.coverage)], [null,true])) + ">" + (jade.escape((jade_interp = file.coverage | 0) == null ? '' : jade_interp)) + "</span><a" + (jade.attr("href", '#' + (file.filename) + '', true, false)) + "><span class=\"basename\">" + (jade.escape(null == (jade_interp = file.relname) ? "" : jade_interp)) + "</span></a></li>");
-    }
-
-  } else {
-    var $$l = 0;
-    for (var $index in $$obj) {
-      $$l++;      var file = $$obj[$index];
-
-buf.push("<li><span" + (jade.cls(['cov',coverageClass(file.coverage)], [null,true])) + ">" + (jade.escape((jade_interp = file.coverage | 0) == null ? '' : jade_interp)) + "</span><a" + (jade.attr("href", '#' + (file.filename) + '', true, false)) + "><span class=\"basename\">" + (jade.escape(null == (jade_interp = file.relname) ? "" : jade_interp)) + "</span></a></li>");
-    }
-
-  }
-}).call(this);
-
-    }
-
-  }
-}).call(this);
-
-buf.push("<a id=\"logo\" href=\"http://visionmedia.github.io/mocha/\">m</a></div><div id=\"stats\"" + (jade.cls([coverageClass(cov.coverage)], [true])) + "><div class=\"percentage\">" + (jade.escape((jade_interp = cov.coverage | 0) == null ? '' : jade_interp)) + "%</div><div class=\"sloc\">" + (jade.escape(null == (jade_interp = cov.sloc) ? "" : jade_interp)) + "</div><div class=\"hits\">" + (jade.escape(null == (jade_interp = cov.hits) ? "" : jade_interp)) + "</div><div class=\"misses\">" + (jade.escape(null == (jade_interp = cov.misses) ? "" : jade_interp)) + "</div></div><div id=\"files\">");
-// iterate cov.dirs
-;(function(){
-  var $$obj = cov.dirs;
-  if ('number' == typeof $$obj.length) {
-
-    for (var $index = 0, $$l = $$obj.length; $index < $$l; $index++) {
-      var dir = $$obj[$index];
-
-// iterate dir.files
-;(function(){
-  var $$obj = dir.files;
-  if ('number' == typeof $$obj.length) {
-
-    for (var $index = 0, $$l = $$obj.length; $index < $$l; $index++) {
-      var file = $$obj[$index];
-
-buf.push("<div class=\"file\"><h2" + (jade.attr("id", file.filename, true, false)) + ">" + (jade.escape(null == (jade_interp = file.filename) ? "" : jade_interp)) + "</h2><div id=\"stats\"" + (jade.cls([coverageClass(file.coverage)], [true])) + "><div class=\"percentage\">" + (jade.escape((jade_interp = file.coverage | 0) == null ? '' : jade_interp)) + "%</div><div class=\"sloc\">" + (jade.escape(null == (jade_interp = file.sloc) ? "" : jade_interp)) + "</div><div class=\"hits\">" + (jade.escape(null == (jade_interp = file.hits) ? "" : jade_interp)) + "</div><div class=\"misses\">" + (jade.escape(null == (jade_interp = file.misses) ? "" : jade_interp)) + "</div></div><table id=\"source\"><thead><tr><th>Line</th><th>Hits</th><th>Source</th></tr></thead><tbody>");
-// iterate file.source
-;(function(){
-  var $$obj = file.source;
-  if ('number' == typeof $$obj.length) {
-
-    for (var number = 0, $$l = $$obj.length; number < $$l; number++) {
-      var line = $$obj[number];
-
-id = file.filename + ':' + number;
-if ( line.coverage > 0)
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + " class=\"hit\"><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\">" + (jade.escape(null == (jade_interp = line.coverage) ? "" : jade_interp)) + "</td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source) ? "" : jade_interp)) + "</td></tr>");
-}
-else if ( 0 === line.coverage)
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + " class=\"miss\"><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\">0</td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source) ? "" : jade_interp)) + "</td></tr>");
-}
-else
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + "><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\"></td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source || ' ') ? "" : jade_interp)) + "</td></tr>");
-}
-    }
-
-  } else {
-    var $$l = 0;
-    for (var number in $$obj) {
-      $$l++;      var line = $$obj[number];
-
-id = file.filename + ':' + number;
-if ( line.coverage > 0)
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + " class=\"hit\"><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\">" + (jade.escape(null == (jade_interp = line.coverage) ? "" : jade_interp)) + "</td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source) ? "" : jade_interp)) + "</td></tr>");
-}
-else if ( 0 === line.coverage)
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + " class=\"miss\"><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\">0</td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source) ? "" : jade_interp)) + "</td></tr>");
-}
-else
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + "><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\"></td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source || ' ') ? "" : jade_interp)) + "</td></tr>");
-}
-    }
-
-  }
-}).call(this);
-
-buf.push("</tbody></table></div>");
-    }
-
-  } else {
-    var $$l = 0;
-    for (var $index in $$obj) {
-      $$l++;      var file = $$obj[$index];
-
-buf.push("<div class=\"file\"><h2" + (jade.attr("id", file.filename, true, false)) + ">" + (jade.escape(null == (jade_interp = file.filename) ? "" : jade_interp)) + "</h2><div id=\"stats\"" + (jade.cls([coverageClass(file.coverage)], [true])) + "><div class=\"percentage\">" + (jade.escape((jade_interp = file.coverage | 0) == null ? '' : jade_interp)) + "%</div><div class=\"sloc\">" + (jade.escape(null == (jade_interp = file.sloc) ? "" : jade_interp)) + "</div><div class=\"hits\">" + (jade.escape(null == (jade_interp = file.hits) ? "" : jade_interp)) + "</div><div class=\"misses\">" + (jade.escape(null == (jade_interp = file.misses) ? "" : jade_interp)) + "</div></div><table id=\"source\"><thead><tr><th>Line</th><th>Hits</th><th>Source</th></tr></thead><tbody>");
-// iterate file.source
-;(function(){
-  var $$obj = file.source;
-  if ('number' == typeof $$obj.length) {
-
-    for (var number = 0, $$l = $$obj.length; number < $$l; number++) {
-      var line = $$obj[number];
-
-id = file.filename + ':' + number;
-if ( line.coverage > 0)
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + " class=\"hit\"><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\">" + (jade.escape(null == (jade_interp = line.coverage) ? "" : jade_interp)) + "</td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source) ? "" : jade_interp)) + "</td></tr>");
-}
-else if ( 0 === line.coverage)
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + " class=\"miss\"><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\">0</td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source) ? "" : jade_interp)) + "</td></tr>");
-}
-else
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + "><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\"></td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source || ' ') ? "" : jade_interp)) + "</td></tr>");
-}
-    }
-
-  } else {
-    var $$l = 0;
-    for (var number in $$obj) {
-      $$l++;      var line = $$obj[number];
-
-id = file.filename + ':' + number;
-if ( line.coverage > 0)
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + " class=\"hit\"><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\">" + (jade.escape(null == (jade_interp = line.coverage) ? "" : jade_interp)) + "</td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source) ? "" : jade_interp)) + "</td></tr>");
-}
-else if ( 0 === line.coverage)
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + " class=\"miss\"><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\">0</td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source) ? "" : jade_interp)) + "</td></tr>");
-}
-else
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + "><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\"></td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source || ' ') ? "" : jade_interp)) + "</td></tr>");
-}
-    }
-
-  }
-}).call(this);
-
-buf.push("</tbody></table></div>");
-    }
-
-  }
-}).call(this);
-
-    }
-
-  } else {
-    var $$l = 0;
-    for (var $index in $$obj) {
-      $$l++;      var dir = $$obj[$index];
-
-// iterate dir.files
-;(function(){
-  var $$obj = dir.files;
-  if ('number' == typeof $$obj.length) {
-
-    for (var $index = 0, $$l = $$obj.length; $index < $$l; $index++) {
-      var file = $$obj[$index];
-
-buf.push("<div class=\"file\"><h2" + (jade.attr("id", file.filename, true, false)) + ">" + (jade.escape(null == (jade_interp = file.filename) ? "" : jade_interp)) + "</h2><div id=\"stats\"" + (jade.cls([coverageClass(file.coverage)], [true])) + "><div class=\"percentage\">" + (jade.escape((jade_interp = file.coverage | 0) == null ? '' : jade_interp)) + "%</div><div class=\"sloc\">" + (jade.escape(null == (jade_interp = file.sloc) ? "" : jade_interp)) + "</div><div class=\"hits\">" + (jade.escape(null == (jade_interp = file.hits) ? "" : jade_interp)) + "</div><div class=\"misses\">" + (jade.escape(null == (jade_interp = file.misses) ? "" : jade_interp)) + "</div></div><table id=\"source\"><thead><tr><th>Line</th><th>Hits</th><th>Source</th></tr></thead><tbody>");
-// iterate file.source
-;(function(){
-  var $$obj = file.source;
-  if ('number' == typeof $$obj.length) {
-
-    for (var number = 0, $$l = $$obj.length; number < $$l; number++) {
-      var line = $$obj[number];
-
-id = file.filename + ':' + number;
-if ( line.coverage > 0)
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + " class=\"hit\"><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\">" + (jade.escape(null == (jade_interp = line.coverage) ? "" : jade_interp)) + "</td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source) ? "" : jade_interp)) + "</td></tr>");
-}
-else if ( 0 === line.coverage)
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + " class=\"miss\"><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\">0</td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source) ? "" : jade_interp)) + "</td></tr>");
-}
-else
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + "><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\"></td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source || ' ') ? "" : jade_interp)) + "</td></tr>");
-}
-    }
-
-  } else {
-    var $$l = 0;
-    for (var number in $$obj) {
-      $$l++;      var line = $$obj[number];
-
-id = file.filename + ':' + number;
-if ( line.coverage > 0)
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + " class=\"hit\"><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\">" + (jade.escape(null == (jade_interp = line.coverage) ? "" : jade_interp)) + "</td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source) ? "" : jade_interp)) + "</td></tr>");
-}
-else if ( 0 === line.coverage)
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + " class=\"miss\"><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\">0</td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source) ? "" : jade_interp)) + "</td></tr>");
-}
-else
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + "><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\"></td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source || ' ') ? "" : jade_interp)) + "</td></tr>");
-}
-    }
-
-  }
-}).call(this);
-
-buf.push("</tbody></table></div>");
-    }
-
-  } else {
-    var $$l = 0;
-    for (var $index in $$obj) {
-      $$l++;      var file = $$obj[$index];
-
-buf.push("<div class=\"file\"><h2" + (jade.attr("id", file.filename, true, false)) + ">" + (jade.escape(null == (jade_interp = file.filename) ? "" : jade_interp)) + "</h2><div id=\"stats\"" + (jade.cls([coverageClass(file.coverage)], [true])) + "><div class=\"percentage\">" + (jade.escape((jade_interp = file.coverage | 0) == null ? '' : jade_interp)) + "%</div><div class=\"sloc\">" + (jade.escape(null == (jade_interp = file.sloc) ? "" : jade_interp)) + "</div><div class=\"hits\">" + (jade.escape(null == (jade_interp = file.hits) ? "" : jade_interp)) + "</div><div class=\"misses\">" + (jade.escape(null == (jade_interp = file.misses) ? "" : jade_interp)) + "</div></div><table id=\"source\"><thead><tr><th>Line</th><th>Hits</th><th>Source</th></tr></thead><tbody>");
-// iterate file.source
-;(function(){
-  var $$obj = file.source;
-  if ('number' == typeof $$obj.length) {
-
-    for (var number = 0, $$l = $$obj.length; number < $$l; number++) {
-      var line = $$obj[number];
-
-id = file.filename + ':' + number;
-if ( line.coverage > 0)
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + " class=\"hit\"><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\">" + (jade.escape(null == (jade_interp = line.coverage) ? "" : jade_interp)) + "</td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source) ? "" : jade_interp)) + "</td></tr>");
-}
-else if ( 0 === line.coverage)
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + " class=\"miss\"><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\">0</td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source) ? "" : jade_interp)) + "</td></tr>");
-}
-else
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + "><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\"></td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source || ' ') ? "" : jade_interp)) + "</td></tr>");
-}
-    }
-
-  } else {
-    var $$l = 0;
-    for (var number in $$obj) {
-      $$l++;      var line = $$obj[number];
-
-id = file.filename + ':' + number;
-if ( line.coverage > 0)
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + " class=\"hit\"><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\">" + (jade.escape(null == (jade_interp = line.coverage) ? "" : jade_interp)) + "</td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source) ? "" : jade_interp)) + "</td></tr>");
-}
-else if ( 0 === line.coverage)
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + " class=\"miss\"><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\">0</td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source) ? "" : jade_interp)) + "</td></tr>");
-}
-else
-{
-buf.push("<tr" + (jade.attr("id", id, true, false)) + "><td class=\"line\"><a" + (jade.attr("href", '#' + id, true, false)) + ">" + (jade.escape(null == (jade_interp = number) ? "" : jade_interp)) + "</a></td><td class=\"hits\"></td><td class=\"source\">" + (jade.escape(null == (jade_interp = line.source || ' ') ? "" : jade_interp)) + "</td></tr>");
-}
-    }
-
-  }
-}).call(this);
-
-buf.push("</tbody></table></div>");
-    }
-
-  }
-}).call(this);
-
-    }
-
-  }
-}).call(this);
-
-buf.push("</div></div><style>body {\n  font: 14px/1.6 \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n  margin: 0;\n  color: #2C2C2C;\n  border-top: 2px solid #ddd;\n}\n\n.coverage-stats {\n  font-size: 12px;\n  margin: 0;\n  padding: 0;\n  color: white;\n  text-align: right;\n  border: none;\n  box-shadow: none;\n  position: fixed;\n  bottom: 40px;\n  right: 10px;\n}\n\n#coverage {\n  padding: 60px 60px 350px;\n}\n\nh1 a {\n  color: inherit;\n  font-weight: inherit;\n}\n\nh1 a:hover {\n  text-decoration: none;\n}\n\n.onload h1 {\n  opacity: 1;\n}\n\nh2 {\n  width: 80%;\n  margin-top: 80px;\n  margin-bottom: 0;\n  font-weight: 100;\n  letter-spacing: 1px;\n  border-bottom: 1px solid #eee;\n}\n\na {\n  color: #8A6343;\n  font-weight: bold;\n  text-decoration: none;\n}\n\na:hover {\n  text-decoration: underline;\n}\n\nul {\n  margin-top: 20px;\n  padding: 0 15px;\n  width: 100%;\n}\n\nul li {\n  float: left;\n  width: 40%;\n  margin-top: 5px;\n  margin-right: 60px;\n  list-style: none;\n  border-bottom: 1px solid #eee;\n  padding: 5px 0;\n  font-size: 12px;\n}\n\nul::after {\n  content: '.';\n  height: 0;\n  display: block;\n  visibility: hidden;\n  clear: both;\n}\n\ncode {\n  font: 12px monaco, monospace;\n}\n\npre {\n  margin: 30px;\n  padding: 30px;\n  border: 1px solid #eee;\n  border-bottom-color: #ddd;\n  -webkit-border-radius: 2px;\n  -moz-border-radius: 2px;\n  border-radius: 2px;\n  -webkit-box-shadow: inset 0 0 10px #eee;\n  -moz-box-shadow: inset 0 0 10px #eee;\n  box-shadow: inset 0 0 10px #eee;\n  overflow-x: auto;\n}\n\nimg {\n  margin: 30px;\n  padding: 1px;\n  -webkit-border-radius: 3px;\n  -moz-border-radius: 3px;\n  border-radius: 3px;\n  -webkit-box-shadow: 0 3px 10px #dedede, 0 1px 5px #888;\n  -moz-box-shadow: 0 3px 10px #dedede, 0 1px 5px #888;\n  box-shadow: 0 3px 10px #dedede, 0 1px 5px #888;\n  max-width: 100%;\n}\n\nfooter {\n  background: #eee;\n  width: 100%;\n  padding: 50px 0;\n  text-align: right;\n  border-top: 1px solid #ddd;\n}\n\nfooter span {\n  display: block;\n  margin-right: 30px;\n  color: #888;\n  font-size: 12px;\n}\n\n#menu {\n  position: fixed;\n  font-size: 12px;\n  overflow-y: auto;\n  top: 0;\n  right: 0;\n  margin: 0;\n  height: 100%;\n  padding: 15px 0;\n  text-align: right;\n  border-left: 1px solid #eee;\n  -moz-box-shadow: 0 0 2px #888\n     , inset 5px 0 20px rgba(0,0,0,.5)\n     , inset 5px 0 3px rgba(0,0,0,.3);\n  -webkit-box-shadow: 0 0 2px #888\n     , inset 5px 0 20px rgba(0,0,0,.5)\n     , inset 5px 0 3px rgba(0,0,0,.3);\n  box-shadow: 0 0 2px #888\n     , inset 5px 0 20px rgba(0,0,0,.5)\n     , inset 5px 0 3px rgba(0,0,0,.3);\n  -webkit-font-smoothing: antialiased;\n  background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGYAAABmCAMAAAAOARRQAAABelBMVEUjJSU6OzshIyM5OjoqKy02NjgsLS01NTYjJCUzNTUgISMlJSc0NTUvMDA6PDwlJyg1NjYoKis2NjYrLS02ODkpKyw0NDYrLC04ODovLzA4Ojo0NDUtLy86OjwjIyU4OTosLS82ODgtLS8hIyQvMTEnKCooKSsrKy0qLCwkJSUnKCkrLCwpKiwwMjIxMzMqLC0tLS0pKissLC00NTYwMDIwMTQpKysoKSovMDEtLzA2OTkxMzUrKywvLy8qKyszNTY5OzsqKiw6OjswMDExNDUoKiozNDUvMDIyNDY1Njg2Njk5OTozMzU0NjY4ODkiIyUiIyQ4OTkuMDEmKCowMjQwMTErLS4qKywwMTMhIiMpKiopKy0tLjAkJScxNDQvLzExNDYyNDQmKCk5OTslJig5OjskJSYxMzQrLS8gISIwMTIoKCk1NTUlJSUnJygwMDA4ODgiIiMhISI8PDw6Ojo5OTkpKSojIyQ7OzsyMjIpKSssLCw6Ozw1NjlrfLakAAAg2UlEQVR42jR6i3ea6rYvPgANIAhVXh8WvkQlioUiFlFcBtAmoiRNdzxqu9p0J7vrdK29zuPeex77nnvO/35n1r1ndHRktI0jTOacv/l7lCBK5UqVpOha/YxmWK7BC4TQFKVXrbYsnimqxuuMVlOQ0XltWjUdCwRJ1M+tC1KudOs9q6+da2adUewG0SC0SwELfHtgDds93VEuydEbl3QMWeNoYkR7b/0x1ZRobGI3mLwzAhePqTAwhg6aogjNsGy7/jwQ4rkdqe7CWLxF8k9LfMVFyRS7VJqtkrW8Vt/bkR8FZJao16ipknbC3Yw2lM7laO6HBEOadEZ2tpf65c4v8e3u7FyU6qbiNNyCuzXZ6pawgnwgmrpTT/Q7w2EZmiIJ0dzWDI7mhQ80IfRnMu2kzA5r5r1pIFoia+/d93HRYp1GV8TbrkWoU/+jdI0Ff6yGwTjT1Hn8J+8m1rKpGiYPuNiHnMtNMIv+zpsk84MYTNW1/+DpwXLvckdOCMYowVNPREe0QlM8xRHXXFhcNDzupwsSmb5pH+0t0RP2Qk+QtI7F1Qm6JRC6ZPBtPq/dq/kH+jxtCljn9TIpW6rQIgmSVyj6lPICIw4N/taka41PFUInth0je9+jO6Kt1G4/a7V2LEgG02B0pHVuCZrgltSKMuIl5SyufUv9mYuQi+mFgzbBEtFo2g+Dh4sSTrLNu8JPh00sQydpb00tqXBvqRN7Q7kqzcnIxCGnvZt/WmJacoOEO6Dcn8Qre03pOCSQxbMOXUuDNx9SxuLz4W1I18gvjViQ67zV0rxdWL8Te/TQkuo8STS41DR48W7L6YP2uWIqiUV8rd6Gbf/rnegKZeG8TpAM6afhGze9JAOxbLjsnUXEbrZ9vLYd7MT32cPF5mKKxmjy7huaoD9n62GOxni3iIJwv0IzZAZjdZkUtolCNLVfYZNaquFjGszVVf+J0vrz4CawoKdHnOzb0NMH7CDBOybfYNJ4rfeMyFNjkFYVTzMFs87rnPGXLUOeNKRVc0LnU7/UIgelzsy3CMuth0YfvnY0wsD3vODUL3eJcKqHQpm8yM3XZQWJxO6Un9iYloyyLpOwN2obHy6W6gbpcb44XmyC+mg+itAcaprGcrwZCqMj/GmtKn0zPvpTz/Cv1dw21XwP3cRupg3H3MF/S71eTKj1YrdwKdc2Mw0fRmb2sFf8lW3aU6JbIZSEPqvXvjM7G/aApyXlXeqKfMq0g/Su3rUGJPSPrtGElgknrZM3xUXqsAP6zMCNVn5u8aJnSNpJv2uru7t2jfRziW2+GuhqfldUNbPk71olwo+46ePUo1U3WKk/e5YK07F/wGRgcpODmQnIlVeHCWBE4puBi2jq28UKpqiN1/4UOrGz59TNYrrQHtd+11sG40BGD+pXdelNqGOg4NXe8W4eacJV/NS9/2Umtym6WQqveqR9xdCMElpxnbkalM4Vf9uaEcWZaKdyibEIjWKxJZPN95niCL3GiaXyssIrHxoLkqkzLCXULN46/f2h3tQJgyip+Tk9EAjJ9aJshq7t8X45aowSKspMSvPf7r9R8yxNptIaHS5ozuEm6luPDApugyNP8OaqiQ4BjaequXA54SLC83eHIY2r+CZp4409Xqw8Aa2oI7XkCrQi+in0w5AqF/kLNrcUz+qkl/lAobY1jSnx5OJNhyXIz3qfNFlXc0TKaglNwdWkWYt9QQ1Kr6W8zue21iNrdJk+N5oCr2O9nEtWKC7IS5J/zdDEYrmnAYfg6agCy+qcgz7ZofeDc4PbUWSvkshWuAc7OjiUyLkj+RAtdlwXJcjxdpkTTHDhK8lBCi8+JtvDVL1W6elmOM++YS0LuSlaP1oUvAeiW3cFnvTr8EbTz1tsSMYdGeZe40sRWu5uAfj7q+ZoKv2FNQ0p5XY1lmlcigHZqTPpabufEVrNuNPi165w3uCVQJHyJqmSJ7ZHnguqwtCmwViIJijj04ba2JNYtB+yORf5gg1/9t9iw4vUpeqiunSAbf+IBdj/b+iG2qrHvuNP0Vd/+ThVZT/lrvHYjjgDbbyxaqgHNM2uhxa1GW3UedZYhMMwM4mQhltouK+IV4NdbIQNM+8Yv311RZk9kT4tiYR4LkyFcuPpdcjuhUuFqBAWRZa11lcZ3gEBlXywsNhrt+plISZP5DlsV9l4EgY6J3yZPTUcMrgaWAT3oI79eSbGEbcJpr6BD8kyDiVt+G0/hXosQN4NFXKlfWIfsIs0BHODVok1/IGnKFHJYIquh8Xo+2+bkQNTGgWmN/fZ0Y33LSj6lr1GyV7mWIKg7ZTRZPGuhF/zjRNcQ1UPtSYgnWQxSs0yrVhwNDcdGMNSNe2JT3WuzbAM3HykyAajS3Uphf6STKEqxLas9EnmnhA/lyj9Uj+JoY7SVgVmGLl46Rm2u98sbkap2lzAdKBG4r6LgulQOSSjQv1GWdQ0jtDUK/mAaqM1Uqjpu4k3Rvfvxv7YTxLSK+wN3E5jVIzmF23uZ7hiH/sVP49D7tvoKp4S8b1LuvRlivVB/algbhcFITYVXvDpLzpDfplR2uD5V4XJFxpjmIpLc9Y5sB2TpBRix7Bme6GZIq+06v3XzNeTcA4obQIKxrnT4C2JpOqD92dbmSX8MGazly5EsZVMvSU1f4RZwyu8iQXbVdeLlZrjuTT1jrY1uk5c7iZ7RsvhhluqAkq4JpVQAg7RJFtSu+xgJ8Pv6O1j5DkLxT8mkbfyRW5DrQmG7hiDIjCgBsADbjuof6YHLGeV6a5Q1Smx9joUXPpdaaDx97A/Wq00oJkdR7ZYuQRfS533JtxO1erduqWOYIt3wh0wpbLuCNIYkwxbswbikCUu2CDCS+Q+7rgVtfRcm+SOcdKPRlZ/rE7wNVUEE39KTS5uvUKN1PUnkloPkyzhyGQ8qkouEjJ3H/VXdqG6asSRiw3ecMlBvDDt8dDhBHXMwZ2Cajzjr7/76T+IavqPYvz6r7//E/3X3+N//h/0QozbjPgPiir69P/8X3/9F/yv8b/827/++98WItPu5/Hvwd8YPf5bp/2/lX/T/+Of/0MJ/lYTa+L/Ef+d9vN/3/2T6P/+jyTzu/evf6U7vxN7B6pJkRtAF6jUr8I+P8RsP/ptGhfqFk+pQ/DgAy6NJtRYJdXmp4gK7WLqLKJ+MaKhGjOojvL+SnIWrkpy0SLHDe4QuyNzaEA15mLMCcmE8Em+4HdOihW4/ZWuppJEmzeAwcDtv7MuLc9y2V5atvxXNe3S4DUMt5/Qy2LM9kSYKiVWBuKlfp4nxTntpuW03JbIlkiRvBXmT23g1I2OYe6IizUHPIq6zm6mbfsbteKmi/sg9J+ocQBMctGFO7iljo8TPN+z3jxw4do+ZwfqoR9dkNTKHyM305GpTkfhcHexVkPVGEbUOjuo9f0UMPHBFlGEx0SLvJvVRKTwW7PSew5oPme+E42+frJa9cGt2njS3dK5kIif2eYbhuSEQXEqMVfUjhGIuin0G0/W5ezJyJQy3SpMLai4M0JUWb5u1k9tny5bd1pPwYBpQuDCXZl62xg4CdVEAtflXHs6JKmP/pH6mOl796Lgopj0o8d5kKh00hxG3OSdEE/QBo9Hgr8JJqAeLDwJohG5j/DGh61Rc/+tf22/8kEnxHNCEjo0ElvvGfESZkqmz2BDcKV1H1buSkhkdg7p1IMGs2s17nYjpblrWuE2K9WEO/hcRp5e9oOF/QBmOaDtgil+oaU6szPrdwW65fOB0KUTsVUn7LFU7J8e6cxJIl9+FHw5MQMzuQJ+4oxMH3iW/5GK+hWuG0T+gTLs+fAjdtUd58TmIUq04EeyRCYCjkldow234aIgR5bqwrtZosZ+6YEqAmDqatJ9lWasz4IquKALPtd92hGI3Z2BdzzZue+REl1Om4DIWD+RrtUTOJLI+S0jHowXXdAxsGLSd40zYNuEUlOGhrwL6c7tcOtUOvpJCP7QBQS19H+GvZn05ewjlVLz+IGKoC9TyfQjLMBNmXCuqqtTdOSukZW48B0HqgSTCBrBnlFvF4CG2Su7yFzqmJFURK3UmTT3ru050r0ptUpMilYnBJWfl2Bv6kPlUuE1kxxpdzui9AubsR2N2boVSu81OulAwBqoSr1LZ0LLYOomyZHmjqnXlP72s8LnDouEJjtodBvdHaG1jMySYO7crWd90MpCRyCG14vb5IE7Arupw/y/RcCm/Tm3zK6zYj8PYNaGldiUfkB/LHWcmf2lVM+mwyU27a0qq2tscrQ/vzBjN26DnntIrOyGizzXK35yKQdYnUABkyN4saz3WD/viF+eCcsXnIajdWYJWaYHRstIis9CS+tqnFGmz2j5uzfr3Z4prqgK4XOT/PyftvjZqIm8lhkfxJ7Ol3CJF1piYBGAG8wtAk56Drw1YwmOpcz+NdfkSpSLplRXLXHL0Rquj6YW/gabqgK7Dgr6NwtH0B/AN7XrN+MVJ6AmXmUuqmQulrNNYPmH0RoDogydOKLo/QbfYNARSQQKISRCzRXU+q9WWJFL3LZW6u34CkeG97xC0NNGaJ0bvK6SnZS3zPskr5EtuCgjMWR5o2x5BqhKmDWJPRe7JMEOyRb5uUKlHaGVtq5ivSOaSliSXp9SQm2qk8MRJh10MAp9QQ2H5t59J8rjiwSZtoIfMGjlLPVNdYl/LBR0AO6WLGDmkLkIPRE45Y9MftdAK/yNu1Hn6tzOQTesgQ+8fSzB19wO91vCnO23vOWQdwJ63SJrYjdfKFW6W281PKs2k8iT9ai1cgJ4sa3xqdvmtxR8/+D1B8AKc2u+6JftryRhMWSQtoSBgIyyQGyxcnELuAasXN12oSriU4RMz1DD6RL0TSV+om7i1Yt+jEE/jnawM8cX/UhN4nkiv/w9eALrzNhXuQfOzFL0Fi6SjF7/4Qn8rLYBoa85cvgAnkCEBP+HPbEnquVXCZsMS/yzYw2Vru60P/+nJPYKkzZFjmbykzUoEqV836T5q3fP/L383dF82tx18/AZgZczMAgyeWYKmSZIqtHL+e+O4ZRcq9VI3g/qPeCoiK4pcgEqdbS0S/Be54sbVQOuJVPNBblIghzeasNu7h/g+Sz1IdhI5lCwq1nUb3Ji4OCIcqQZqtqJ5w7rXrg/DA9IgVmEGhDgGecEwnCTHffXcXs0V3OCEVzYDKS1vp/oX+ng+6XVU86UjA6FMO2RXOOOrqY1GgPvrAk9HV/BXtCu5RuwF8qgdGDLsBcui4E33ymdBip1X8uKyhIWT8qNRDsXz+gvO9UiEC0d8RG4Tf2x8H4slljgHtCBcxHLTWOYJm5H/fCPCzOgf9qgOUxTRZ0Pc6ha5yLuLVT9ntvIa6gacE99mCovdUumTQdRP4RPsS9129eEe2uSvvGh0bV4Y3QPPhPZMqhZWSMa5R0Hc1SGO4IVOQc0FrirlibTVfKRrYkD8kz3b+X65/QkUNaZdrdl3mCap0Hf3YcCw/LiouJYNbqz88UqeDYv93yO7vvXtgl4XCyAO4ODkY6W+83+LZU//p3/zXNGGrUKClCiOnL27iJZbNWDF02XXAOeFlB7IaADoMH1Yqr+UP9biyZDEa/iJt4MDeIz6GKTdLVBfWGVtRN4fdT2rgReX8UXwF2zOrradm4J0nyTgdPnai3RvzpZvCKDUqjOwD/QA6EDaMCLewX6QWYVnHY1sx1bd8ovYnPm1ZvPH+rE20lWjOCnZ66/xDt0QAl15FjfBcZp+i9OU0RNPQ0t3x2pSNWo8eiYudwsnuP1Hq6iH1LJCJynkYsfgJ0p3pF6SoQk2l+jqE8CPk+ziGJRSKjs+W5AO185umPdkYzlK4wl7TC9NxyyDP7ZoyYVoXiuS6SjnInlLWrwz1i8bGTKXX0AVQWkSfIlglW3zRJRJ8bg5VgE6ZEnqNu9B++0GNQvDQJvFize4ESNKBJP+8vA3LM4AX5SIBq08Mob+7QMTCZx4nwP/64+4BnlZC+8WtlP/CXw6t1PwMwkJ3jhP1FiXLhDF/3I6FGUzO2DSi9ABxKyyL9paZxSEz40ZCPQToDAJu1959k7QdbVxgB4icsu2s4zsTPJhcEDo+N1GX4zSk/wriRh8AqwL62972i9HJHd1ydaLXVzvKvOfGGw5RVcUVMiKXFH4APdkQU/dc5BX0YfKTNZYXCW9mb8bc8mufoQP6BbdQmT99ZjoYfr/go4TgQX9IDgztim7wyFeGMfbNaeqj8Dzs38pgcqwSv2hbqB3oSGKWKy+sesY7p57wAHldqE6NDudk/W7s/zjrK4rZFlFvaGxnSZdHbc1y47qDN6xkoK8O3bfr2j41dlJZ71rB4dlDqapPFa8N6xBrprUdtenUCHwxKNhw1uuTBh+9uU45k4REpQABN2bAO9DSLqoIL26gNroWgup5pUMxHUNSq4Gyz47vBPvilpo5f9OYI2ddAqTqmnxXERxQJ3UK8fHbVE9HagHi3+tqNRoNsArdmAxHA5LwtQo9ZAaNKUTljnokljo2x8scqVpEEIPc01fPCdHOCg0DeWBz8D5TVAAfx8aRH5X2ZYNI3ebKDZdeJ+oBDAxmRqJ30Eh2/DaeAy5diVNMpEDmXiPDsGTzBLXy8eVDdJoIafgx/gxMyQi454QrW56nCyeELgSuNNEmYkflF+t3CZQOVRWjKhIuCclmQSlAXT3+4JGG75B4t/5hQ+ldMP4LsAW6z3XmU6IJJwpnGVnsgUZhoY1fZlwTR8wSU7xRejf2uCx9Z5trVTRRJP9KnEb134dEieil6eCOGWgboI7xsqsqM99jfJLTePjygKlH2CVxxsse9QRzTBFjD/Kjqitr/CCTBt/SJ6nLxz7cKP9pFqBpp0lN5y+adKNsZjrPuroemZauH9aTTFD3EKHW8S55XBLFQAt1jgxTQCTwxmx/JyfsZDN1RroN3VaxpSenpIX7K+ZbL8VdlQDcI4Cbzg3QJLa9yVqNxUelu+EtxLVqeekaAvSJkO6sSVqbUajxqhKshNpvZqoeApF0k/0P0ikkwUcbdwc4A1ejN7Oo0O15kG7hTMoK3hZRBCX7YYeLW0wvcXx/18n/u37yLgzBYVBUvORGli+sfRcX/74uD6P4hq+7xu54TlWJLFzT63uwUDwuEDdOjJQqx7JV+ZjaEAPi7t0MMrR4Q8Rkf18uxD6RK0RKh0hL8YU+DeL97i4pa5ZSyAfXKwZRS/8gXcxdZXm62RBDj8U3sN8x95b5PpPs/mCBKYvpaA50pN5Ct/499AFTtwQ5vgeSh+NHrKIi4NVpwM/XzRaNfJD856lPE6M21zWPguFsH7jbLVyEDfRmt4VwrhCJ5VTYmcSPfGgO5clfN+vbaDZ7sakU5+2vZ2WCDY031NxJarVytfDDVtiafcTGO2rJ/taoL3zChN2qmjxofczTOYQPPVQPh0JVtYgdUQINcSiNEEy58UdYXX1MpWUCEBx7LbcGtAm8XWRQTVOaoV3ySri4RShhs/B/0m4jX6OAwXOvcA09bNSG4czEGv/Wey6V/jbTCNTW6awXdNTcA1GsPe1E9fZdGl7R0vyoVpIdJtfC6d32NNErrvq/R+d65VG+YOwRXppXxOCYyGNSf1K3x6VxAW/vtz4EC1SgCOSPdN62sLsoIzuDfg8GwZAbquVO8HIuFP/ToVoeUB7nnwMF35a1wK1tI6fkrqFKhQdeJpwyls0pIy8AZde3/6LUUbFaYJthyUJSU/kqDXTLQElnn0Jr4B2RVghNrmNmoEn7pXIeshPguXVsvwoTdmClq49JJU3LWhHyWTrJL9bRP6VKv3tZoA/th77p5Jw++OEENvyvWy/pNeExiDUVQaXIRGh8xySZTI36yueFaSXo1uJY0RnXYgEOoWWOJHeaVuX/bGNhHsh2yinznl/++NJcE9j6fBPRcBdq9hb8awNw8U7Bl6GM7x69EDOIIbX/npZ++amlHR9L/35mE/2Ss4gb0xCcY4VyTFLRE796vHysLAamqcyO+aFQyJIDBNslbH2/MrAvZiSEIedc/cqjmv4fbda2pXbv+F5a2szSsdkm9noiNURXt8edUhGUF6fSZWd1IJaXKFwD+49R6eCXD4Bkef7j9tRtNMVgW8BhRz/Qpy1TmeYk0doyjZoJSbePOReVHgkFsCFuQJ+Lgc4BxeAsK/cOiNDRmdNw0ctYhn/nQ498dYI5znzGLoJi1rav7Cn88rL3wLePVtDK5gl77Tki3gHEsIAQ2+IKgarj7Y8W1IQzV5V9N+0TjLqbg68WfKcOmBCOj3JkwJhVIkwDhc+JorXuZEPMEh0vvH3x7iqf+VAwXgd4diZiaJD1zHL9Snx6Wfg4IugreyhabQkcir+y5XgDtdx3Avs7lkeeCBwDvZoTUCXx5QrZkcEqWfYEiEYRs/EphmRALSNGR1Iclgdr5VFoELpzF4++f35w3/j0t5ucW3n2ch4PQCLuUXupsPRR7UA5FjSKrMtPcKAZJfagO4lGE7FH3YKMjorpK0ZxAv+i2JkJhtAMWWWFej4RhPR/cJ3DxwocCvXDi4SGZU4cu+K32XndiFWgopAl+0GApcwf1XvymJcFs39jExIBO4yUjU9MExBLQYc9H+W7+IgdESPRpciT+rKZPebVtaVq+1GYO/5xTAL3HASjNTGIgMvdjWbgc7JvdE1zIFpuC0U9ESiZyzBixzxWxj4Kwh8My34q+FK3KNLtmsA1qyrmKSNQOXCPUZd+ONelBTvFoUI/CYsqa/RhtKiyMf2CgSFqEPk59Y3uqnlZ8gFpswfSYyko23yVZYxzKGxGm49Zqxg1l8oz5Ra9XaRwHkuxepmgyhm0SoNy2KlbcEqK+9QqS9PNx9Ihm9U7gsR55SSJ1FBDNnkuWKxIZ0SDpXuOGwZdoUbOMDPHP4vBAgz2VlSEJAHZGJVbYIg7l/FO5KfIVvxC8pPPxMGcNMoevFDeStt2iqztE10n2TA4dgJH76YS9HDhKHD3iCx6ieFX84BAI3QQnngh76f5ruPQVbr5qZmck/5UjDc26lfrOvUBWy0Ogl8bCoOkMOns81TnC3cuUS9KW8+9A+fe3XYZOFUPG1u5epSSmDLw0s5s2F0W30ANeo+zJkJQz9SPZgzwYpEoktofhGVfmLOAB20boCbW1QWq/NpET/hnMecw/uSyAH4NJc3ECOU4nnkK1fj3S/i5dwb3R7k00AqQQUwt7Ie1qV0aY/VQX0J8hLPy7eBNXMHYZYDNxHZ2Qh6AuXJxq+AeRec/Q+JLhZV6hpXwQEzw7bf5v9uUf2vpq3qlhmy0IIGTkwYdCfSAFmqbdo+3XvDTDjFJde0mbeQLcn2n31xaAqJ0ixO/CLsT4I4G4DoncVTgRGNBtsCcjISWT+oeXZ4Iedw/8OsJI1aPnNKLX/60VvcZb94uasRxCkqlPQ11u1Sa2hHvB80WQENxVyzjns0/PiEByyil21Te6oisk3mNCEMrhouCFO3yEZTHHOCMy9eb/4Tmi8cVf3Lf7P53SY2hX3PSN033As3ETIMLHWumWEO9JXHA2y2SIBlIPpLGG2qvNsCIlIr+B1SWAqRKm2w6Blf7U+zCSBwJrfHG5i8J5Gax/cVonMlon7aHJX/gSvucIncRP93XCqkv7D8IFKFsLiBgHqUpXhE3pYjEcV1dk/JD9zFVCfEaQIVX8Jmfz7IIofcBKQ4OaG+C3xC2veX9CD+iAFXDNaGg9eTVxvkbJRJlW4Nk9Wk13kn696jWppRDe/8pDrYMO9ZyxZ98ReKSz9kWKLLyk2zCZgAniCkLJVX3n1M9DYbomyahWiv/KixRIV9hj/oFz87I+HLznbPTjpa+D+bZQnMuRsljTpv90vQUt/pK7jCFnA30B/jtroSF2/m/gpWn1aQs5WeA6ghzF8SdqWI20fghdSeDOCSCmLgTkfaGgGDmw7nHFkRzGtag57IHS2na06I+gzEphXo1w/Zx2BM/jKL2nZoFjHggtFQjYi8nSVRSXIE58RPbBObXk7uuIL9+rs/5Zo7suJInEUxgsiZZAWS25iBtpEiZeBgDtghEoAE0sjcayNq85M4tbu/LF5h51335PsGzQ09O875+vUS89lkWMyNOFoip2PuyWyMP/iU2XIZdfCCJNDjebDoBLQdpy7QQZC7s9c0wjHJervQNDu2jWzBW5MSAJMr7bP+Iv92BkS/GGgzjEn7MF1IRKFwwzbjbS4/slGOmhx9cZrFu7HSEefojNv3r0UaKfKOWzXsq1zEugbzlMDFsacRJJI/iJlK3vtkZ+PLZIVMFlKA32wbq2Kd5T0uCLZ1CPkAfCdzkz2EYscjDcZq2AWfziN2covN4kXE1lQXPPLTNM1xx3tbiepcO/t3SWm4w87qfh99SL0ZnY+LKFPLPeXVM2mIIoVWt+9Nk0I7nY4O79iGYqxZ8RVz289an6NVdJWnSKZvJQCAuHNiVaDxPAFoH392t9wot5t0/qmU95eEWNbU2udUW5sN9JVqcYlvAIfLeYC33oUzzxZgSktsv21mA7Uly1FA5VnoJFh6N244Wmv3YJGFv/TCPryaw+ZORlpZjQdq/2DYXr3EZskfed0G61P09ipTKmlTQ1067Rg5+PAk5FlQ9e0SWbGf2B/08kqymOTMVOznsALHHNFH4LFRKl2F/NOiYFl9khNHnSu9Ak5sq26Ynl/i2fdTle29Y1ugqmR5Yj4YT9pvslFyYCbw0mNFr5rVQm1LvkG27QMq9ph3t8fmn6r6SQ4oSbr5tz+J1kIawGzDxb6VYOvvWhobDTXfBeNv3b4aNm5XUinsCGqG2q/45m3+LoCOsddFceYhRx1Tsss9PLdPfJdErFMjYd3gddjiP0+XQjcRadZP6bwNLySvunFf20Czy6JqdEW2a96KxdYdOryBv1BjbuUq2yCHeh+6sk7fGmmPi50pe/1l5TyPe5oHW9oPnhPswLyf2TFDdCyYlhwBCstv5C1HwlW7xWoGT9XZt4qVj5WryLPLLD6h/5cMLEjWzgCeAIKNsLak92aBqBsHl4AJwl2N4jfvbSkBExGimv0nFvv09uDScQbjx+w4kPQjgjlW+g9ws9VEJvI2k8N6XxVu0uIwovgTFdunG24gBtaDi+y1YLQwZ8mwbip5fVlO3k0n0AEr/ETbtu8Vjkm+nNSiEb7X/3fMjBL5A8PdgG+/FnbexbFFExmEfetXAnisEKy5z44WVPpQZjSy/jzeGn4yDRsFGqhh87QPaDBWhlo37IFbe/C0xynS91d2tP/AJoJS0sVF6iwAAAAAElFTkSuQmCC\");\n}\n\n#menu::after {\n  display: block;\n  content: '';\n  padding-top: 80px;\n}\n\n#logo {\n  position: fixed;\n  bottom: 10px;\n  right: 10px;\n  background: rgba(255,255,255,.1);\n  font-size: 11px;\n  display: block;\n  width: 20px;\n  height: 20px;\n  line-height: 20px;\n  text-align: center;\n  -webkit-border-radius: 20px;\n  -moz-border-radius: 20px;\n  border-radius: 20px;\n  -webkit-box-shadow: 0 0 3px rgba(0,0,0,.2);\n  -moz-box-shadow: 0 0 3px rgba(0,0,0,.2);\n  box-shadow: 0 0 3px rgba(0,0,0,.2);\n  color: inherit;\n}\n\n#menu li a {\n  display: block;\n  color: white;\n  padding: 0 35px 0 25px;\n  -webkit-transition: background 300ms;\n  -moz-transition: background 300ms;\n}\n\n#menu li {\n  position: relative;\n  list-style: none;\n}\n\n#menu a:hover,\n#menu a.active {\n  text-decoration: none;\n  background: rgba(255,255,255,.1);\n}\n\n#menu li:hover .cov {\n  opacity: 1;\n}\n\n#menu li.dirname {\n  color: white;\n  opacity: .60;\n  text-align: left;\n  margin: 15px 0px 0 20px;\n  padding: 0 40px 0 0;\n}\n\n#menu li .dirname {\n  opacity: .60;\n  padding-right: 2px;\n}\n\n#menu li .basename {\n  opacity: 1;\n}\n\n#menu .cov {\n  background: rgba(0,0,0,.4);\n  position: absolute;\n  top: 0;\n  right: 8px;\n  font-size: 9px;\n  opacity: .6;\n  text-align: left;\n  width: 17px;\n  -webkit-border-radius: 10px;\n  -moz-border-radius: 10px;\n  border-radius: 10px;\n  padding: 2px 3px;\n  text-align: center;\n  cursor: pointer;\n}\n\n#stats:nth-child(2n) {\n  display: inline-block;\n  margin-top: 15px;\n  border: 1px solid #eee;\n  padding: 10px;\n  -webkit-box-shadow: inset 0 0 2px #eee;\n  -moz-box-shadow: inset 0 0 2px #eee;\n  box-shadow: inset 0 0 2px #eee;\n  -webkit-border-radius: 5px;\n  -moz-border-radius: 5px;\n  border-radius: 5px;\n}\n\n#stats div {\n  float: left;\n  padding: 0 5px;\n}\n\n#stats::after {\n  display: block;\n  content: '';\n  clear: both;\n}\n\n#stats .sloc::after {\n  content: ' SLOC';\n  color: #b6b6b6;\n}\n\n#stats .percentage::after {\n  content: ' coverage';\n  color: #b6b6b6;\n}\n\n#stats .hits,\n#stats .misses {\n  display: none;\n}\n\n.high {\n  color: #00d4b4;\n}\n.medium {\n  color: #e87d0d;\n}\n.low {\n  color: #d4081a;\n}\n.terrible {\n  color: #d4081a;\n  font-weight: bold;\n}\n\ntable {\n  width: 80%;\n  margin-top: 10px;\n  border-collapse: collapse;\n  border: 1px solid #cbcbcb;\n  color: #363636;\n  -webkit-border-radius: 3px;\n  -moz-border-radius: 3px;\n  border-radius: 3px;\n}\n\ntable thead {\n  display: none;\n}\n\ntable td.line,\ntable td.hits {\n  width: 20px;\n  background: #eaeaea;\n  text-align: center;\n  padding: 0 10px;\n  font-size: 11px;\n}\n\ntable td.line a {\n  color: #949494;\n}\n\ntable td.hits {\n  width: 10px;\n  padding: 2px 5px;\n  color: rgba(0,0,0,.2);\n  background: #f0f0f0;\n}\n\ntr.miss td.line,\ntr.miss td.hits {\n  background: #e6c3c7;\n}\n\ntr.miss td {\n  background: #f8d5d8;\n}\n\ntd.source {\n  padding-left: 15px;\n  line-height: 15px;\n  white-space: pre;\n  font: 12px monaco, monospace;\n}\n\ncode .comment { color: #ddd }\ncode .init { color: #2F6FAD }\ncode .string { color: #5890AD }\ncode .keyword { color: #8A6343 }\ncode .number { color: #2F6FAD }</style>");}.call(this,"cov" in locals_for_with?locals_for_with.cov:typeof cov!=="undefined"?cov:undefined,"coverageClass" in locals_for_with?locals_for_with.coverageClass:typeof coverageClass!=="undefined"?coverageClass:undefined,"id" in locals_for_with?locals_for_with.id:typeof id!=="undefined"?id:undefined,"undefined" in locals_for_with?locals_for_with.undefined:typeof undefined!=="undefined"?undefined:undefined));;return buf.join("");
-}
-
-});
\ No newline at end of file
diff --git a/test/utils/istanbul_reporter/reporter.js b/test/utils/istanbul_reporter/reporter.js
deleted file mode 100644
index b53e3d2f25378..0000000000000
--- a/test/utils/istanbul_reporter/reporter.js
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
- * TODO: move this into it's own module, with it's own dependencies
- */
-
-require.config({
-  paths: {
-    // jade runtime is required by the AMD wrapped jade templates as "jade"
-    jade: '/amd-wrap/node_modules/grunt-contrib-jade/node_modules/jade/runtime'
-  }
-});
-
-// fake fs module to make jade/runtime.js happy
-define('fs', function () {});
-
-// fake process obejct to make browserify-path happy
-window.process = window.process || { cwd: function () { return '.'; }};
-
-// the actual reporter module
-define(function (require) {
-
-  var _ = require('lodash');
-  var $ = require('jquery');
-
-  var InsertionText = require('/amd-wrap/node_modules/istanbul/lib/util/insertion-text.js');
-  var objUtils = require('/amd-wrap/node_modules/istanbul/lib/object-utils.js');
-  // var annotate = require('/amd-wrap/node_modules/istanbul/lib/annotate.js');
-  var Progress = require('/amd-wrap/node_modules/mocha/lib/browser/progress.js');
-  var path = require('/amd-wrap/node_modules/path-browserify/index.js');
-
-  var template = require('./report.jade');
-
-  var Base = window.Mocha.reporters.Base;
-
-  var covGrepQueryParamRE = /cov_grep=([^&]+)/;
-
-  var afterDraw = window.requestAnimationFrame || function (cb) { setTimeout(cb, 500); };
-
-  function IstanbulReporter(runner) {
-    // "inherit" the base reporters characteristics
-    Base.call(this, runner);
-
-    var stats = this.stats;
-    var gotoFile = window.location.hash;
-    if (gotoFile) window.location.hash = '';
-
-    $(document.body)
-      .html('<center><canvas width="40" height="40"></canvas></center>');
-
-    var canvas = document.getElementsByTagName('canvas')[0];
-    var ctx;
-    var progress;
-    if (canvas.getContext) {
-      var ratio = window.devicePixelRatio || 1;
-      canvas.style.width = canvas.width;
-      canvas.style.height = canvas.height;
-      canvas.width *= ratio;
-      canvas.height *= ratio;
-      ctx = canvas.getContext('2d');
-      ctx.scale(ratio, ratio);
-      progress = new Progress();
-      progress.size(40);
-    }
-
-    runner.on('test end', function () {
-      if (progress) {
-        progress
-          .update((stats.tests / this.total) * 100 || 0)
-          .draw(ctx);
-      }
-    });
-
-    runner.on('end', function () {
-      var stats = _.omit(this.stats, 'start', 'end', 'suites');
-
-      stats['create report'] = Date.now();
-      $(document.body).empty().append($(createReport())); // attempt to force parsing immediately
-      stats['create report'] = Date.now() - stats['create report'];
-
-      toSec(stats, 'create report');
-      toSec(stats, 'duration');
-      console.log(JSON.stringify(stats, null, '  '));
-
-      linkNav();
-      if (gotoFile) {
-        afterDraw(function () {
-          window.location.hash = gotoFile;
-        });
-      }
-    });
-  }
-
-  function createReport() {
-    var covResults = window.__coverage__;
-    var grep = window.location.search.match(covGrepQueryParamRE);
-    if (grep) {
-      grep = decodeURIComponent(grep[1]);
-      covResults = _.transform(covResults, function (results, cov, filename) {
-        if (~filename.indexOf(grep)) {
-          results[filename] = cov;
-        }
-      });
-    }
-
-    var summary = objUtils.summarizeCoverage(covResults);
-
-    var dirs = _(covResults)
-    .map(convertFile)
-    .groupBy(function (file) {
-      var dir = path.dirname(file.filename);
-      return dir === '.' ? '' : dir;
-    })
-    .transform(function (dirs, files, dirname) {
-      _.each(files, function (file) {
-        file.relname = dirname ? path.relative(dirname, file.filename) : file.filename;
-      });
-
-      dirs.push({
-        name: dirname,
-        files: files,
-        coverage: _.reduce(files, function (sum, file) {
-          return sum + file.coverage;
-        }, 0) / files.length
-      });
-    }, [])
-    .sortBy('name')
-    .value();
-
-    return template({
-      cov: {
-        dirs: dirs,
-        coverage: summary.lines.pct,
-        sloc: summary.lines.total,
-        hits: summary.lines.covered,
-        misses: summary.lines.total - summary.lines.covered
-      },
-      dirname: path.dirname,
-      relative: path.relative,
-      coverageClass: function (coverage) {
-        if (coverage >= 75) return 'high';
-        if (coverage >= 50) return 'medium';
-        if (coverage >= 25) return 'low';
-        return 'terrible';
-      }
-    });
-  }
-
-  function convertFile(file) {
-    var summary = objUtils.summarizeFileCoverage(file);
-    var count = 0;
-    var structured = file.code.map(function (str) {
-      count += 1;
-      return {
-        line: count,
-        covered: null,
-        text: new InsertionText(str, true)
-      };
-    });
-    var html = '';
-
-    structured.unshift({
-      line: 0,
-      covered: null,
-      text: new InsertionText('')
-    });
-
-    _.forOwn(file.l, function (count, lineNumber) {
-      structured[lineNumber].covered = count > 0 ? true : false;
-    });
-
-    // annotate.Lines(file, structured);
-    //note: order is important, since statements typically result in spanning the whole line and doing branches late
-    //causes mismatched tags
-    // annotate.Branches(file, structured);
-    // annotate.Functions(file, structured);
-    // annotate.Statements(file, structured);
-
-    structured.shift();
-
-    var context = {
-      filename: file.path,
-      sloc: summary.lines.total,
-      coverage: summary.lines.pct,
-      hits: summary.lines.covered,
-      misses: summary.lines.total - summary.lines.covered,
-      source: _.map(structured, function (line, lineNumber) {
-        return {
-          coverage: file.l[line.line],
-          source: line.text + ''
-        };
-      })
-    };
-
-    return context;
-
-    // writer.write(detailTemplate(context));
-    // writer.write('</table></pre>\n');
-    // writer.write(footerTemplate(templateData));
-  }
-
-  function linkNav() {
-    var headings = $('h2').toArray();
-
-    // when scrolling, highlight the related menu item
-    $(window).scroll(function (e) {
-      var heading = find(window.scrollY);
-      if (!heading) return;
-      var links = document.querySelectorAll('#menu a')
-        , link;
-
-      for (var i = 0, len = links.length; i < len; ++i) {
-        link = links[i];
-        link.className = link.getAttribute('href') === '#' + heading.id
-          ? 'active'
-          : '';
-      }
-    });
-
-    // find the file they are probably looking at
-    function find(y) {
-      var i = headings.length
-        , heading;
-
-      while (i--) {
-        heading = headings[i];
-        if (y >= heading.offsetTop) {
-          return heading;
-        }
-      }
-    }
-
-    $('#menu').on('click', '.dirname .cov', function () {
-      var dir = $(this).parent()[0].childNodes[0].textContent;
-      var loc = window.location;
-      var proto = loc.protocol;
-      var host = loc.host;
-      var path = loc.pathname;
-      var search = loc.search;
-      var hash = loc.hash;
-
-      var grep = 'cov_grep=' + encodeURIComponent(dir);
-      if (search && search.match(covGrepQueryParamRE)) {
-        search = search.replace(covGrepQueryParamRE, grep);
-      } else {
-        search = (search ? search + '&' : '?') + grep;
-      }
-
-      window.location = path + search + hash;
-    });
-  }
-
-  function toSec(stats, prop) {
-    return stats[prop] = (stats[prop] / 1000).toFixed(2) + ' sec';
-  }
-
-  return IstanbulReporter;
-});
diff --git a/test/utils/no_digest_promises.js b/test/utils/no_digest_promises.js
deleted file mode 100644
index b6fdb3fd64be8..0000000000000
--- a/test/utils/no_digest_promises.js
+++ /dev/null
@@ -1,34 +0,0 @@
-define(['angular', 'bluebird', 'services/promises'], function (angular, Bluebird) {
-  /**
-   * replace the Promise service with Bluebird so that tests
-   * can use promises without having to call $rootScope.apply()
-   *
-   * var nonDigestPromises = require('test_utils/non_digest_promises');
-   *
-   * describe('some module that does complex shit with promises', function () {
-   *   beforeEach(nonDigestPromises.activate);
-   *
-   * });
-   */
-
-  var active = false;
-
-  angular.module('kibana')
-  .config(function ($provide) {
-    $provide.decorator('Promise', function ($delegate) {
-      return active ? Bluebird : $delegate;
-    });
-  });
-
-  function activate() { active = true; }
-  function deactivate() { active = false; }
-
-  return {
-    activate: activate,
-    deactivate: deactivate,
-    activateForSuite: function () {
-      before(activate);
-      after(deactivate);
-    }
-  };
-});
\ No newline at end of file
diff --git a/test/utils/simulate_keys.js b/test/utils/simulate_keys.js
deleted file mode 100644
index c397a2101a91f..0000000000000
--- a/test/utils/simulate_keys.js
+++ /dev/null
@@ -1,105 +0,0 @@
-define(function (require) {
-  var $ = require('jquery');
-  var _ = require('lodash');
-  var Promise = require('bluebird');
-  var keyMap = require('utils/key_map');
-  var reverseKeyMap = _.mapValues(_.invert(keyMap), _.ary(_.parseInt, 1));
-  var KeyboardEvent = window.KeyboardEvent;
-
-  /**
-   * Simulate keyboard events in an element. This allows testing the way that
-   * elements respond to keyboard input.
-   *
-   * # sequence style
-   * keyboard events occur in a sequence, this array of events describe that sequence.
-   *
-   * ## event
-   * an object with a type property, or a string which will be turned into a single press
-   *
-   * ## event types
-   * ### press
-   * represents a key press
-   *   - `key`: the key for the button pressed
-   *   - `events`: optional list of events that occur before this press completes
-   *
-   * ### wait
-   * represents a pause in a sequence
-   *   - `ms`: the number of milliseconds that the pause takes
-   *
-   * ### repeat
-   * represents a key being repeated because it is held down. Should only exist as a
-   * sub event of `press` events.
-   *   - `count`: the number of times the repeat occurs
-   *
-   * @param  {element} $el - jQuery element where events should occur
-   * @param  {[type]} sequence - an array of events
-   * @async
-   */
-  return function ($el, sequence) {
-    var modifierState = {
-      ctrlKey: false,
-      shiftKey: false,
-      altKey: false,
-      metaKey: false
-    };
-
-    return doList(_.clone(sequence));
-
-    function setModifier(key, state) {
-      var name = key + 'Key';
-      if (modifierState.hasOwnProperty(name)) {
-        modifierState[name] = !!state;
-      }
-    }
-
-    function doList(list) {
-      return Promise.try(function () {
-        if (!list || !list.length) return;
-
-        var event = list[0];
-        if (_.isString(event)) {
-          event = { type: 'press', key: event };
-        }
-
-        switch (event.type) {
-        case 'press':
-          return Promise.resolve()
-          .then(_.partial(fire, 'keydown', event.key))
-          .then(_.partial(fire, 'keypress', event.key))
-          .then(_.partial(doList, event.events))
-          .then(_.partial(fire, 'keyup', event.key));
-
-        case 'wait':
-          return Promise.delay(event.ms);
-
-        case 'repeat':
-          return (function again(remaining) {
-            if (!remaining) return Promise.resolve();
-            remaining = remaining - 1;
-            return Promise.resolve()
-            .then(_.partial(fire, 'keydown', event.key, true))
-            .then(_.partial(fire, 'keypress', event.key, true))
-            .then(_.partial(again, remaining));
-          }(event.count));
-
-        default:
-          throw new TypeError('invalid event type "' + event.type + '"');
-        }
-      })
-      .then(function () {
-        if (_.size(list) > 1) return doList(list.slice(1));
-      });
-    }
-
-    function fire(type, key, repeat) {
-      var keyCode = reverseKeyMap[key];
-      if (!keyCode) throw new TypeError('invalid key "' + key + '"');
-
-      if (type === 'keydown') setModifier(key, true);
-      if (type === 'keyup') setModifier(key, false);
-
-      var $target = _.isFunction($el) ? $el() : $el;
-      $target.trigger($.Event(type, _.defaults({ keyCode: keyCode }, modifierState)));
-    }
-  };
-});
\ No newline at end of file
diff --git a/test/utils/sinon/sinon-1.8.2.js b/test/utils/sinon/sinon-1.8.2.js
deleted file mode 100644
index 657ee9e957d74..0000000000000
--- a/test/utils/sinon/sinon-1.8.2.js
+++ /dev/null
@@ -1,4728 +0,0 @@
-/**
- * Sinon.JS 1.8.2, 2014/02/13
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @author Contributors: https://github.com/cjohansen/Sinon.JS/blob/master/AUTHORS
- *
- * (The BSD License)
- * 
- * Copyright (c) 2010-2014, Christian Johansen, christian@cjohansen.no
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice,
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice,
- *       this list of conditions and the following disclaimer in the documentation
- *       and/or other materials provided with the distribution.
- *     * Neither the name of Christian Johansen nor the names of his contributors
- *       may be used to endorse or promote products derived from this software
- *       without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-this.sinon = (function () {
-var samsam, formatio;
-function define(mod, deps, fn) { if (mod == "samsam") { samsam = deps(); } else { formatio = fn(samsam); } }
-define.amd = true;
-((typeof define === "function" && define.amd && function (m) { define("samsam", m); }) ||
- (typeof module === "object" &&
-      function (m) { module.exports = m(); }) || // Node
- function (m) { this.samsam = m(); } // Browser globals
-)(function () {
-    var o = Object.prototype;
-    var div = typeof document !== "undefined" && document.createElement("div");
-
-    function isNaN(value) {
-        // Unlike global isNaN, this avoids type coercion
-        // typeof check avoids IE host object issues, hat tip to
-        // lodash
-        var val = value; // JsLint thinks value !== value is "weird"
-        return typeof value === "number" && value !== val;
-    }
-
-    function getClass(value) {
-        // Returns the internal [[Class]] by calling Object.prototype.toString
-        // with the provided value as this. Return value is a string, naming the
-        // internal class, e.g. "Array"
-        return o.toString.call(value).split(/[ \]]/)[1];
-    }
-
-    /**
-     * @name samsam.isArguments
-     * @param Object object
-     *
-     * Returns ``true`` if ``object`` is an ``arguments`` object,
-     * ``false`` otherwise.
-     */
-    function isArguments(object) {
-        if (typeof object !== "object" || typeof object.length !== "number" ||
-                getClass(object) === "Array") {
-            return false;
-        }
-        if (typeof object.callee == "function") { return true; }
-        try {
-            object[object.length] = 6;
-            delete object[object.length];
-        } catch (e) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * @name samsam.isElement
-     * @param Object object
-     *
-     * Returns ``true`` if ``object`` is a DOM element node. Unlike
-     * Underscore.js/lodash, this function will return ``false`` if ``object``
-     * is an *element-like* object, i.e. a regular object with a ``nodeType``
-     * property that holds the value ``1``.
-     */
-    function isElement(object) {
-        if (!object || object.nodeType !== 1 || !div) { return false; }
-        try {
-            object.appendChild(div);
-            object.removeChild(div);
-        } catch (e) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * @name samsam.keys
-     * @param Object object
-     *
-     * Return an array of own property names.
-     */
-    function keys(object) {
-        var ks = [], prop;
-        for (prop in object) {
-            if (o.hasOwnProperty.call(object, prop)) { ks.push(prop); }
-        }
-        return ks;
-    }
-
-    /**
-     * @name samsam.isDate
-     * @param Object value
-     *
-     * Returns true if the object is a ``Date``, or *date-like*. Duck typing
-     * of date objects work by checking that the object has a ``getTime``
-     * function whose return value equals the return value from the object's
-     * ``valueOf``.
-     */
-    function isDate(value) {
-        return typeof value.getTime == "function" &&
-            value.getTime() == value.valueOf();
-    }
-
-    /**
-     * @name samsam.isNegZero
-     * @param Object value
-     *
-     * Returns ``true`` if ``value`` is ``-0``.
-     */
-    function isNegZero(value) {
-        return value === 0 && 1 / value === -Infinity;
-    }
-
-    /**
-     * @name samsam.equal
-     * @param Object obj1
-     * @param Object obj2
-     *
-     * Returns ``true`` if two objects are strictly equal. Compared to
-     * ``===`` there are two exceptions:
-     *
-     *   - NaN is considered equal to NaN
-     *   - -0 and +0 are not considered equal
-     */
-    function identical(obj1, obj2) {
-        if (obj1 === obj2 || (isNaN(obj1) && isNaN(obj2))) {
-            return obj1 !== 0 || isNegZero(obj1) === isNegZero(obj2);
-        }
-    }
-
-
-    /**
-     * @name samsam.deepEqual
-     * @param Object obj1
-     * @param Object obj2
-     *
-     * Deep equal comparison. Two values are "deep equal" if:
-     *
-     *   - They are equal, according to samsam.identical
-     *   - They are both date objects representing the same time
-     *   - They are both arrays containing elements that are all deepEqual
-     *   - They are objects with the same set of properties, and each property
-     *     in ``obj1`` is deepEqual to the corresponding property in ``obj2``
-     *
-     * Supports cyclic objects.
-     */
-    function deepEqualCyclic(obj1, obj2) {
-
-        // used for cyclic comparison
-        // contain already visited objects
-        var objects1 = [],
-            objects2 = [],
-        // contain pathes (position in the object structure)
-        // of the already visited objects
-        // indexes same as in objects arrays
-            paths1 = [],
-            paths2 = [],
-        // contains combinations of already compared objects
-        // in the manner: { "$1['ref']$2['ref']": true }
-            compared = {};
-
-        /**
-         * used to check, if the value of a property is an object
-         * (cyclic logic is only needed for objects)
-         * only needed for cyclic logic
-         */
-        function isObject(value) {
-
-            if (typeof value === 'object' && value !== null &&
-                    !(value instanceof Boolean) &&
-                    !(value instanceof Date)    &&
-                    !(value instanceof Number)  &&
-                    !(value instanceof RegExp)  &&
-                    !(value instanceof String)) {
-
-                return true;
-            }
-
-            return false;
-        }
-
-        /**
-         * returns the index of the given object in the
-         * given objects array, -1 if not contained
-         * only needed for cyclic logic
-         */
-        function getIndex(objects, obj) {
-
-            var i;
-            for (i = 0; i < objects.length; i++) {
-                if (objects[i] === obj) {
-                    return i;
-                }
-            }
-
-            return -1;
-        }
-
-        // does the recursion for the deep equal check
-        return (function deepEqual(obj1, obj2, path1, path2) {
-            var type1 = typeof obj1;
-            var type2 = typeof obj2;
-
-            // == null also matches undefined
-            if (obj1 === obj2 ||
-                    isNaN(obj1) || isNaN(obj2) ||
-                    obj1 == null || obj2 == null ||
-                    type1 !== "object" || type2 !== "object") {
-
-                return identical(obj1, obj2);
-            }
-
-            // Elements are only equal if identical(expected, actual)
-            if (isElement(obj1) || isElement(obj2)) { return false; }
-
-            var isDate1 = isDate(obj1), isDate2 = isDate(obj2);
-            if (isDate1 || isDate2) {
-                if (!isDate1 || !isDate2 || obj1.getTime() !== obj2.getTime()) {
-                    return false;
-                }
-            }
-
-            if (obj1 instanceof RegExp && obj2 instanceof RegExp) {
-                if (obj1.toString() !== obj2.toString()) { return false; }
-            }
-
-            var class1 = getClass(obj1);
-            var class2 = getClass(obj2);
-            var keys1 = keys(obj1);
-            var keys2 = keys(obj2);
-
-            if (isArguments(obj1) || isArguments(obj2)) {
-                if (obj1.length !== obj2.length) { return false; }
-            } else {
-                if (type1 !== type2 || class1 !== class2 ||
-                        keys1.length !== keys2.length) {
-                    return false;
-                }
-            }
-
-            var key, i, l,
-                // following vars are used for the cyclic logic
-                value1, value2,
-                isObject1, isObject2,
-                index1, index2,
-                newPath1, newPath2;
-
-            for (i = 0, l = keys1.length; i < l; i++) {
-                key = keys1[i];
-                if (!o.hasOwnProperty.call(obj2, key)) {
-                    return false;
-                }
-
-                // Start of the cyclic logic
-
-                value1 = obj1[key];
-                value2 = obj2[key];
-
-                isObject1 = isObject(value1);
-                isObject2 = isObject(value2);
-
-                // determine, if the objects were already visited
-                // (it's faster to check for isObject first, than to
-                // get -1 from getIndex for non objects)
-                index1 = isObject1 ? getIndex(objects1, value1) : -1;
-                index2 = isObject2 ? getIndex(objects2, value2) : -1;
-
-                // determine the new pathes of the objects
-                // - for non cyclic objects the current path will be extended
-                //   by current property name
-                // - for cyclic objects the stored path is taken
-                newPath1 = index1 !== -1
-                    ? paths1[index1]
-                    : path1 + '[' + JSON.stringify(key) + ']';
-                newPath2 = index2 !== -1
-                    ? paths2[index2]
-                    : path2 + '[' + JSON.stringify(key) + ']';
-
-                // stop recursion if current objects are already compared
-                if (compared[newPath1 + newPath2]) {
-                    return true;
-                }
-
-                // remember the current objects and their pathes
-                if (index1 === -1 && isObject1) {
-                    objects1.push(value1);
-                    paths1.push(newPath1);
-                }
-                if (index2 === -1 && isObject2) {
-                    objects2.push(value2);
-                    paths2.push(newPath2);
-                }
-
-                // remember that the current objects are already compared
-                if (isObject1 && isObject2) {
-                    compared[newPath1 + newPath2] = true;
-                }
-
-                // End of cyclic logic
-
-                // neither value1 nor value2 is a cycle
-                // continue with next level
-                if (!deepEqual(value1, value2, newPath1, newPath2)) {
-                    return false;
-                }
-            }
-
-            return true;
-
-        }(obj1, obj2, '$1', '$2'));
-    }
-
-    var match;
-
-    function arrayContains(array, subset) {
-        if (subset.length === 0) { return true; }
-        var i, l, j, k;
-        for (i = 0, l = array.length; i < l; ++i) {
-            if (match(array[i], subset[0])) {
-                for (j = 0, k = subset.length; j < k; ++j) {
-                    if (!match(array[i + j], subset[j])) { return false; }
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @name samsam.match
-     * @param Object object
-     * @param Object matcher
-     *
-     * Compare arbitrary value ``object`` with matcher.
-     */
-    match = function match(object, matcher) {
-        if (matcher && typeof matcher.test === "function") {
-            return matcher.test(object);
-        }
-
-        if (typeof matcher === "function") {
-            return matcher(object) === true;
-        }
-
-        if (typeof matcher === "string") {
-            matcher = matcher.toLowerCase();
-            var notNull = typeof object === "string" || !!object;
-            return notNull &&
-                (String(object)).toLowerCase().indexOf(matcher) >= 0;
-        }
-
-        if (typeof matcher === "number") {
-            return matcher === object;
-        }
-
-        if (typeof matcher === "boolean") {
-            return matcher === object;
-        }
-
-        if (getClass(object) === "Array" && getClass(matcher) === "Array") {
-            return arrayContains(object, matcher);
-        }
-
-        if (matcher && typeof matcher === "object") {
-            var prop;
-            for (prop in matcher) {
-                if (!match(object[prop], matcher[prop])) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        throw new Error("Matcher was not a string, a number, a " +
-                        "function, a boolean or an object");
-    };
-
-    return {
-        isArguments: isArguments,
-        isElement: isElement,
-        isDate: isDate,
-        isNegZero: isNegZero,
-        identical: identical,
-        deepEqual: deepEqualCyclic,
-        match: match,
-        keys: keys
-    };
-});
-((typeof define === "function" && define.amd && function (m) {
-    define("formatio", ["samsam"], m);
-}) || (typeof module === "object" && function (m) {
-    module.exports = m(require("samsam"));
-}) || function (m) { this.formatio = m(this.samsam); }
-)(function (samsam) {
-    
-    var formatio = {
-        excludeConstructors: ["Object", /^.$/],
-        quoteStrings: true
-    };
-
-    var hasOwn = Object.prototype.hasOwnProperty;
-
-    var specialObjects = [];
-    if (typeof global !== "undefined") {
-        specialObjects.push({ object: global, value: "[object global]" });
-    }
-    if (typeof document !== "undefined") {
-        specialObjects.push({
-            object: document,
-            value: "[object HTMLDocument]"
-        });
-    }
-    if (typeof window !== "undefined") {
-        specialObjects.push({ object: window, value: "[object Window]" });
-    }
-
-    function functionName(func) {
-        if (!func) { return ""; }
-        if (func.displayName) { return func.displayName; }
-        if (func.name) { return func.name; }
-        var matches = func.toString().match(/function\s+([^\(]+)/m);
-        return (matches && matches[1]) || "";
-    }
-
-    function constructorName(f, object) {
-        var name = functionName(object && object.constructor);
-        var excludes = f.excludeConstructors ||
-                formatio.excludeConstructors || [];
-
-        var i, l;
-        for (i = 0, l = excludes.length; i < l; ++i) {
-            if (typeof excludes[i] === "string" && excludes[i] === name) {
-                return "";
-            } else if (excludes[i].test && excludes[i].test(name)) {
-                return "";
-            }
-        }
-
-        return name;
-    }
-
-    function isCircular(object, objects) {
-        if (typeof object !== "object") { return false; }
-        var i, l;
-        for (i = 0, l = objects.length; i < l; ++i) {
-            if (objects[i] === object) { return true; }
-        }
-        return false;
-    }
-
-    function ascii(f, object, processed, indent) {
-        if (typeof object === "string") {
-            var qs = f.quoteStrings;
-            var quote = typeof qs !== "boolean" || qs;
-            return processed || quote ? '"' + object + '"' : object;
-        }
-
-        if (typeof object === "function" && !(object instanceof RegExp)) {
-            return ascii.func(object);
-        }
-
-        processed = processed || [];
-
-        if (isCircular(object, processed)) { return "[Circular]"; }
-
-        if (Object.prototype.toString.call(object) === "[object Array]") {
-            return ascii.array.call(f, object, processed);
-        }
-
-        if (!object) { return String((1/object) === -Infinity ? "-0" : object); }
-        if (samsam.isElement(object)) { return ascii.element(object); }
-
-        if (typeof object.toString === "function" &&
-                object.toString !== Object.prototype.toString) {
-            return object.toString();
-        }
-
-        var i, l;
-        for (i = 0, l = specialObjects.length; i < l; i++) {
-            if (object === specialObjects[i].object) {
-                return specialObjects[i].value;
-            }
-        }
-
-        return ascii.object.call(f, object, processed, indent);
-    }
-
-    ascii.func = function (func) {
-        return "function " + functionName(func) + "() {}";
-    };
-
-    ascii.array = function (array, processed) {
-        processed = processed || [];
-        processed.push(array);
-        var i, l, pieces = [];
-        for (i = 0, l = array.length; i < l; ++i) {
-            pieces.push(ascii(this, array[i], processed));
-        }
-        return "[" + pieces.join(", ") + "]";
-    };
-
-    ascii.object = function (object, processed, indent) {
-        processed = processed || [];
-        processed.push(object);
-        indent = indent || 0;
-        var pieces = [], properties = samsam.keys(object).sort();
-        var length = 3;
-        var prop, str, obj, i, l;
-
-        for (i = 0, l = properties.length; i < l; ++i) {
-            prop = properties[i];
-            obj = object[prop];
-
-            if (isCircular(obj, processed)) {
-                str = "[Circular]";
-            } else {
-                str = ascii(this, obj, processed, indent + 2);
-            }
-
-            str = (/\s/.test(prop) ? '"' + prop + '"' : prop) + ": " + str;
-            length += str.length;
-            pieces.push(str);
-        }
-
-        var cons = constructorName(this, object);
-        var prefix = cons ? "[" + cons + "] " : "";
-        var is = "";
-        for (i = 0, l = indent; i < l; ++i) { is += " "; }
-
-        if (length + indent > 80) {
-            return prefix + "{\n  " + is + pieces.join(",\n  " + is) + "\n" +
-                is + "}";
-        }
-        return prefix + "{ " + pieces.join(", ") + " }";
-    };
-
-    ascii.element = function (element) {
-        var tagName = element.tagName.toLowerCase();
-        var attrs = element.attributes, attr, pairs = [], attrName, i, l, val;
-
-        for (i = 0, l = attrs.length; i < l; ++i) {
-            attr = attrs.item(i);
-            attrName = attr.nodeName.toLowerCase().replace("html:", "");
-            val = attr.nodeValue;
-            if (attrName !== "contenteditable" || val !== "inherit") {
-                if (!!val) { pairs.push(attrName + "=\"" + val + "\""); }
-            }
-        }
-
-        var formatted = "<" + tagName + (pairs.length > 0 ? " " : "");
-        var content = element.innerHTML;
-
-        if (content.length > 20) {
-            content = content.substr(0, 20) + "[...]";
-        }
-
-        var res = formatted + pairs.join(" ") + ">" + content +
-                "</" + tagName + ">";
-
-        return res.replace(/ contentEditable="inherit"/, "");
-    };
-
-    function Formatio(options) {
-        for (var opt in options) {
-            this[opt] = options[opt];
-        }
-    }
-
-    Formatio.prototype = {
-        functionName: functionName,
-
-        configure: function (options) {
-            return new Formatio(options);
-        },
-
-        constructorName: function (object) {
-            return constructorName(this, object);
-        },
-
-        ascii: function (object, processed, indent) {
-            return ascii(this, object, processed, indent);
-        }
-    };
-
-    return Formatio.prototype;
-});
-/*jslint eqeqeq: false, onevar: false, forin: true, nomen: false, regexp: false, plusplus: false*/
-/*global module, require, __dirname, document*/
-/**
- * Sinon core utilities. For internal use only.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-var sinon = (function (formatio) {
-    var div = typeof document != "undefined" && document.createElement("div");
-    var hasOwn = Object.prototype.hasOwnProperty;
-
-    function isDOMNode(obj) {
-        var success = false;
-
-        try {
-            obj.appendChild(div);
-            success = div.parentNode == obj;
-        } catch (e) {
-            return false;
-        } finally {
-            try {
-                obj.removeChild(div);
-            } catch (e) {
-                // Remove failed, not much we can do about that
-            }
-        }
-
-        return success;
-    }
-
-    function isElement(obj) {
-        return div && obj && obj.nodeType === 1 && isDOMNode(obj);
-    }
-
-    function isFunction(obj) {
-        return typeof obj === "function" || !!(obj && obj.constructor && obj.call && obj.apply);
-    }
-
-    function mirrorProperties(target, source) {
-        for (var prop in source) {
-            if (!hasOwn.call(target, prop)) {
-                target[prop] = source[prop];
-            }
-        }
-    }
-
-    function isRestorable (obj) {
-        return typeof obj === "function" && typeof obj.restore === "function" && obj.restore.sinon;
-    }
-
-    var sinon = {
-        wrapMethod: function wrapMethod(object, property, method) {
-            if (!object) {
-                throw new TypeError("Should wrap property of object");
-            }
-
-            if (typeof method != "function") {
-                throw new TypeError("Method wrapper should be function");
-            }
-
-            var wrappedMethod = object[property],
-                error;
-
-            if (!isFunction(wrappedMethod)) {
-                error = new TypeError("Attempted to wrap " + (typeof wrappedMethod) + " property " +
-                                    property + " as function");
-            }
-
-            if (wrappedMethod.restore && wrappedMethod.restore.sinon) {
-                error = new TypeError("Attempted to wrap " + property + " which is already wrapped");
-            }
-
-            if (wrappedMethod.calledBefore) {
-                var verb = !!wrappedMethod.returns ? "stubbed" : "spied on";
-                error = new TypeError("Attempted to wrap " + property + " which is already " + verb);
-            }
-
-            if (error) {
-                if (wrappedMethod._stack) {
-                    error.stack += '\n--------------\n' + wrappedMethod._stack;
-                }
-                throw error;
-            }
-
-            // IE 8 does not support hasOwnProperty on the window object and Firefox has a problem
-            // when using hasOwn.call on objects from other frames.
-            var owned = object.hasOwnProperty ? object.hasOwnProperty(property) : hasOwn.call(object, property);
-            object[property] = method;
-            method.displayName = property;
-            // Set up a stack trace which can be used later to find what line of
-            // code the original method was created on.
-            method._stack = (new Error('Stack Trace for original')).stack;
-
-            method.restore = function () {
-                // For prototype properties try to reset by delete first.
-                // If this fails (ex: localStorage on mobile safari) then force a reset
-                // via direct assignment.
-                if (!owned) {
-                    delete object[property];
-                }
-                if (object[property] === method) {
-                    object[property] = wrappedMethod;
-                }
-            };
-
-            method.restore.sinon = true;
-            mirrorProperties(method, wrappedMethod);
-
-            return method;
-        },
-
-        extend: function extend(target) {
-            for (var i = 1, l = arguments.length; i < l; i += 1) {
-                for (var prop in arguments[i]) {
-                    if (arguments[i].hasOwnProperty(prop)) {
-                        target[prop] = arguments[i][prop];
-                    }
-
-                    // DONT ENUM bug, only care about toString
-                    if (arguments[i].hasOwnProperty("toString") &&
-                        arguments[i].toString != target.toString) {
-                        target.toString = arguments[i].toString;
-                    }
-                }
-            }
-
-            return target;
-        },
-
-        create: function create(proto) {
-            var F = function () {};
-            F.prototype = proto;
-            return new F();
-        },
-
-        deepEqual: function deepEqual(a, b) {
-            if (sinon.match && sinon.match.isMatcher(a)) {
-                return a.test(b);
-            }
-            if (typeof a != "object" || typeof b != "object") {
-                return a === b;
-            }
-
-            if (isElement(a) || isElement(b)) {
-                return a === b;
-            }
-
-            if (a === b) {
-                return true;
-            }
-
-            if ((a === null && b !== null) || (a !== null && b === null)) {
-                return false;
-            }
-
-            var aString = Object.prototype.toString.call(a);
-            if (aString != Object.prototype.toString.call(b)) {
-                return false;
-            }
-
-            if (aString == "[object Date]") {
-                return a.valueOf() === b.valueOf();
-            }
-
-            var prop, aLength = 0, bLength = 0;
-
-            if (aString == "[object Array]" && a.length !== b.length) {
-                return false;
-            }
-
-            for (prop in a) {
-                aLength += 1;
-
-                if (!deepEqual(a[prop], b[prop])) {
-                    return false;
-                }
-            }
-
-            for (prop in b) {
-                bLength += 1;
-            }
-
-            return aLength == bLength;
-        },
-
-        functionName: function functionName(func) {
-            var name = func.displayName || func.name;
-
-            // Use function decomposition as a last resort to get function
-            // name. Does not rely on function decomposition to work - if it
-            // doesn't debugging will be slightly less informative
-            // (i.e. toString will say 'spy' rather than 'myFunc').
-            if (!name) {
-                var matches = func.toString().match(/function ([^\s\(]+)/);
-                name = matches && matches[1];
-            }
-
-            return name;
-        },
-
-        functionToString: function toString() {
-            if (this.getCall && this.callCount) {
-                var thisValue, prop, i = this.callCount;
-
-                while (i--) {
-                    thisValue = this.getCall(i).thisValue;
-
-                    for (prop in thisValue) {
-                        if (thisValue[prop] === this) {
-                            return prop;
-                        }
-                    }
-                }
-            }
-
-            return this.displayName || "sinon fake";
-        },
-
-        getConfig: function (custom) {
-            var config = {};
-            custom = custom || {};
-            var defaults = sinon.defaultConfig;
-
-            for (var prop in defaults) {
-                if (defaults.hasOwnProperty(prop)) {
-                    config[prop] = custom.hasOwnProperty(prop) ? custom[prop] : defaults[prop];
-                }
-            }
-
-            return config;
-        },
-
-        format: function (val) {
-            return "" + val;
-        },
-
-        defaultConfig: {
-            injectIntoThis: true,
-            injectInto: null,
-            properties: ["spy", "stub", "mock", "clock", "server", "requests"],
-            useFakeTimers: true,
-            useFakeServer: true
-        },
-
-        timesInWords: function timesInWords(count) {
-            return count == 1 && "once" ||
-                count == 2 && "twice" ||
-                count == 3 && "thrice" ||
-                (count || 0) + " times";
-        },
-
-        calledInOrder: function (spies) {
-            for (var i = 1, l = spies.length; i < l; i++) {
-                if (!spies[i - 1].calledBefore(spies[i]) || !spies[i].called) {
-                    return false;
-                }
-            }
-
-            return true;
-        },
-
-        orderByFirstCall: function (spies) {
-            return spies.sort(function (a, b) {
-                // uuid, won't ever be equal
-                var aCall = a.getCall(0);
-                var bCall = b.getCall(0);
-                var aId = aCall && aCall.callId || -1;
-                var bId = bCall && bCall.callId || -1;
-
-                return aId < bId ? -1 : 1;
-            });
-        },
-
-        log: function () {},
-
-        logError: function (label, err) {
-            var msg = label + " threw exception: ";
-            sinon.log(msg + "[" + err.name + "] " + err.message);
-            if (err.stack) { sinon.log(err.stack); }
-
-            setTimeout(function () {
-                err.message = msg + err.message;
-                throw err;
-            }, 0);
-        },
-
-        typeOf: function (value) {
-            if (value === null) {
-                return "null";
-            }
-            else if (value === undefined) {
-                return "undefined";
-            }
-            var string = Object.prototype.toString.call(value);
-            return string.substring(8, string.length - 1).toLowerCase();
-        },
-
-        createStubInstance: function (constructor) {
-            if (typeof constructor !== "function") {
-                throw new TypeError("The constructor should be a function.");
-            }
-            return sinon.stub(sinon.create(constructor.prototype));
-        },
-
-        restore: function (object) {
-            if (object !== null && typeof object === "object") {
-                for (var prop in object) {
-                    if (isRestorable(object[prop])) {
-                        object[prop].restore();
-                    }
-                }
-            }
-            else if (isRestorable(object)) {
-                object.restore();
-            }
-        }
-    };
-
-    var isNode = typeof module !== "undefined" && module.exports;
-    var isAMD = typeof define === 'function' && typeof define.amd === 'object' && define.amd;
-
-    if (isAMD) {
-        define(function(){
-            return sinon;
-        });
-    } else if (isNode) {
-        try {
-            formatio = require("formatio");
-        } catch (e) {}
-        module.exports = sinon;
-        module.exports.spy = require("./sinon/spy");
-        module.exports.spyCall = require("./sinon/call");
-        module.exports.behavior = require("./sinon/behavior");
-        module.exports.stub = require("./sinon/stub");
-        module.exports.mock = require("./sinon/mock");
-        module.exports.collection = require("./sinon/collection");
-        module.exports.assert = require("./sinon/assert");
-        module.exports.sandbox = require("./sinon/sandbox");
-        module.exports.test = require("./sinon/test");
-        module.exports.testCase = require("./sinon/test_case");
-        module.exports.assert = require("./sinon/assert");
-        module.exports.match = require("./sinon/match");
-    }
-
-    if (formatio) {
-        var formatter = formatio.configure({ quoteStrings: false });
-        sinon.format = function () {
-            return formatter.ascii.apply(formatter, arguments);
-        };
-    } else if (isNode) {
-        try {
-            var util = require("util");
-            sinon.format = function (value) {
-                return typeof value == "object" && value.toString === Object.prototype.toString ? util.inspect(value) : value;
-            };
-        } catch (e) {
-            /* Node, but no util module - would be very old, but better safe than
-             sorry */
-        }
-    }
-
-    return sinon;
-}(typeof formatio == "object" && formatio));
-
-/* @depend ../sinon.js */
-/*jslint eqeqeq: false, onevar: false, plusplus: false*/
-/*global module, require, sinon*/
-/**
- * Match functions
- *
- * @author Maximilian Antoni (mail@maxantoni.de)
- * @license BSD
- *
- * Copyright (c) 2012 Maximilian Antoni
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function assertType(value, type, name) {
-        var actual = sinon.typeOf(value);
-        if (actual !== type) {
-            throw new TypeError("Expected type of " + name + " to be " +
-                type + ", but was " + actual);
-        }
-    }
-
-    var matcher = {
-        toString: function () {
-            return this.message;
-        }
-    };
-
-    function isMatcher(object) {
-        return matcher.isPrototypeOf(object);
-    }
-
-    function matchObject(expectation, actual) {
-        if (actual === null || actual === undefined) {
-            return false;
-        }
-        for (var key in expectation) {
-            if (expectation.hasOwnProperty(key)) {
-                var exp = expectation[key];
-                var act = actual[key];
-                if (match.isMatcher(exp)) {
-                    if (!exp.test(act)) {
-                        return false;
-                    }
-                } else if (sinon.typeOf(exp) === "object") {
-                    if (!matchObject(exp, act)) {
-                        return false;
-                    }
-                } else if (!sinon.deepEqual(exp, act)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    matcher.or = function (m2) {
-        if (!isMatcher(m2)) {
-            throw new TypeError("Matcher expected");
-        }
-        var m1 = this;
-        var or = sinon.create(matcher);
-        or.test = function (actual) {
-            return m1.test(actual) || m2.test(actual);
-        };
-        or.message = m1.message + ".or(" + m2.message + ")";
-        return or;
-    };
-
-    matcher.and = function (m2) {
-        if (!isMatcher(m2)) {
-            throw new TypeError("Matcher expected");
-        }
-        var m1 = this;
-        var and = sinon.create(matcher);
-        and.test = function (actual) {
-            return m1.test(actual) && m2.test(actual);
-        };
-        and.message = m1.message + ".and(" + m2.message + ")";
-        return and;
-    };
-
-    var match = function (expectation, message) {
-        var m = sinon.create(matcher);
-        var type = sinon.typeOf(expectation);
-        switch (type) {
-        case "object":
-            if (typeof expectation.test === "function") {
-                m.test = function (actual) {
-                    return expectation.test(actual) === true;
-                };
-                m.message = "match(" + sinon.functionName(expectation.test) + ")";
-                return m;
-            }
-            var str = [];
-            for (var key in expectation) {
-                if (expectation.hasOwnProperty(key)) {
-                    str.push(key + ": " + expectation[key]);
-                }
-            }
-            m.test = function (actual) {
-                return matchObject(expectation, actual);
-            };
-            m.message = "match(" + str.join(", ") + ")";
-            break;
-        case "number":
-            m.test = function (actual) {
-                return expectation == actual;
-            };
-            break;
-        case "string":
-            m.test = function (actual) {
-                if (typeof actual !== "string") {
-                    return false;
-                }
-                return actual.indexOf(expectation) !== -1;
-            };
-            m.message = "match(\"" + expectation + "\")";
-            break;
-        case "regexp":
-            m.test = function (actual) {
-                if (typeof actual !== "string") {
-                    return false;
-                }
-                return expectation.test(actual);
-            };
-            break;
-        case "function":
-            m.test = expectation;
-            if (message) {
-                m.message = message;
-            } else {
-                m.message = "match(" + sinon.functionName(expectation) + ")";
-            }
-            break;
-        default:
-            m.test = function (actual) {
-              return sinon.deepEqual(expectation, actual);
-            };
-        }
-        if (!m.message) {
-            m.message = "match(" + expectation + ")";
-        }
-        return m;
-    };
-
-    match.isMatcher = isMatcher;
-
-    match.any = match(function () {
-        return true;
-    }, "any");
-
-    match.defined = match(function (actual) {
-        return actual !== null && actual !== undefined;
-    }, "defined");
-
-    match.truthy = match(function (actual) {
-        return !!actual;
-    }, "truthy");
-
-    match.falsy = match(function (actual) {
-        return !actual;
-    }, "falsy");
-
-    match.same = function (expectation) {
-        return match(function (actual) {
-            return expectation === actual;
-        }, "same(" + expectation + ")");
-    };
-
-    match.typeOf = function (type) {
-        assertType(type, "string", "type");
-        return match(function (actual) {
-            return sinon.typeOf(actual) === type;
-        }, "typeOf(\"" + type + "\")");
-    };
-
-    match.instanceOf = function (type) {
-        assertType(type, "function", "type");
-        return match(function (actual) {
-            return actual instanceof type;
-        }, "instanceOf(" + sinon.functionName(type) + ")");
-    };
-
-    function createPropertyMatcher(propertyTest, messagePrefix) {
-        return function (property, value) {
-            assertType(property, "string", "property");
-            var onlyProperty = arguments.length === 1;
-            var message = messagePrefix + "(\"" + property + "\"";
-            if (!onlyProperty) {
-                message += ", " + value;
-            }
-            message += ")";
-            return match(function (actual) {
-                if (actual === undefined || actual === null ||
-                        !propertyTest(actual, property)) {
-                    return false;
-                }
-                return onlyProperty || sinon.deepEqual(value, actual[property]);
-            }, message);
-        };
-    }
-
-    match.has = createPropertyMatcher(function (actual, property) {
-        if (typeof actual === "object") {
-            return property in actual;
-        }
-        return actual[property] !== undefined;
-    }, "has");
-
-    match.hasOwn = createPropertyMatcher(function (actual, property) {
-        return actual.hasOwnProperty(property);
-    }, "hasOwn");
-
-    match.bool = match.typeOf("boolean");
-    match.number = match.typeOf("number");
-    match.string = match.typeOf("string");
-    match.object = match.typeOf("object");
-    match.func = match.typeOf("function");
-    match.array = match.typeOf("array");
-    match.regexp = match.typeOf("regexp");
-    match.date = match.typeOf("date");
-
-    if (commonJSModule) {
-        module.exports = match;
-    } else {
-        sinon.match = match;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/**
-  * @depend ../sinon.js
-  * @depend match.js
-  */
-/*jslint eqeqeq: false, onevar: false, plusplus: false*/
-/*global module, require, sinon*/
-/**
-  * Spy calls
-  *
-  * @author Christian Johansen (christian@cjohansen.no)
-  * @author Maximilian Antoni (mail@maxantoni.de)
-  * @license BSD
-  *
-  * Copyright (c) 2010-2013 Christian Johansen
-  * Copyright (c) 2013 Maximilian Antoni
-  */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function throwYieldError(proxy, text, args) {
-        var msg = sinon.functionName(proxy) + text;
-        if (args.length) {
-            msg += " Received [" + slice.call(args).join(", ") + "]";
-        }
-        throw new Error(msg);
-    }
-
-    var slice = Array.prototype.slice;
-
-    var callProto = {
-        calledOn: function calledOn(thisValue) {
-            if (sinon.match && sinon.match.isMatcher(thisValue)) {
-                return thisValue.test(this.thisValue);
-            }
-            return this.thisValue === thisValue;
-        },
-
-        calledWith: function calledWith() {
-            for (var i = 0, l = arguments.length; i < l; i += 1) {
-                if (!sinon.deepEqual(arguments[i], this.args[i])) {
-                    return false;
-                }
-            }
-
-            return true;
-        },
-
-        calledWithMatch: function calledWithMatch() {
-            for (var i = 0, l = arguments.length; i < l; i += 1) {
-                var actual = this.args[i];
-                var expectation = arguments[i];
-                if (!sinon.match || !sinon.match(expectation).test(actual)) {
-                    return false;
-                }
-            }
-            return true;
-        },
-
-        calledWithExactly: function calledWithExactly() {
-            return arguments.length == this.args.length &&
-                this.calledWith.apply(this, arguments);
-        },
-
-        notCalledWith: function notCalledWith() {
-            return !this.calledWith.apply(this, arguments);
-        },
-
-        notCalledWithMatch: function notCalledWithMatch() {
-            return !this.calledWithMatch.apply(this, arguments);
-        },
-
-        returned: function returned(value) {
-            return sinon.deepEqual(value, this.returnValue);
-        },
-
-        threw: function threw(error) {
-            if (typeof error === "undefined" || !this.exception) {
-                return !!this.exception;
-            }
-
-            return this.exception === error || this.exception.name === error;
-        },
-
-        calledWithNew: function calledWithNew() {
-            return this.proxy.prototype && this.thisValue instanceof this.proxy;
-        },
-
-        calledBefore: function (other) {
-            return this.callId < other.callId;
-        },
-
-        calledAfter: function (other) {
-            return this.callId > other.callId;
-        },
-
-        callArg: function (pos) {
-            this.args[pos]();
-        },
-
-        callArgOn: function (pos, thisValue) {
-            this.args[pos].apply(thisValue);
-        },
-
-        callArgWith: function (pos) {
-            this.callArgOnWith.apply(this, [pos, null].concat(slice.call(arguments, 1)));
-        },
-
-        callArgOnWith: function (pos, thisValue) {
-            var args = slice.call(arguments, 2);
-            this.args[pos].apply(thisValue, args);
-        },
-
-        "yield": function () {
-            this.yieldOn.apply(this, [null].concat(slice.call(arguments, 0)));
-        },
-
-        yieldOn: function (thisValue) {
-            var args = this.args;
-            for (var i = 0, l = args.length; i < l; ++i) {
-                if (typeof args[i] === "function") {
-                    args[i].apply(thisValue, slice.call(arguments, 1));
-                    return;
-                }
-            }
-            throwYieldError(this.proxy, " cannot yield since no callback was passed.", args);
-        },
-
-        yieldTo: function (prop) {
-            this.yieldToOn.apply(this, [prop, null].concat(slice.call(arguments, 1)));
-        },
-
-        yieldToOn: function (prop, thisValue) {
-            var args = this.args;
-            for (var i = 0, l = args.length; i < l; ++i) {
-                if (args[i] && typeof args[i][prop] === "function") {
-                    args[i][prop].apply(thisValue, slice.call(arguments, 2));
-                    return;
-                }
-            }
-            throwYieldError(this.proxy, " cannot yield to '" + prop +
-                "' since no callback was passed.", args);
-        },
-
-        toString: function () {
-            var callStr = this.proxy.toString() + "(";
-            var args = [];
-
-            for (var i = 0, l = this.args.length; i < l; ++i) {
-                args.push(sinon.format(this.args[i]));
-            }
-
-            callStr = callStr + args.join(", ") + ")";
-
-            if (typeof this.returnValue != "undefined") {
-                callStr += " => " + sinon.format(this.returnValue);
-            }
-
-            if (this.exception) {
-                callStr += " !" + this.exception.name;
-
-                if (this.exception.message) {
-                    callStr += "(" + this.exception.message + ")";
-                }
-            }
-
-            return callStr;
-        }
-    };
-
-    callProto.invokeCallback = callProto.yield;
-
-    function createSpyCall(spy, thisValue, args, returnValue, exception, id) {
-        if (typeof id !== "number") {
-            throw new TypeError("Call id is not a number");
-        }
-        var proxyCall = sinon.create(callProto);
-        proxyCall.proxy = spy;
-        proxyCall.thisValue = thisValue;
-        proxyCall.args = args;
-        proxyCall.returnValue = returnValue;
-        proxyCall.exception = exception;
-        proxyCall.callId = id;
-
-        return proxyCall;
-    }
-    createSpyCall.toString = callProto.toString; // used by mocks
-
-    if (commonJSModule) {
-        module.exports = createSpyCall;
-    } else {
-        sinon.spyCall = createSpyCall;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-
-/**
-  * @depend ../sinon.js
-  * @depend call.js
-  */
-/*jslint eqeqeq: false, onevar: false, plusplus: false*/
-/*global module, require, sinon*/
-/**
-  * Spy functions
-  *
-  * @author Christian Johansen (christian@cjohansen.no)
-  * @license BSD
-  *
-  * Copyright (c) 2010-2013 Christian Johansen
-  */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-    var push = Array.prototype.push;
-    var slice = Array.prototype.slice;
-    var callId = 0;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function spy(object, property) {
-        if (!property && typeof object == "function") {
-            return spy.create(object);
-        }
-
-        if (!object && !property) {
-            return spy.create(function () { });
-        }
-
-        var method = object[property];
-        return sinon.wrapMethod(object, property, spy.create(method));
-    }
-
-    function matchingFake(fakes, args, strict) {
-        if (!fakes) {
-            return;
-        }
-
-        for (var i = 0, l = fakes.length; i < l; i++) {
-            if (fakes[i].matches(args, strict)) {
-                return fakes[i];
-            }
-        }
-    }
-
-    function incrementCallCount() {
-        this.called = true;
-        this.callCount += 1;
-        this.notCalled = false;
-        this.calledOnce = this.callCount == 1;
-        this.calledTwice = this.callCount == 2;
-        this.calledThrice = this.callCount == 3;
-    }
-
-    function createCallProperties() {
-        this.firstCall = this.getCall(0);
-        this.secondCall = this.getCall(1);
-        this.thirdCall = this.getCall(2);
-        this.lastCall = this.getCall(this.callCount - 1);
-    }
-
-    var vars = "a,b,c,d,e,f,g,h,i,j,k,l";
-    function createProxy(func) {
-        // Retain the function length:
-        var p;
-        if (func.length) {
-            eval("p = (function proxy(" + vars.substring(0, func.length * 2 - 1) +
-                ") { return p.invoke(func, this, slice.call(arguments)); });");
-        }
-        else {
-            p = function proxy() {
-                return p.invoke(func, this, slice.call(arguments));
-            };
-        }
-        return p;
-    }
-
-    var uuid = 0;
-
-    // Public API
-    var spyApi = {
-        reset: function () {
-            this.called = false;
-            this.notCalled = true;
-            this.calledOnce = false;
-            this.calledTwice = false;
-            this.calledThrice = false;
-            this.callCount = 0;
-            this.firstCall = null;
-            this.secondCall = null;
-            this.thirdCall = null;
-            this.lastCall = null;
-            this.args = [];
-            this.returnValues = [];
-            this.thisValues = [];
-            this.exceptions = [];
-            this.callIds = [];
-            if (this.fakes) {
-                for (var i = 0; i < this.fakes.length; i++) {
-                    this.fakes[i].reset();
-                }
-            }
-        },
-
-        create: function create(func) {
-            var name;
-
-            if (typeof func != "function") {
-                func = function () { };
-            } else {
-                name = sinon.functionName(func);
-            }
-
-            var proxy = createProxy(func);
-
-            sinon.extend(proxy, spy);
-            delete proxy.create;
-            sinon.extend(proxy, func);
-
-            proxy.reset();
-            proxy.prototype = func.prototype;
-            proxy.displayName = name || "spy";
-            proxy.toString = sinon.functionToString;
-            proxy._create = sinon.spy.create;
-            proxy.id = "spy#" + uuid++;
-
-            return proxy;
-        },
-
-        invoke: function invoke(func, thisValue, args) {
-            var matching = matchingFake(this.fakes, args);
-            var exception, returnValue;
-
-            incrementCallCount.call(this);
-            push.call(this.thisValues, thisValue);
-            push.call(this.args, args);
-            push.call(this.callIds, callId++);
-
-            try {
-                if (matching) {
-                    returnValue = matching.invoke(func, thisValue, args);
-                } else {
-                    returnValue = (this.func || func).apply(thisValue, args);
-                }
-
-                var thisCall = this.getCall(this.callCount - 1);
-                if (thisCall.calledWithNew() && typeof returnValue !== 'object') {
-                    returnValue = thisValue;
-                }
-            } catch (e) {
-                exception = e;
-            }
-
-            push.call(this.exceptions, exception);
-            push.call(this.returnValues, returnValue);
-
-            createCallProperties.call(this);
-
-            if (exception !== undefined) {
-                throw exception;
-            }
-
-            return returnValue;
-        },
-
-        getCall: function getCall(i) {
-            if (i < 0 || i >= this.callCount) {
-                return null;
-            }
-
-            return sinon.spyCall(this, this.thisValues[i], this.args[i],
-                                    this.returnValues[i], this.exceptions[i],
-                                    this.callIds[i]);
-        },
-
-        getCalls: function () {
-            var calls = [];
-            var i;
-
-            for (i = 0; i < this.callCount; i++) {
-                calls.push(this.getCall(i));
-            }
-
-            return calls;
-        },
-
-        calledBefore: function calledBefore(spyFn) {
-            if (!this.called) {
-                return false;
-            }
-
-            if (!spyFn.called) {
-                return true;
-            }
-
-            return this.callIds[0] < spyFn.callIds[spyFn.callIds.length - 1];
-        },
-
-        calledAfter: function calledAfter(spyFn) {
-            if (!this.called || !spyFn.called) {
-                return false;
-            }
-
-            return this.callIds[this.callCount - 1] > spyFn.callIds[spyFn.callCount - 1];
-        },
-
-        withArgs: function () {
-            var args = slice.call(arguments);
-
-            if (this.fakes) {
-                var match = matchingFake(this.fakes, args, true);
-
-                if (match) {
-                    return match;
-                }
-            } else {
-                this.fakes = [];
-            }
-
-            var original = this;
-            var fake = this._create();
-            fake.matchingAguments = args;
-            fake.parent = this;
-            push.call(this.fakes, fake);
-
-            fake.withArgs = function () {
-                return original.withArgs.apply(original, arguments);
-            };
-
-            for (var i = 0; i < this.args.length; i++) {
-                if (fake.matches(this.args[i])) {
-                    incrementCallCount.call(fake);
-                    push.call(fake.thisValues, this.thisValues[i]);
-                    push.call(fake.args, this.args[i]);
-                    push.call(fake.returnValues, this.returnValues[i]);
-                    push.call(fake.exceptions, this.exceptions[i]);
-                    push.call(fake.callIds, this.callIds[i]);
-                }
-            }
-            createCallProperties.call(fake);
-
-            return fake;
-        },
-
-        matches: function (args, strict) {
-            var margs = this.matchingAguments;
-
-            if (margs.length <= args.length &&
-                sinon.deepEqual(margs, args.slice(0, margs.length))) {
-                return !strict || margs.length == args.length;
-            }
-        },
-
-        printf: function (format) {
-            var spy = this;
-            var args = slice.call(arguments, 1);
-            var formatter;
-
-            return (format || "").replace(/%(.)/g, function (match, specifyer) {
-                formatter = spyApi.formatters[specifyer];
-
-                if (typeof formatter == "function") {
-                    return formatter.call(null, spy, args);
-                } else if (!isNaN(parseInt(specifyer, 10))) {
-                    return sinon.format(args[specifyer - 1]);
-                }
-
-                return "%" + specifyer;
-            });
-        }
-    };
-
-    function delegateToCalls(method, matchAny, actual, notCalled) {
-        spyApi[method] = function () {
-            if (!this.called) {
-                if (notCalled) {
-                    return notCalled.apply(this, arguments);
-                }
-                return false;
-            }
-
-            var currentCall;
-            var matches = 0;
-
-            for (var i = 0, l = this.callCount; i < l; i += 1) {
-                currentCall = this.getCall(i);
-
-                if (currentCall[actual || method].apply(currentCall, arguments)) {
-                    matches += 1;
-
-                    if (matchAny) {
-                        return true;
-                    }
-                }
-            }
-
-            return matches === this.callCount;
-        };
-    }
-
-    delegateToCalls("calledOn", true);
-    delegateToCalls("alwaysCalledOn", false, "calledOn");
-    delegateToCalls("calledWith", true);
-    delegateToCalls("calledWithMatch", true);
-    delegateToCalls("alwaysCalledWith", false, "calledWith");
-    delegateToCalls("alwaysCalledWithMatch", false, "calledWithMatch");
-    delegateToCalls("calledWithExactly", true);
-    delegateToCalls("alwaysCalledWithExactly", false, "calledWithExactly");
-    delegateToCalls("neverCalledWith", false, "notCalledWith",
-        function () { return true; });
-    delegateToCalls("neverCalledWithMatch", false, "notCalledWithMatch",
-        function () { return true; });
-    delegateToCalls("threw", true);
-    delegateToCalls("alwaysThrew", false, "threw");
-    delegateToCalls("returned", true);
-    delegateToCalls("alwaysReturned", false, "returned");
-    delegateToCalls("calledWithNew", true);
-    delegateToCalls("alwaysCalledWithNew", false, "calledWithNew");
-    delegateToCalls("callArg", false, "callArgWith", function () {
-        throw new Error(this.toString() + " cannot call arg since it was not yet invoked.");
-    });
-    spyApi.callArgWith = spyApi.callArg;
-    delegateToCalls("callArgOn", false, "callArgOnWith", function () {
-        throw new Error(this.toString() + " cannot call arg since it was not yet invoked.");
-    });
-    spyApi.callArgOnWith = spyApi.callArgOn;
-    delegateToCalls("yield", false, "yield", function () {
-        throw new Error(this.toString() + " cannot yield since it was not yet invoked.");
-    });
-    // "invokeCallback" is an alias for "yield" since "yield" is invalid in strict mode.
-    spyApi.invokeCallback = spyApi.yield;
-    delegateToCalls("yieldOn", false, "yieldOn", function () {
-        throw new Error(this.toString() + " cannot yield since it was not yet invoked.");
-    });
-    delegateToCalls("yieldTo", false, "yieldTo", function (property) {
-        throw new Error(this.toString() + " cannot yield to '" + property +
-            "' since it was not yet invoked.");
-    });
-    delegateToCalls("yieldToOn", false, "yieldToOn", function (property) {
-        throw new Error(this.toString() + " cannot yield to '" + property +
-            "' since it was not yet invoked.");
-    });
-
-    spyApi.formatters = {
-        "c": function (spy) {
-            return sinon.timesInWords(spy.callCount);
-        },
-
-        "n": function (spy) {
-            return spy.toString();
-        },
-
-        "C": function (spy) {
-            var calls = [];
-
-            for (var i = 0, l = spy.callCount; i < l; ++i) {
-                var stringifiedCall = "    " + spy.getCall(i).toString();
-                if (/\n/.test(calls[i - 1])) {
-                    stringifiedCall = "\n" + stringifiedCall;
-                }
-                push.call(calls, stringifiedCall);
-            }
-
-            return calls.length > 0 ? "\n" + calls.join("\n") : "";
-        },
-
-        "t": function (spy) {
-            var objects = [];
-
-            for (var i = 0, l = spy.callCount; i < l; ++i) {
-                push.call(objects, sinon.format(spy.thisValues[i]));
-            }
-
-            return objects.join(", ");
-        },
-
-        "*": function (spy, args) {
-            var formatted = [];
-
-            for (var i = 0, l = args.length; i < l; ++i) {
-                push.call(formatted, sinon.format(args[i]));
-            }
-
-            return formatted.join(", ");
-        }
-    };
-
-    sinon.extend(spy, spyApi);
-
-    spy.spyCall = sinon.spyCall;
-
-    if (commonJSModule) {
-        module.exports = spy;
-    } else {
-        sinon.spy = spy;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/**
- * @depend ../sinon.js
- */
-/*jslint eqeqeq: false, onevar: false*/
-/*global module, require, sinon, process, setImmediate, setTimeout*/
-/**
- * Stub behavior
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @author Tim Fischbach (mail@timfischbach.de)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    var slice = Array.prototype.slice;
-    var join = Array.prototype.join;
-    var proto;
-
-    var nextTick = (function () {
-        if (typeof process === "object" && typeof process.nextTick === "function") {
-            return process.nextTick;
-        } else if (typeof setImmediate === "function") {
-            return setImmediate;
-        } else {
-            return function (callback) {
-                setTimeout(callback, 0);
-            };
-        }
-    })();
-
-    function throwsException(error, message) {
-        if (typeof error == "string") {
-            this.exception = new Error(message || "");
-            this.exception.name = error;
-        } else if (!error) {
-            this.exception = new Error("Error");
-        } else {
-            this.exception = error;
-        }
-
-        return this;
-    }
-
-    function getCallback(behavior, args) {
-        var callArgAt = behavior.callArgAt;
-
-        if (callArgAt < 0) {
-            var callArgProp = behavior.callArgProp;
-
-            for (var i = 0, l = args.length; i < l; ++i) {
-                if (!callArgProp && typeof args[i] == "function") {
-                    return args[i];
-                }
-
-                if (callArgProp && args[i] &&
-                    typeof args[i][callArgProp] == "function") {
-                    return args[i][callArgProp];
-                }
-            }
-
-            return null;
-        }
-
-        return args[callArgAt];
-    }
-
-    function getCallbackError(behavior, func, args) {
-        if (behavior.callArgAt < 0) {
-            var msg;
-
-            if (behavior.callArgProp) {
-                msg = sinon.functionName(behavior.stub) +
-                    " expected to yield to '" + behavior.callArgProp +
-                    "', but no object with such a property was passed.";
-            } else {
-                msg = sinon.functionName(behavior.stub) +
-                    " expected to yield, but no callback was passed.";
-            }
-
-            if (args.length > 0) {
-                msg += " Received [" + join.call(args, ", ") + "]";
-            }
-
-            return msg;
-        }
-
-        return "argument at index " + behavior.callArgAt + " is not a function: " + func;
-    }
-
-    function callCallback(behavior, args) {
-        if (typeof behavior.callArgAt == "number") {
-            var func = getCallback(behavior, args);
-
-            if (typeof func != "function") {
-                throw new TypeError(getCallbackError(behavior, func, args));
-            }
-
-            if (behavior.callbackAsync) {
-                nextTick(function() {
-                    func.apply(behavior.callbackContext, behavior.callbackArguments);
-                });
-            } else {
-                func.apply(behavior.callbackContext, behavior.callbackArguments);
-            }
-        }
-    }
-
-    proto = {
-        create: function(stub) {
-            var behavior = sinon.extend({}, sinon.behavior);
-            delete behavior.create;
-            behavior.stub = stub;
-
-            return behavior;
-        },
-
-        isPresent: function() {
-            return (typeof this.callArgAt == 'number' ||
-                    this.exception ||
-                    typeof this.returnArgAt == 'number' ||
-                    this.returnThis ||
-                    this.returnValueDefined);
-        },
-
-        invoke: function(context, args) {
-            callCallback(this, args);
-
-            if (this.exception) {
-                throw this.exception;
-            } else if (typeof this.returnArgAt == 'number') {
-                return args[this.returnArgAt];
-            } else if (this.returnThis) {
-                return context;
-            }
-
-            return this.returnValue;
-        },
-
-        onCall: function(index) {
-            return this.stub.onCall(index);
-        },
-
-        onFirstCall: function() {
-            return this.stub.onFirstCall();
-        },
-
-        onSecondCall: function() {
-            return this.stub.onSecondCall();
-        },
-
-        onThirdCall: function() {
-            return this.stub.onThirdCall();
-        },
-
-        withArgs: function(/* arguments */) {
-            throw new Error('Defining a stub by invoking "stub.onCall(...).withArgs(...)" is not supported. ' +
-                            'Use "stub.withArgs(...).onCall(...)" to define sequential behavior for calls with certain arguments.');
-        },
-
-        callsArg: function callsArg(pos) {
-            if (typeof pos != "number") {
-                throw new TypeError("argument index is not number");
-            }
-
-            this.callArgAt = pos;
-            this.callbackArguments = [];
-            this.callbackContext = undefined;
-            this.callArgProp = undefined;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        callsArgOn: function callsArgOn(pos, context) {
-            if (typeof pos != "number") {
-                throw new TypeError("argument index is not number");
-            }
-            if (typeof context != "object") {
-                throw new TypeError("argument context is not an object");
-            }
-
-            this.callArgAt = pos;
-            this.callbackArguments = [];
-            this.callbackContext = context;
-            this.callArgProp = undefined;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        callsArgWith: function callsArgWith(pos) {
-            if (typeof pos != "number") {
-                throw new TypeError("argument index is not number");
-            }
-
-            this.callArgAt = pos;
-            this.callbackArguments = slice.call(arguments, 1);
-            this.callbackContext = undefined;
-            this.callArgProp = undefined;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        callsArgOnWith: function callsArgWith(pos, context) {
-            if (typeof pos != "number") {
-                throw new TypeError("argument index is not number");
-            }
-            if (typeof context != "object") {
-                throw new TypeError("argument context is not an object");
-            }
-
-            this.callArgAt = pos;
-            this.callbackArguments = slice.call(arguments, 2);
-            this.callbackContext = context;
-            this.callArgProp = undefined;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        yields: function () {
-            this.callArgAt = -1;
-            this.callbackArguments = slice.call(arguments, 0);
-            this.callbackContext = undefined;
-            this.callArgProp = undefined;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        yieldsOn: function (context) {
-            if (typeof context != "object") {
-                throw new TypeError("argument context is not an object");
-            }
-
-            this.callArgAt = -1;
-            this.callbackArguments = slice.call(arguments, 1);
-            this.callbackContext = context;
-            this.callArgProp = undefined;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        yieldsTo: function (prop) {
-            this.callArgAt = -1;
-            this.callbackArguments = slice.call(arguments, 1);
-            this.callbackContext = undefined;
-            this.callArgProp = prop;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        yieldsToOn: function (prop, context) {
-            if (typeof context != "object") {
-                throw new TypeError("argument context is not an object");
-            }
-
-            this.callArgAt = -1;
-            this.callbackArguments = slice.call(arguments, 2);
-            this.callbackContext = context;
-            this.callArgProp = prop;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-
-        "throws": throwsException,
-        throwsException: throwsException,
-
-        returns: function returns(value) {
-            this.returnValue = value;
-            this.returnValueDefined = true;
-
-            return this;
-        },
-
-        returnsArg: function returnsArg(pos) {
-            if (typeof pos != "number") {
-                throw new TypeError("argument index is not number");
-            }
-
-            this.returnArgAt = pos;
-
-            return this;
-        },
-
-        returnsThis: function returnsThis() {
-            this.returnThis = true;
-
-            return this;
-        }
-    };
-
-    // create asynchronous versions of callsArg* and yields* methods
-    for (var method in proto) {
-        // need to avoid creating anotherasync versions of the newly added async methods
-        if (proto.hasOwnProperty(method) &&
-            method.match(/^(callsArg|yields)/) &&
-            !method.match(/Async/)) {
-            proto[method + 'Async'] = (function (syncFnName) {
-                return function () {
-                    var result = this[syncFnName].apply(this, arguments);
-                    this.callbackAsync = true;
-                    return result;
-                };
-            })(method);
-        }
-    }
-
-    if (commonJSModule) {
-        module.exports = proto;
-    } else {
-        sinon.behavior = proto;
-    }
-}(typeof sinon == "object" && sinon || null));
-/**
- * @depend ../sinon.js
- * @depend spy.js
- * @depend behavior.js
- */
-/*jslint eqeqeq: false, onevar: false*/
-/*global module, require, sinon*/
-/**
- * Stub functions
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function stub(object, property, func) {
-        if (!!func && typeof func != "function") {
-            throw new TypeError("Custom stub should be function");
-        }
-
-        var wrapper;
-
-        if (func) {
-            wrapper = sinon.spy && sinon.spy.create ? sinon.spy.create(func) : func;
-        } else {
-            wrapper = stub.create();
-        }
-
-        if (!object && typeof property === "undefined") {
-            return sinon.stub.create();
-        }
-
-        if (typeof property === "undefined" && typeof object == "object") {
-            for (var prop in object) {
-                if (typeof object[prop] === "function") {
-                    stub(object, prop);
-                }
-            }
-
-            return object;
-        }
-
-        return sinon.wrapMethod(object, property, wrapper);
-    }
-
-    function getDefaultBehavior(stub) {
-        return stub.defaultBehavior || getParentBehaviour(stub) || sinon.behavior.create(stub);
-    }
-
-    function getParentBehaviour(stub) {
-        return (stub.parent && getCurrentBehavior(stub.parent));
-    }
-
-    function getCurrentBehavior(stub) {
-        var behavior = stub.behaviors[stub.callCount - 1];
-        return behavior && behavior.isPresent() ? behavior : getDefaultBehavior(stub);
-    }
-
-    var uuid = 0;
-
-    sinon.extend(stub, (function () {
-        var proto = {
-            create: function create() {
-                var functionStub = function () {
-                    return getCurrentBehavior(functionStub).invoke(this, arguments);
-                };
-
-                functionStub.id = "stub#" + uuid++;
-                var orig = functionStub;
-                functionStub = sinon.spy.create(functionStub);
-                functionStub.func = orig;
-
-                sinon.extend(functionStub, stub);
-                functionStub._create = sinon.stub.create;
-                functionStub.displayName = "stub";
-                functionStub.toString = sinon.functionToString;
-
-                functionStub.defaultBehavior = null;
-                functionStub.behaviors = [];
-
-                return functionStub;
-            },
-
-            resetBehavior: function () {
-                var i;
-
-                this.defaultBehavior = null;
-                this.behaviors = [];
-
-                delete this.returnValue;
-                delete this.returnArgAt;
-                this.returnThis = false;
-
-                if (this.fakes) {
-                    for (i = 0; i < this.fakes.length; i++) {
-                        this.fakes[i].resetBehavior();
-                    }
-                }
-            },
-
-            onCall: function(index) {
-                if (!this.behaviors[index]) {
-                    this.behaviors[index] = sinon.behavior.create(this);
-                }
-
-                return this.behaviors[index];
-            },
-
-            onFirstCall: function() {
-                return this.onCall(0);
-            },
-
-            onSecondCall: function() {
-                return this.onCall(1);
-            },
-
-            onThirdCall: function() {
-                return this.onCall(2);
-            }
-        };
-
-        for (var method in sinon.behavior) {
-            if (sinon.behavior.hasOwnProperty(method) &&
-                !proto.hasOwnProperty(method) &&
-                method != 'create' &&
-                method != 'withArgs' &&
-                method != 'invoke') {
-                proto[method] = (function(behaviorMethod) {
-                    return function() {
-                        this.defaultBehavior = this.defaultBehavior || sinon.behavior.create(this);
-                        this.defaultBehavior[behaviorMethod].apply(this.defaultBehavior, arguments);
-                        return this;
-                    };
-                }(method));
-            }
-        }
-
-        return proto;
-    }()));
-
-    if (commonJSModule) {
-        module.exports = stub;
-    } else {
-        sinon.stub = stub;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/**
- * @depend ../sinon.js
- * @depend stub.js
- */
-/*jslint eqeqeq: false, onevar: false, nomen: false*/
-/*global module, require, sinon*/
-/**
- * Mock functions.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-    var push = [].push;
-    var match;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    match = sinon.match;
-
-    if (!match && commonJSModule) {
-        match = require("./match");
-    }
-
-    function mock(object) {
-        if (!object) {
-            return sinon.expectation.create("Anonymous mock");
-        }
-
-        return mock.create(object);
-    }
-
-    sinon.mock = mock;
-
-    sinon.extend(mock, (function () {
-        function each(collection, callback) {
-            if (!collection) {
-                return;
-            }
-
-            for (var i = 0, l = collection.length; i < l; i += 1) {
-                callback(collection[i]);
-            }
-        }
-
-        return {
-            create: function create(object) {
-                if (!object) {
-                    throw new TypeError("object is null");
-                }
-
-                var mockObject = sinon.extend({}, mock);
-                mockObject.object = object;
-                delete mockObject.create;
-
-                return mockObject;
-            },
-
-            expects: function expects(method) {
-                if (!method) {
-                    throw new TypeError("method is falsy");
-                }
-
-                if (!this.expectations) {
-                    this.expectations = {};
-                    this.proxies = [];
-                }
-
-                if (!this.expectations[method]) {
-                    this.expectations[method] = [];
-                    var mockObject = this;
-
-                    sinon.wrapMethod(this.object, method, function () {
-                        return mockObject.invokeMethod(method, this, arguments);
-                    });
-
-                    push.call(this.proxies, method);
-                }
-
-                var expectation = sinon.expectation.create(method);
-                push.call(this.expectations[method], expectation);
-
-                return expectation;
-            },
-
-            restore: function restore() {
-                var object = this.object;
-
-                each(this.proxies, function (proxy) {
-                    if (typeof object[proxy].restore == "function") {
-                        object[proxy].restore();
-                    }
-                });
-            },
-
-            verify: function verify() {
-                var expectations = this.expectations || {};
-                var messages = [], met = [];
-
-                each(this.proxies, function (proxy) {
-                    each(expectations[proxy], function (expectation) {
-                        if (!expectation.met()) {
-                            push.call(messages, expectation.toString());
-                        } else {
-                            push.call(met, expectation.toString());
-                        }
-                    });
-                });
-
-                this.restore();
-
-                if (messages.length > 0) {
-                    sinon.expectation.fail(messages.concat(met).join("\n"));
-                } else {
-                    sinon.expectation.pass(messages.concat(met).join("\n"));
-                }
-
-                return true;
-            },
-
-            invokeMethod: function invokeMethod(method, thisValue, args) {
-                var expectations = this.expectations && this.expectations[method];
-                var length = expectations && expectations.length || 0, i;
-
-                for (i = 0; i < length; i += 1) {
-                    if (!expectations[i].met() &&
-                        expectations[i].allowsCall(thisValue, args)) {
-                        return expectations[i].apply(thisValue, args);
-                    }
-                }
-
-                var messages = [], available, exhausted = 0;
-
-                for (i = 0; i < length; i += 1) {
-                    if (expectations[i].allowsCall(thisValue, args)) {
-                        available = available || expectations[i];
-                    } else {
-                        exhausted += 1;
-                    }
-                    push.call(messages, "    " + expectations[i].toString());
-                }
-
-                if (exhausted === 0) {
-                    return available.apply(thisValue, args);
-                }
-
-                messages.unshift("Unexpected call: " + sinon.spyCall.toString.call({
-                    proxy: method,
-                    args: args
-                }));
-
-                sinon.expectation.fail(messages.join("\n"));
-            }
-        };
-    }()));
-
-    var times = sinon.timesInWords;
-
-    sinon.expectation = (function () {
-        var slice = Array.prototype.slice;
-        var _invoke = sinon.spy.invoke;
-
-        function callCountInWords(callCount) {
-            if (callCount == 0) {
-                return "never called";
-            } else {
-                return "called " + times(callCount);
-            }
-        }
-
-        function expectedCallCountInWords(expectation) {
-            var min = expectation.minCalls;
-            var max = expectation.maxCalls;
-
-            if (typeof min == "number" && typeof max == "number") {
-                var str = times(min);
-
-                if (min != max) {
-                    str = "at least " + str + " and at most " + times(max);
-                }
-
-                return str;
-            }
-
-            if (typeof min == "number") {
-                return "at least " + times(min);
-            }
-
-            return "at most " + times(max);
-        }
-
-        function receivedMinCalls(expectation) {
-            var hasMinLimit = typeof expectation.minCalls == "number";
-            return !hasMinLimit || expectation.callCount >= expectation.minCalls;
-        }
-
-        function receivedMaxCalls(expectation) {
-            if (typeof expectation.maxCalls != "number") {
-                return false;
-            }
-
-            return expectation.callCount == expectation.maxCalls;
-        }
-
-        function verifyMatcher(possibleMatcher, arg){
-            if (match && match.isMatcher(possibleMatcher)) {
-                return possibleMatcher.test(arg);
-            } else {
-                return true;
-            }
-        }
-
-        return {
-            minCalls: 1,
-            maxCalls: 1,
-
-            create: function create(methodName) {
-                var expectation = sinon.extend(sinon.stub.create(), sinon.expectation);
-                delete expectation.create;
-                expectation.method = methodName;
-
-                return expectation;
-            },
-
-            invoke: function invoke(func, thisValue, args) {
-                this.verifyCallAllowed(thisValue, args);
-
-                return _invoke.apply(this, arguments);
-            },
-
-            atLeast: function atLeast(num) {
-                if (typeof num != "number") {
-                    throw new TypeError("'" + num + "' is not number");
-                }
-
-                if (!this.limitsSet) {
-                    this.maxCalls = null;
-                    this.limitsSet = true;
-                }
-
-                this.minCalls = num;
-
-                return this;
-            },
-
-            atMost: function atMost(num) {
-                if (typeof num != "number") {
-                    throw new TypeError("'" + num + "' is not number");
-                }
-
-                if (!this.limitsSet) {
-                    this.minCalls = null;
-                    this.limitsSet = true;
-                }
-
-                this.maxCalls = num;
-
-                return this;
-            },
-
-            never: function never() {
-                return this.exactly(0);
-            },
-
-            once: function once() {
-                return this.exactly(1);
-            },
-
-            twice: function twice() {
-                return this.exactly(2);
-            },
-
-            thrice: function thrice() {
-                return this.exactly(3);
-            },
-
-            exactly: function exactly(num) {
-                if (typeof num != "number") {
-                    throw new TypeError("'" + num + "' is not a number");
-                }
-
-                this.atLeast(num);
-                return this.atMost(num);
-            },
-
-            met: function met() {
-                return !this.failed && receivedMinCalls(this);
-            },
-
-            verifyCallAllowed: function verifyCallAllowed(thisValue, args) {
-                if (receivedMaxCalls(this)) {
-                    this.failed = true;
-                    sinon.expectation.fail(this.method + " already called " + times(this.maxCalls));
-                }
-
-                if ("expectedThis" in this && this.expectedThis !== thisValue) {
-                    sinon.expectation.fail(this.method + " called with " + thisValue + " as thisValue, expected " +
-                        this.expectedThis);
-                }
-
-                if (!("expectedArguments" in this)) {
-                    return;
-                }
-
-                if (!args) {
-                    sinon.expectation.fail(this.method + " received no arguments, expected " +
-                        sinon.format(this.expectedArguments));
-                }
-
-                if (args.length < this.expectedArguments.length) {
-                    sinon.expectation.fail(this.method + " received too few arguments (" + sinon.format(args) +
-                        "), expected " + sinon.format(this.expectedArguments));
-                }
-
-                if (this.expectsExactArgCount &&
-                    args.length != this.expectedArguments.length) {
-                    sinon.expectation.fail(this.method + " received too many arguments (" + sinon.format(args) +
-                        "), expected " + sinon.format(this.expectedArguments));
-                }
-
-                for (var i = 0, l = this.expectedArguments.length; i < l; i += 1) {
-
-                    if (!verifyMatcher(this.expectedArguments[i],args[i])) {
-                        sinon.expectation.fail(this.method + " received wrong arguments " + sinon.format(args) +
-                            ", didn't match " + this.expectedArguments.toString());
-                    }
-
-                    if (!sinon.deepEqual(this.expectedArguments[i], args[i])) {
-                        sinon.expectation.fail(this.method + " received wrong arguments " + sinon.format(args) +
-                            ", expected " + sinon.format(this.expectedArguments));
-                    }
-                }
-            },
-
-            allowsCall: function allowsCall(thisValue, args) {
-                if (this.met() && receivedMaxCalls(this)) {
-                    return false;
-                }
-
-                if ("expectedThis" in this && this.expectedThis !== thisValue) {
-                    return false;
-                }
-
-                if (!("expectedArguments" in this)) {
-                    return true;
-                }
-
-                args = args || [];
-
-                if (args.length < this.expectedArguments.length) {
-                    return false;
-                }
-
-                if (this.expectsExactArgCount &&
-                    args.length != this.expectedArguments.length) {
-                    return false;
-                }
-
-                for (var i = 0, l = this.expectedArguments.length; i < l; i += 1) {
-                    if (!verifyMatcher(this.expectedArguments[i],args[i])) {
-                        return false;
-                    }
-
-                    if (!sinon.deepEqual(this.expectedArguments[i], args[i])) {
-                        return false;
-                    }
-                }
-
-                return true;
-            },
-
-            withArgs: function withArgs() {
-                this.expectedArguments = slice.call(arguments);
-                return this;
-            },
-
-            withExactArgs: function withExactArgs() {
-                this.withArgs.apply(this, arguments);
-                this.expectsExactArgCount = true;
-                return this;
-            },
-
-            on: function on(thisValue) {
-                this.expectedThis = thisValue;
-                return this;
-            },
-
-            toString: function () {
-                var args = (this.expectedArguments || []).slice();
-
-                if (!this.expectsExactArgCount) {
-                    push.call(args, "[...]");
-                }
-
-                var callStr = sinon.spyCall.toString.call({
-                    proxy: this.method || "anonymous mock expectation",
-                    args: args
-                });
-
-                var message = callStr.replace(", [...", "[, ...") + " " +
-                    expectedCallCountInWords(this);
-
-                if (this.met()) {
-                    return "Expectation met: " + message;
-                }
-
-                return "Expected " + message + " (" +
-                    callCountInWords(this.callCount) + ")";
-            },
-
-            verify: function verify() {
-                if (!this.met()) {
-                    sinon.expectation.fail(this.toString());
-                } else {
-                    sinon.expectation.pass(this.toString());
-                }
-
-                return true;
-            },
-
-            pass: function(message) {
-              sinon.assert.pass(message);
-            },
-            fail: function (message) {
-                var exception = new Error(message);
-                exception.name = "ExpectationError";
-
-                throw exception;
-            }
-        };
-    }());
-
-    if (commonJSModule) {
-        module.exports = mock;
-    } else {
-        sinon.mock = mock;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/**
- * @depend ../sinon.js
- * @depend stub.js
- * @depend mock.js
- */
-/*jslint eqeqeq: false, onevar: false, forin: true*/
-/*global module, require, sinon*/
-/**
- * Collections of stubs, spies and mocks.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-    var push = [].push;
-    var hasOwnProperty = Object.prototype.hasOwnProperty;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function getFakes(fakeCollection) {
-        if (!fakeCollection.fakes) {
-            fakeCollection.fakes = [];
-        }
-
-        return fakeCollection.fakes;
-    }
-
-    function each(fakeCollection, method) {
-        var fakes = getFakes(fakeCollection);
-
-        for (var i = 0, l = fakes.length; i < l; i += 1) {
-            if (typeof fakes[i][method] == "function") {
-                fakes[i][method]();
-            }
-        }
-    }
-
-    function compact(fakeCollection) {
-        var fakes = getFakes(fakeCollection);
-        var i = 0;
-        while (i < fakes.length) {
-          fakes.splice(i, 1);
-        }
-    }
-
-    var collection = {
-        verify: function resolve() {
-            each(this, "verify");
-        },
-
-        restore: function restore() {
-            each(this, "restore");
-            compact(this);
-        },
-
-        verifyAndRestore: function verifyAndRestore() {
-            var exception;
-
-            try {
-                this.verify();
-            } catch (e) {
-                exception = e;
-            }
-
-            this.restore();
-
-            if (exception) {
-                throw exception;
-            }
-        },
-
-        add: function add(fake) {
-            push.call(getFakes(this), fake);
-            return fake;
-        },
-
-        spy: function spy() {
-            return this.add(sinon.spy.apply(sinon, arguments));
-        },
-
-        stub: function stub(object, property, value) {
-            if (property) {
-                var original = object[property];
-
-                if (typeof original != "function") {
-                    if (!hasOwnProperty.call(object, property)) {
-                        throw new TypeError("Cannot stub non-existent own property " + property);
-                    }
-
-                    object[property] = value;
-
-                    return this.add({
-                        restore: function () {
-                            object[property] = original;
-                        }
-                    });
-                }
-            }
-            if (!property && !!object && typeof object == "object") {
-                var stubbedObj = sinon.stub.apply(sinon, arguments);
-
-                for (var prop in stubbedObj) {
-                    if (typeof stubbedObj[prop] === "function") {
-                        this.add(stubbedObj[prop]);
-                    }
-                }
-
-                return stubbedObj;
-            }
-
-            return this.add(sinon.stub.apply(sinon, arguments));
-        },
-
-        mock: function mock() {
-            return this.add(sinon.mock.apply(sinon, arguments));
-        },
-
-        inject: function inject(obj) {
-            var col = this;
-
-            obj.spy = function () {
-                return col.spy.apply(col, arguments);
-            };
-
-            obj.stub = function () {
-                return col.stub.apply(col, arguments);
-            };
-
-            obj.mock = function () {
-                return col.mock.apply(col, arguments);
-            };
-
-            return obj;
-        }
-    };
-
-    if (commonJSModule) {
-        module.exports = collection;
-    } else {
-        sinon.collection = collection;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/*jslint eqeqeq: false, plusplus: false, evil: true, onevar: false, browser: true, forin: false*/
-/*global module, require, window*/
-/**
- * Fake timer API
- * setTimeout
- * setInterval
- * clearTimeout
- * clearInterval
- * tick
- * reset
- * Date
- *
- * Inspired by jsUnitMockTimeOut from JsUnit
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-if (typeof sinon == "undefined") {
-    var sinon = {};
-}
-
-(function (global) {
-    var id = 1;
-
-    function addTimer(args, recurring) {
-        if (args.length === 0) {
-            throw new Error("Function requires at least 1 parameter");
-        }
-
-        if (typeof args[0] === "undefined") {
-            throw new Error("Callback must be provided to timer calls");
-        }
-
-        var toId = id++;
-        var delay = args[1] || 0;
-
-        if (!this.timeouts) {
-            this.timeouts = {};
-        }
-
-        this.timeouts[toId] = {
-            id: toId,
-            func: args[0],
-            callAt: this.now + delay,
-            invokeArgs: Array.prototype.slice.call(args, 2)
-        };
-
-        if (recurring === true) {
-            this.timeouts[toId].interval = delay;
-        }
-
-        return toId;
-    }
-
-    function parseTime(str) {
-        if (!str) {
-            return 0;
-        }
-
-        var strings = str.split(":");
-        var l = strings.length, i = l;
-        var ms = 0, parsed;
-
-        if (l > 3 || !/^(\d\d:){0,2}\d\d?$/.test(str)) {
-            throw new Error("tick only understands numbers and 'h:m:s'");
-        }
-
-        while (i--) {
-            parsed = parseInt(strings[i], 10);
-
-            if (parsed >= 60) {
-                throw new Error("Invalid time " + str);
-            }
-
-            ms += parsed * Math.pow(60, (l - i - 1));
-        }
-
-        return ms * 1000;
-    }
-
-    function createObject(object) {
-        var newObject;
-
-        if (Object.create) {
-            newObject = Object.create(object);
-        } else {
-            var F = function () {};
-            F.prototype = object;
-            newObject = new F();
-        }
-
-        newObject.Date.clock = newObject;
-        return newObject;
-    }
-
-    sinon.clock = {
-        now: 0,
-
-        create: function create(now) {
-            var clock = createObject(this);
-
-            if (typeof now == "number") {
-                clock.now = now;
-            }
-
-            if (!!now && typeof now == "object") {
-                throw new TypeError("now should be milliseconds since UNIX epoch");
-            }
-
-            return clock;
-        },
-
-        setTimeout: function setTimeout(callback, timeout) {
-            return addTimer.call(this, arguments, false);
-        },
-
-        clearTimeout: function clearTimeout(timerId) {
-            if (!this.timeouts) {
-                this.timeouts = [];
-            }
-
-            if (timerId in this.timeouts) {
-                delete this.timeouts[timerId];
-            }
-        },
-
-        setInterval: function setInterval(callback, timeout) {
-            return addTimer.call(this, arguments, true);
-        },
-
-        clearInterval: function clearInterval(timerId) {
-            this.clearTimeout(timerId);
-        },
-
-        setImmediate: function setImmediate(callback) {
-            var passThruArgs = Array.prototype.slice.call(arguments, 1);
-
-            return addTimer.call(this, [callback, 0].concat(passThruArgs), false);
-        },
-
-        clearImmediate: function clearImmediate(timerId) {
-            this.clearTimeout(timerId);
-        },
-
-        tick: function tick(ms) {
-            ms = typeof ms == "number" ? ms : parseTime(ms);
-            var tickFrom = this.now, tickTo = this.now + ms, previous = this.now;
-            var timer = this.firstTimerInRange(tickFrom, tickTo);
-
-            var firstException;
-            while (timer && tickFrom <= tickTo) {
-                if (this.timeouts[timer.id]) {
-                    tickFrom = this.now = timer.callAt;
-                    try {
-                      this.callTimer(timer);
-                    } catch (e) {
-                      firstException = firstException || e;
-                    }
-                }
-
-                timer = this.firstTimerInRange(previous, tickTo);
-                previous = tickFrom;
-            }
-
-            this.now = tickTo;
-
-            if (firstException) {
-              throw firstException;
-            }
-
-            return this.now;
-        },
-
-        firstTimerInRange: function (from, to) {
-            var timer, smallest = null, originalTimer;
-
-            for (var id in this.timeouts) {
-                if (this.timeouts.hasOwnProperty(id)) {
-                    if (this.timeouts[id].callAt < from || this.timeouts[id].callAt > to) {
-                        continue;
-                    }
-
-                    if (smallest === null || this.timeouts[id].callAt < smallest) {
-                        originalTimer = this.timeouts[id];
-                        smallest = this.timeouts[id].callAt;
-
-                        timer = {
-                            func: this.timeouts[id].func,
-                            callAt: this.timeouts[id].callAt,
-                            interval: this.timeouts[id].interval,
-                            id: this.timeouts[id].id,
-                            invokeArgs: this.timeouts[id].invokeArgs
-                        };
-                    }
-                }
-            }
-
-            return timer || null;
-        },
-
-        callTimer: function (timer) {
-            if (typeof timer.interval == "number") {
-                this.timeouts[timer.id].callAt += timer.interval;
-            } else {
-                delete this.timeouts[timer.id];
-            }
-
-            try {
-                if (typeof timer.func == "function") {
-                    timer.func.apply(null, timer.invokeArgs);
-                } else {
-                    eval(timer.func);
-                }
-            } catch (e) {
-              var exception = e;
-            }
-
-            if (!this.timeouts[timer.id]) {
-                if (exception) {
-                  throw exception;
-                }
-                return;
-            }
-
-            if (exception) {
-              throw exception;
-            }
-        },
-
-        reset: function reset() {
-            this.timeouts = {};
-        },
-
-        Date: (function () {
-            var NativeDate = Date;
-
-            function ClockDate(year, month, date, hour, minute, second, ms) {
-                // Defensive and verbose to avoid potential harm in passing
-                // explicit undefined when user does not pass argument
-                switch (arguments.length) {
-                case 0:
-                    return new NativeDate(ClockDate.clock.now);
-                case 1:
-                    return new NativeDate(year);
-                case 2:
-                    return new NativeDate(year, month);
-                case 3:
-                    return new NativeDate(year, month, date);
-                case 4:
-                    return new NativeDate(year, month, date, hour);
-                case 5:
-                    return new NativeDate(year, month, date, hour, minute);
-                case 6:
-                    return new NativeDate(year, month, date, hour, minute, second);
-                default:
-                    return new NativeDate(year, month, date, hour, minute, second, ms);
-                }
-            }
-
-            return mirrorDateProperties(ClockDate, NativeDate);
-        }())
-    };
-
-    function mirrorDateProperties(target, source) {
-        if (source.now) {
-            target.now = function now() {
-                return target.clock.now;
-            };
-        } else {
-            delete target.now;
-        }
-
-        if (source.toSource) {
-            target.toSource = function toSource() {
-                return source.toSource();
-            };
-        } else {
-            delete target.toSource;
-        }
-
-        target.toString = function toString() {
-            return source.toString();
-        };
-
-        target.prototype = source.prototype;
-        target.parse = source.parse;
-        target.UTC = source.UTC;
-        target.prototype.toUTCString = source.prototype.toUTCString;
-
-        for (var prop in source) {
-            if (source.hasOwnProperty(prop)) {
-                target[prop] = source[prop];
-            }
-        }
-
-        return target;
-    }
-
-    var methods = ["Date", "setTimeout", "setInterval",
-                   "clearTimeout", "clearInterval"];
-
-    if (typeof global.setImmediate !== "undefined") {
-        methods.push("setImmediate");
-    }
-
-    if (typeof global.clearImmediate !== "undefined") {
-        methods.push("clearImmediate");
-    }
-
-    function restore() {
-        var method;
-
-        for (var i = 0, l = this.methods.length; i < l; i++) {
-            method = this.methods[i];
-
-            if (global[method].hadOwnProperty) {
-                global[method] = this["_" + method];
-            } else {
-                try {
-                    delete global[method];
-                } catch (e) {}
-            }
-        }
-
-        // Prevent multiple executions which will completely remove these props
-        this.methods = [];
-    }
-
-    function stubGlobal(method, clock) {
-        clock[method].hadOwnProperty = Object.prototype.hasOwnProperty.call(global, method);
-        clock["_" + method] = global[method];
-
-        if (method == "Date") {
-            var date = mirrorDateProperties(clock[method], global[method]);
-            global[method] = date;
-        } else {
-            global[method] = function () {
-                return clock[method].apply(clock, arguments);
-            };
-
-            for (var prop in clock[method]) {
-                if (clock[method].hasOwnProperty(prop)) {
-                    global[method][prop] = clock[method][prop];
-                }
-            }
-        }
-
-        global[method].clock = clock;
-    }
-
-    sinon.useFakeTimers = function useFakeTimers(now) {
-        var clock = sinon.clock.create(now);
-        clock.restore = restore;
-        clock.methods = Array.prototype.slice.call(arguments,
-                                                   typeof now == "number" ? 1 : 0);
-
-        if (clock.methods.length === 0) {
-            clock.methods = methods;
-        }
-
-        for (var i = 0, l = clock.methods.length; i < l; i++) {
-            stubGlobal(clock.methods[i], clock);
-        }
-
-        return clock;
-    };
-}(typeof global != "undefined" && typeof global !== "function" ? global : this));
-
-sinon.timers = {
-    setTimeout: setTimeout,
-    clearTimeout: clearTimeout,
-    setImmediate: (typeof setImmediate !== "undefined" ? setImmediate : undefined),
-    clearImmediate: (typeof clearImmediate !== "undefined" ? clearImmediate: undefined),
-    setInterval: setInterval,
-    clearInterval: clearInterval,
-    Date: Date
-};
-
-if (typeof module !== 'undefined' && module.exports) {
-    module.exports = sinon;
-}
-
-/*jslint eqeqeq: false, onevar: false*/
-/*global sinon, module, require, ActiveXObject, XMLHttpRequest, DOMParser*/
-/**
- * Minimal Event interface implementation
- *
- * Original implementation by Sven Fuchs: https://gist.github.com/995028
- * Modifications and tests by Christian Johansen.
- *
- * @author Sven Fuchs (svenfuchs@artweb-design.de)
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2011 Sven Fuchs, Christian Johansen
- */
-
-if (typeof sinon == "undefined") {
-    this.sinon = {};
-}
-
-(function () {
-    var push = [].push;
-
-    sinon.Event = function Event(type, bubbles, cancelable, target) {
-        this.initEvent(type, bubbles, cancelable, target);
-    };
-
-    sinon.Event.prototype = {
-        initEvent: function(type, bubbles, cancelable, target) {
-            this.type = type;
-            this.bubbles = bubbles;
-            this.cancelable = cancelable;
-            this.target = target;
-        },
-
-        stopPropagation: function () {},
-
-        preventDefault: function () {
-            this.defaultPrevented = true;
-        }
-    };
-
-    sinon.EventTarget = {
-        addEventListener: function addEventListener(event, listener) {
-            this.eventListeners = this.eventListeners || {};
-            this.eventListeners[event] = this.eventListeners[event] || [];
-            push.call(this.eventListeners[event], listener);
-        },
-
-        removeEventListener: function removeEventListener(event, listener) {
-            var listeners = this.eventListeners && this.eventListeners[event] || [];
-
-            for (var i = 0, l = listeners.length; i < l; ++i) {
-                if (listeners[i] == listener) {
-                    return listeners.splice(i, 1);
-                }
-            }
-        },
-
-        dispatchEvent: function dispatchEvent(event) {
-            var type = event.type;
-            var listeners = this.eventListeners && this.eventListeners[type] || [];
-
-            for (var i = 0; i < listeners.length; i++) {
-                if (typeof listeners[i] == "function") {
-                    listeners[i].call(this, event);
-                } else {
-                    listeners[i].handleEvent(event);
-                }
-            }
-
-            return !!event.defaultPrevented;
-        }
-    };
-}());
-
-/**
- * @depend ../../sinon.js
- * @depend event.js
- */
-/*jslint eqeqeq: false, onevar: false*/
-/*global sinon, module, require, ActiveXObject, XMLHttpRequest, DOMParser*/
-/**
- * Fake XMLHttpRequest object
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-// wrapper for global
-(function(global) {
-    if (typeof sinon === "undefined") {
-        global.sinon = {};
-    }
-
-    var supportsProgress = typeof ProgressEvent !== "undefined";
-    var supportsCustomEvent = typeof CustomEvent !== "undefined";
-    sinon.xhr = { XMLHttpRequest: global.XMLHttpRequest };
-    var xhr = sinon.xhr;
-    xhr.GlobalXMLHttpRequest = global.XMLHttpRequest;
-    xhr.GlobalActiveXObject = global.ActiveXObject;
-    xhr.supportsActiveX = typeof xhr.GlobalActiveXObject != "undefined";
-    xhr.supportsXHR = typeof xhr.GlobalXMLHttpRequest != "undefined";
-    xhr.workingXHR = xhr.supportsXHR ? xhr.GlobalXMLHttpRequest : xhr.supportsActiveX
-                                     ? function() { return new xhr.GlobalActiveXObject("MSXML2.XMLHTTP.3.0") } : false;
-    xhr.supportsCORS = 'withCredentials' in (new sinon.xhr.GlobalXMLHttpRequest());
-
-    /*jsl:ignore*/
-    var unsafeHeaders = {
-        "Accept-Charset": true,
-        "Accept-Encoding": true,
-        "Connection": true,
-        "Content-Length": true,
-        "Cookie": true,
-        "Cookie2": true,
-        "Content-Transfer-Encoding": true,
-        "Date": true,
-        "Expect": true,
-        "Host": true,
-        "Keep-Alive": true,
-        "Referer": true,
-        "TE": true,
-        "Trailer": true,
-        "Transfer-Encoding": true,
-        "Upgrade": true,
-        "User-Agent": true,
-        "Via": true
-    };
-    /*jsl:end*/
-
-    function FakeXMLHttpRequest() {
-        this.readyState = FakeXMLHttpRequest.UNSENT;
-        this.requestHeaders = {};
-        this.requestBody = null;
-        this.status = 0;
-        this.statusText = "";
-        this.upload = new UploadProgress();
-        if (sinon.xhr.supportsCORS) {
-            this.withCredentials = false;
-        }
-
-
-        var xhr = this;
-        var events = ["loadstart", "load", "abort", "loadend"];
-
-        function addEventListener(eventName) {
-            xhr.addEventListener(eventName, function (event) {
-                var listener = xhr["on" + eventName];
-
-                if (listener && typeof listener == "function") {
-                    listener(event);
-                }
-            });
-        }
-
-        for (var i = events.length - 1; i >= 0; i--) {
-            addEventListener(events[i]);
-        }
-
-        if (typeof FakeXMLHttpRequest.onCreate == "function") {
-            FakeXMLHttpRequest.onCreate(this);
-        }
-    }
-
-    // An upload object is created for each
-    // FakeXMLHttpRequest and allows upload
-    // events to be simulated using uploadProgress
-    // and uploadError.
-    function UploadProgress() {
-        this.eventListeners = {
-            "progress": [],
-            "load": [],
-            "abort": [],
-            "error": []
-        }
-    }
-
-    UploadProgress.prototype.addEventListener = function(event, listener) {
-        this.eventListeners[event].push(listener);
-    };
-
-    UploadProgress.prototype.removeEventListener = function(event, listener) {
-        var listeners = this.eventListeners[event] || [];
-
-        for (var i = 0, l = listeners.length; i < l; ++i) {
-            if (listeners[i] == listener) {
-                return listeners.splice(i, 1);
-            }
-        }
-    };
-
-    UploadProgress.prototype.dispatchEvent = function(event) {
-        var listeners = this.eventListeners[event.type] || [];
-
-        for (var i = 0, listener; (listener = listeners[i]) != null; i++) {
-            listener(event);
-        }
-    };
-
-    function verifyState(xhr) {
-        if (xhr.readyState !== FakeXMLHttpRequest.OPENED) {
-            throw new Error("INVALID_STATE_ERR");
-        }
-
-        if (xhr.sendFlag) {
-            throw new Error("INVALID_STATE_ERR");
-        }
-    }
-
-    // filtering to enable a white-list version of Sinon FakeXhr,
-    // where whitelisted requests are passed through to real XHR
-    function each(collection, callback) {
-        if (!collection) return;
-        for (var i = 0, l = collection.length; i < l; i += 1) {
-            callback(collection[i]);
-        }
-    }
-    function some(collection, callback) {
-        for (var index = 0; index < collection.length; index++) {
-            if(callback(collection[index]) === true) return true;
-        }
-        return false;
-    }
-    // largest arity in XHR is 5 - XHR#open
-    var apply = function(obj,method,args) {
-        switch(args.length) {
-        case 0: return obj[method]();
-        case 1: return obj[method](args[0]);
-        case 2: return obj[method](args[0],args[1]);
-        case 3: return obj[method](args[0],args[1],args[2]);
-        case 4: return obj[method](args[0],args[1],args[2],args[3]);
-        case 5: return obj[method](args[0],args[1],args[2],args[3],args[4]);
-        }
-    };
-
-    FakeXMLHttpRequest.filters = [];
-    FakeXMLHttpRequest.addFilter = function(fn) {
-        this.filters.push(fn)
-    };
-    var IE6Re = /MSIE 6/;
-    FakeXMLHttpRequest.defake = function(fakeXhr,xhrArgs) {
-        var xhr = new sinon.xhr.workingXHR();
-        each(["open","setRequestHeader","send","abort","getResponseHeader",
-              "getAllResponseHeaders","addEventListener","overrideMimeType","removeEventListener"],
-             function(method) {
-                 fakeXhr[method] = function() {
-                   return apply(xhr,method,arguments);
-                 };
-             });
-
-        var copyAttrs = function(args) {
-            each(args, function(attr) {
-              try {
-                fakeXhr[attr] = xhr[attr]
-              } catch(e) {
-                if(!IE6Re.test(navigator.userAgent)) throw e;
-              }
-            });
-        };
-
-        var stateChange = function() {
-            fakeXhr.readyState = xhr.readyState;
-            if(xhr.readyState >= FakeXMLHttpRequest.HEADERS_RECEIVED) {
-                copyAttrs(["status","statusText"]);
-            }
-            if(xhr.readyState >= FakeXMLHttpRequest.LOADING) {
-                copyAttrs(["responseText"]);
-            }
-            if(xhr.readyState === FakeXMLHttpRequest.DONE) {
-                copyAttrs(["responseXML"]);
-            }
-            if(fakeXhr.onreadystatechange) fakeXhr.onreadystatechange.call(fakeXhr, { target: fakeXhr });
-        };
-        if(xhr.addEventListener) {
-          for(var event in fakeXhr.eventListeners) {
-              if(fakeXhr.eventListeners.hasOwnProperty(event)) {
-                  each(fakeXhr.eventListeners[event],function(handler) {
-                      xhr.addEventListener(event, handler);
-                  });
-              }
-          }
-          xhr.addEventListener("readystatechange",stateChange);
-        } else {
-          xhr.onreadystatechange = stateChange;
-        }
-        apply(xhr,"open",xhrArgs);
-    };
-    FakeXMLHttpRequest.useFilters = false;
-
-    function verifyRequestSent(xhr) {
-        if (xhr.readyState == FakeXMLHttpRequest.DONE) {
-            throw new Error("Request done");
-        }
-    }
-
-    function verifyHeadersReceived(xhr) {
-        if (xhr.async && xhr.readyState != FakeXMLHttpRequest.HEADERS_RECEIVED) {
-            throw new Error("No headers received");
-        }
-    }
-
-    function verifyResponseBodyType(body) {
-        if (typeof body != "string") {
-            var error = new Error("Attempted to respond to fake XMLHttpRequest with " +
-                                 body + ", which is not a string.");
-            error.name = "InvalidBodyException";
-            throw error;
-        }
-    }
-
-    sinon.extend(FakeXMLHttpRequest.prototype, sinon.EventTarget, {
-        async: true,
-
-        open: function open(method, url, async, username, password) {
-            this.method = method;
-            this.url = url;
-            this.async = typeof async == "boolean" ? async : true;
-            this.username = username;
-            this.password = password;
-            this.responseText = null;
-            this.responseXML = null;
-            this.requestHeaders = {};
-            this.sendFlag = false;
-            if(sinon.FakeXMLHttpRequest.useFilters === true) {
-                var xhrArgs = arguments;
-                var defake = some(FakeXMLHttpRequest.filters,function(filter) {
-                    return filter.apply(this,xhrArgs)
-                });
-                if (defake) {
-                  return sinon.FakeXMLHttpRequest.defake(this,arguments);
-                }
-            }
-            this.readyStateChange(FakeXMLHttpRequest.OPENED);
-        },
-
-        readyStateChange: function readyStateChange(state) {
-            this.readyState = state;
-
-            if (typeof this.onreadystatechange == "function") {
-                try {
-                    this.onreadystatechange();
-                } catch (e) {
-                    sinon.logError("Fake XHR onreadystatechange handler", e);
-                }
-            }
-
-            this.dispatchEvent(new sinon.Event("readystatechange"));
-
-            switch (this.readyState) {
-                case FakeXMLHttpRequest.DONE:
-                    this.dispatchEvent(new sinon.Event("load", false, false, this));
-                    this.dispatchEvent(new sinon.Event("loadend", false, false, this));
-                    this.upload.dispatchEvent(new sinon.Event("load", false, false, this));
-                    if (supportsProgress) {
-                        this.upload.dispatchEvent(new ProgressEvent("progress", {loaded: 100, total: 100}));
-                    }
-                    break;
-            }
-        },
-
-        setRequestHeader: function setRequestHeader(header, value) {
-            verifyState(this);
-
-            if (unsafeHeaders[header] || /^(Sec-|Proxy-)/.test(header)) {
-                throw new Error("Refused to set unsafe header \"" + header + "\"");
-            }
-
-            if (this.requestHeaders[header]) {
-                this.requestHeaders[header] += "," + value;
-            } else {
-                this.requestHeaders[header] = value;
-            }
-        },
-
-        // Helps testing
-        setResponseHeaders: function setResponseHeaders(headers) {
-            this.responseHeaders = {};
-
-            for (var header in headers) {
-                if (headers.hasOwnProperty(header)) {
-                    this.responseHeaders[header] = headers[header];
-                }
-            }
-
-            if (this.async) {
-                this.readyStateChange(FakeXMLHttpRequest.HEADERS_RECEIVED);
-            } else {
-                this.readyState = FakeXMLHttpRequest.HEADERS_RECEIVED;
-            }
-        },
-
-        // Currently treats ALL data as a DOMString (i.e. no Document)
-        send: function send(data) {
-            verifyState(this);
-
-            if (!/^(get|head)$/i.test(this.method)) {
-                if (this.requestHeaders["Content-Type"]) {
-                    var value = this.requestHeaders["Content-Type"].split(";");
-                    this.requestHeaders["Content-Type"] = value[0] + ";charset=utf-8";
-                } else {
-                    this.requestHeaders["Content-Type"] = "text/plain;charset=utf-8";
-                }
-
-                this.requestBody = data;
-            }
-
-            this.errorFlag = false;
-            this.sendFlag = this.async;
-            this.readyStateChange(FakeXMLHttpRequest.OPENED);
-
-            if (typeof this.onSend == "function") {
-                this.onSend(this);
-            }
-
-            this.dispatchEvent(new sinon.Event("loadstart", false, false, this));
-        },
-
-        abort: function abort() {
-            this.aborted = true;
-            this.responseText = null;
-            this.errorFlag = true;
-            this.requestHeaders = {};
-
-            if (this.readyState > sinon.FakeXMLHttpRequest.UNSENT && this.sendFlag) {
-                this.readyStateChange(sinon.FakeXMLHttpRequest.DONE);
-                this.sendFlag = false;
-            }
-
-            this.readyState = sinon.FakeXMLHttpRequest.UNSENT;
-
-            this.dispatchEvent(new sinon.Event("abort", false, false, this));
-
-            this.upload.dispatchEvent(new sinon.Event("abort", false, false, this));
-
-            if (typeof this.onerror === "function") {
-                this.onerror();
-            }
-        },
-
-        getResponseHeader: function getResponseHeader(header) {
-            if (this.readyState < FakeXMLHttpRequest.HEADERS_RECEIVED) {
-                return null;
-            }
-
-            if (/^Set-Cookie2?$/i.test(header)) {
-                return null;
-            }
-
-            header = header.toLowerCase();
-
-            for (var h in this.responseHeaders) {
-                if (h.toLowerCase() == header) {
-                    return this.responseHeaders[h];
-                }
-            }
-
-            return null;
-        },
-
-        getAllResponseHeaders: function getAllResponseHeaders() {
-            if (this.readyState < FakeXMLHttpRequest.HEADERS_RECEIVED) {
-                return "";
-            }
-
-            var headers = "";
-
-            for (var header in this.responseHeaders) {
-                if (this.responseHeaders.hasOwnProperty(header) &&
-                    !/^Set-Cookie2?$/i.test(header)) {
-                    headers += header + ": " + this.responseHeaders[header] + "\r\n";
-                }
-            }
-
-            return headers;
-        },
-
-        setResponseBody: function setResponseBody(body) {
-            verifyRequestSent(this);
-            verifyHeadersReceived(this);
-            verifyResponseBodyType(body);
-
-            var chunkSize = this.chunkSize || 10;
-            var index = 0;
-            this.responseText = "";
-
-            do {
-                if (this.async) {
-                    this.readyStateChange(FakeXMLHttpRequest.LOADING);
-                }
-
-                this.responseText += body.substring(index, index + chunkSize);
-                index += chunkSize;
-            } while (index < body.length);
-
-            var type = this.getResponseHeader("Content-Type");
-
-            if (this.responseText &&
-                (!type || /(text\/xml)|(application\/xml)|(\+xml)/.test(type))) {
-                try {
-                    this.responseXML = FakeXMLHttpRequest.parseXML(this.responseText);
-                } catch (e) {
-                    // Unable to parse XML - no biggie
-                }
-            }
-
-            if (this.async) {
-                this.readyStateChange(FakeXMLHttpRequest.DONE);
-            } else {
-                this.readyState = FakeXMLHttpRequest.DONE;
-            }
-        },
-
-        respond: function respond(status, headers, body) {
-            this.status = typeof status == "number" ? status : 200;
-            this.statusText = FakeXMLHttpRequest.statusCodes[this.status];
-            this.setResponseHeaders(headers || {});
-            this.setResponseBody(body || "");
-        },
-
-        uploadProgress: function uploadProgress(progressEventRaw) {
-            if (supportsProgress) {
-                this.upload.dispatchEvent(new ProgressEvent("progress", progressEventRaw));
-            }
-        },
-
-        uploadError: function uploadError(error) {
-            if (supportsCustomEvent) {
-                this.upload.dispatchEvent(new CustomEvent("error", {"detail": error}));
-            }
-        }
-    });
-
-    sinon.extend(FakeXMLHttpRequest, {
-        UNSENT: 0,
-        OPENED: 1,
-        HEADERS_RECEIVED: 2,
-        LOADING: 3,
-        DONE: 4
-    });
-
-    // Borrowed from JSpec
-    FakeXMLHttpRequest.parseXML = function parseXML(text) {
-        var xmlDoc;
-
-        if (typeof DOMParser != "undefined") {
-            var parser = new DOMParser();
-            xmlDoc = parser.parseFromString(text, "text/xml");
-        } else {
-            xmlDoc = new ActiveXObject("Microsoft.XMLDOM");
-            xmlDoc.async = "false";
-            xmlDoc.loadXML(text);
-        }
-
-        return xmlDoc;
-    };
-
-    FakeXMLHttpRequest.statusCodes = {
-        100: "Continue",
-        101: "Switching Protocols",
-        200: "OK",
-        201: "Created",
-        202: "Accepted",
-        203: "Non-Authoritative Information",
-        204: "No Content",
-        205: "Reset Content",
-        206: "Partial Content",
-        300: "Multiple Choice",
-        301: "Moved Permanently",
-        302: "Found",
-        303: "See Other",
-        304: "Not Modified",
-        305: "Use Proxy",
-        307: "Temporary Redirect",
-        400: "Bad Request",
-        401: "Unauthorized",
-        402: "Payment Required",
-        403: "Forbidden",
-        404: "Not Found",
-        405: "Method Not Allowed",
-        406: "Not Acceptable",
-        407: "Proxy Authentication Required",
-        408: "Request Timeout",
-        409: "Conflict",
-        410: "Gone",
-        411: "Length Required",
-        412: "Precondition Failed",
-        413: "Request Entity Too Large",
-        414: "Request-URI Too Long",
-        415: "Unsupported Media Type",
-        416: "Requested Range Not Satisfiable",
-        417: "Expectation Failed",
-        422: "Unprocessable Entity",
-        500: "Internal Server Error",
-        501: "Not Implemented",
-        502: "Bad Gateway",
-        503: "Service Unavailable",
-        504: "Gateway Timeout",
-        505: "HTTP Version Not Supported"
-    };
-
-    sinon.useFakeXMLHttpRequest = function () {
-        sinon.FakeXMLHttpRequest.restore = function restore(keepOnCreate) {
-            if (xhr.supportsXHR) {
-                global.XMLHttpRequest = xhr.GlobalXMLHttpRequest;
-            }
-
-            if (xhr.supportsActiveX) {
-                global.ActiveXObject = xhr.GlobalActiveXObject;
-            }
-
-            delete sinon.FakeXMLHttpRequest.restore;
-
-            if (keepOnCreate !== true) {
-                delete sinon.FakeXMLHttpRequest.onCreate;
-            }
-        };
-        if (xhr.supportsXHR) {
-            global.XMLHttpRequest = sinon.FakeXMLHttpRequest;
-        }
-
-        if (xhr.supportsActiveX) {
-            global.ActiveXObject = function ActiveXObject(objId) {
-                if (objId == "Microsoft.XMLHTTP" || /^Msxml2\.XMLHTTP/i.test(objId)) {
-
-                    return new sinon.FakeXMLHttpRequest();
-                }
-
-                return new xhr.GlobalActiveXObject(objId);
-            };
-        }
-
-        return sinon.FakeXMLHttpRequest;
-    };
-
-    sinon.FakeXMLHttpRequest = FakeXMLHttpRequest;
-
-})(typeof global === "object" ? global : this);
-
-if (typeof module !== 'undefined' && module.exports) {
-    module.exports = sinon;
-}
-
-/**
- * @depend fake_xml_http_request.js
- */
-/*jslint eqeqeq: false, onevar: false, regexp: false, plusplus: false*/
-/*global module, require, window*/
-/**
- * The Sinon "server" mimics a web server that receives requests from
- * sinon.FakeXMLHttpRequest and provides an API to respond to those requests,
- * both synchronously and asynchronously. To respond synchronuously, canned
- * answers have to be provided upfront.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-if (typeof sinon == "undefined") {
-    var sinon = {};
-}
-
-sinon.fakeServer = (function () {
-    var push = [].push;
-    function F() {}
-
-    function create(proto) {
-        F.prototype = proto;
-        return new F();
-    }
-
-    function responseArray(handler) {
-        var response = handler;
-
-        if (Object.prototype.toString.call(handler) != "[object Array]") {
-            response = [200, {}, handler];
-        }
-
-        if (typeof response[2] != "string") {
-            throw new TypeError("Fake server response body should be string, but was " +
-                                typeof response[2]);
-        }
-
-        return response;
-    }
-
-    var wloc = typeof window !== "undefined" ? window.location : {};
-    var rCurrLoc = new RegExp("^" + wloc.protocol + "//" + wloc.host);
-
-    function matchOne(response, reqMethod, reqUrl) {
-        var rmeth = response.method;
-        var matchMethod = !rmeth || rmeth.toLowerCase() == reqMethod.toLowerCase();
-        var url = response.url;
-        var matchUrl = !url || url == reqUrl || (typeof url.test == "function" && url.test(reqUrl));
-
-        return matchMethod && matchUrl;
-    }
-
-    function match(response, request) {
-        var requestUrl = request.url;
-
-        if (!/^https?:\/\//.test(requestUrl) || rCurrLoc.test(requestUrl)) {
-            requestUrl = requestUrl.replace(rCurrLoc, "");
-        }
-
-        if (matchOne(response, this.getHTTPMethod(request), requestUrl)) {
-            if (typeof response.response == "function") {
-                var ru = response.url;
-                var args = [request].concat(ru && typeof ru.exec == "function" ? ru.exec(requestUrl).slice(1) : []);
-                return response.response.apply(response, args);
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    function log(response, request) {
-        var str;
-
-        str =  "Request:\n"  + sinon.format(request)  + "\n\n";
-        str += "Response:\n" + sinon.format(response) + "\n\n";
-
-        sinon.log(str);
-    }
-
-    return {
-        create: function () {
-            var server = create(this);
-            this.xhr = sinon.useFakeXMLHttpRequest();
-            server.requests = [];
-
-            this.xhr.onCreate = function (xhrObj) {
-                server.addRequest(xhrObj);
-            };
-
-            return server;
-        },
-
-        addRequest: function addRequest(xhrObj) {
-            var server = this;
-            push.call(this.requests, xhrObj);
-
-            xhrObj.onSend = function () {
-                server.handleRequest(this);
-
-                if (server.autoRespond && !server.responding) {
-                    setTimeout(function () {
-                        server.responding = false;
-                        server.respond();
-                    }, server.autoRespondAfter || 10);
-
-                    server.responding = true;
-                }
-            };
-        },
-
-        getHTTPMethod: function getHTTPMethod(request) {
-            if (this.fakeHTTPMethods && /post/i.test(request.method)) {
-                var matches = (request.requestBody || "").match(/_method=([^\b;]+)/);
-                return !!matches ? matches[1] : request.method;
-            }
-
-            return request.method;
-        },
-
-        handleRequest: function handleRequest(xhr) {
-            if (xhr.async) {
-                if (!this.queue) {
-                    this.queue = [];
-                }
-
-                push.call(this.queue, xhr);
-            } else {
-                this.processRequest(xhr);
-            }
-        },
-
-        respondWith: function respondWith(method, url, body) {
-            if (arguments.length == 1 && typeof method != "function") {
-                this.response = responseArray(method);
-                return;
-            }
-
-            if (!this.responses) { this.responses = []; }
-
-            if (arguments.length == 1) {
-                body = method;
-                url = method = null;
-            }
-
-            if (arguments.length == 2) {
-                body = url;
-                url = method;
-                method = null;
-            }
-
-            push.call(this.responses, {
-                method: method,
-                url: url,
-                response: typeof body == "function" ? body : responseArray(body)
-            });
-        },
-
-        respond: function respond() {
-            if (arguments.length > 0) this.respondWith.apply(this, arguments);
-            var queue = this.queue || [];
-            var requests = queue.splice(0);
-            var request;
-
-            while(request = requests.shift()) {
-                this.processRequest(request);
-            }
-        },
-
-        processRequest: function processRequest(request) {
-            try {
-                if (request.aborted) {
-                    return;
-                }
-
-                var response = this.response || [404, {}, ""];
-
-                if (this.responses) {
-                    for (var l = this.responses.length, i = l - 1; i >= 0; i--) {
-                        if (match.call(this, this.responses[i], request)) {
-                            response = this.responses[i].response;
-                            break;
-                        }
-                    }
-                }
-
-                if (request.readyState != 4) {
-                    log(response, request);
-
-                    request.respond(response[0], response[1], response[2]);
-                }
-            } catch (e) {
-                sinon.logError("Fake server request processing", e);
-            }
-        },
-
-        restore: function restore() {
-            return this.xhr.restore && this.xhr.restore.apply(this.xhr, arguments);
-        }
-    };
-}());
-
-if (typeof module !== 'undefined' && module.exports) {
-    module.exports = sinon;
-}
-
-/**
- * @depend fake_server.js
- * @depend fake_timers.js
- */
-/*jslint browser: true, eqeqeq: false, onevar: false*/
-/*global sinon*/
-/**
- * Add-on for sinon.fakeServer that automatically handles a fake timer along with
- * the FakeXMLHttpRequest. The direct inspiration for this add-on is jQuery
- * 1.3.x, which does not use xhr object's onreadystatehandler at all - instead,
- * it polls the object for completion with setInterval. Dispite the direct
- * motivation, there is nothing jQuery-specific in this file, so it can be used
- * in any environment where the ajax implementation depends on setInterval or
- * setTimeout.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function () {
-    function Server() {}
-    Server.prototype = sinon.fakeServer;
-
-    sinon.fakeServerWithClock = new Server();
-
-    sinon.fakeServerWithClock.addRequest = function addRequest(xhr) {
-        if (xhr.async) {
-            if (typeof setTimeout.clock == "object") {
-                this.clock = setTimeout.clock;
-            } else {
-                this.clock = sinon.useFakeTimers();
-                this.resetClock = true;
-            }
-
-            if (!this.longestTimeout) {
-                var clockSetTimeout = this.clock.setTimeout;
-                var clockSetInterval = this.clock.setInterval;
-                var server = this;
-
-                this.clock.setTimeout = function (fn, timeout) {
-                    server.longestTimeout = Math.max(timeout, server.longestTimeout || 0);
-
-                    return clockSetTimeout.apply(this, arguments);
-                };
-
-                this.clock.setInterval = function (fn, timeout) {
-                    server.longestTimeout = Math.max(timeout, server.longestTimeout || 0);
-
-                    return clockSetInterval.apply(this, arguments);
-                };
-            }
-        }
-
-        return sinon.fakeServer.addRequest.call(this, xhr);
-    };
-
-    sinon.fakeServerWithClock.respond = function respond() {
-        var returnVal = sinon.fakeServer.respond.apply(this, arguments);
-
-        if (this.clock) {
-            this.clock.tick(this.longestTimeout || 0);
-            this.longestTimeout = 0;
-
-            if (this.resetClock) {
-                this.clock.restore();
-                this.resetClock = false;
-            }
-        }
-
-        return returnVal;
-    };
-
-    sinon.fakeServerWithClock.restore = function restore() {
-        if (this.clock) {
-            this.clock.restore();
-        }
-
-        return sinon.fakeServer.restore.apply(this, arguments);
-    };
-}());
-
-/**
- * @depend ../sinon.js
- * @depend collection.js
- * @depend util/fake_timers.js
- * @depend util/fake_server_with_clock.js
- */
-/*jslint eqeqeq: false, onevar: false, plusplus: false*/
-/*global require, module*/
-/**
- * Manages fake collections as well as fake utilities such as Sinon's
- * timers and fake XHR implementation in one convenient object.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-if (typeof module !== 'undefined' && module.exports) {
-    var sinon = require("../sinon");
-    sinon.extend(sinon, require("./util/fake_timers"));
-}
-
-(function () {
-    var push = [].push;
-
-    function exposeValue(sandbox, config, key, value) {
-        if (!value) {
-            return;
-        }
-
-        if (config.injectInto && !(key in config.injectInto) ) {
-            config.injectInto[key] = value;
-        } else {
-            push.call(sandbox.args, value);
-        }
-    }
-
-    function prepareSandboxFromConfig(config) {
-        var sandbox = sinon.create(sinon.sandbox);
-
-        if (config.useFakeServer) {
-            if (typeof config.useFakeServer == "object") {
-                sandbox.serverPrototype = config.useFakeServer;
-            }
-
-            sandbox.useFakeServer();
-        }
-
-        if (config.useFakeTimers) {
-            if (typeof config.useFakeTimers == "object") {
-                sandbox.useFakeTimers.apply(sandbox, config.useFakeTimers);
-            } else {
-                sandbox.useFakeTimers();
-            }
-        }
-
-        return sandbox;
-    }
-
-    sinon.sandbox = sinon.extend(sinon.create(sinon.collection), {
-        useFakeTimers: function useFakeTimers() {
-            this.clock = sinon.useFakeTimers.apply(sinon, arguments);
-
-            return this.add(this.clock);
-        },
-
-        serverPrototype: sinon.fakeServer,
-
-        useFakeServer: function useFakeServer() {
-            var proto = this.serverPrototype || sinon.fakeServer;
-
-            if (!proto || !proto.create) {
-                return null;
-            }
-
-            this.server = proto.create();
-            return this.add(this.server);
-        },
-
-        inject: function (obj) {
-            sinon.collection.inject.call(this, obj);
-
-            if (this.clock) {
-                obj.clock = this.clock;
-            }
-
-            if (this.server) {
-                obj.server = this.server;
-                obj.requests = this.server.requests;
-            }
-
-            return obj;
-        },
-
-        create: function (config) {
-            if (!config) {
-                return sinon.create(sinon.sandbox);
-            }
-
-            var sandbox = prepareSandboxFromConfig(config);
-            sandbox.args = sandbox.args || [];
-            var prop, value, exposed = sandbox.inject({});
-
-            if (config.properties) {
-                for (var i = 0, l = config.properties.length; i < l; i++) {
-                    prop = config.properties[i];
-                    value = exposed[prop] || prop == "sandbox" && sandbox;
-                    exposeValue(sandbox, config, prop, value);
-                }
-            } else {
-                exposeValue(sandbox, config, "sandbox", value);
-            }
-
-            return sandbox;
-        }
-    });
-
-    sinon.sandbox.useFakeXMLHttpRequest = sinon.sandbox.useFakeServer;
-
-    if (typeof module !== 'undefined' && module.exports) {
-        module.exports = sinon.sandbox;
-    }
-}());
-
-/**
- * @depend ../sinon.js
- * @depend stub.js
- * @depend mock.js
- * @depend sandbox.js
- */
-/*jslint eqeqeq: false, onevar: false, forin: true, plusplus: false*/
-/*global module, require, sinon*/
-/**
- * Test function, sandboxes fakes
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function test(callback) {
-        var type = typeof callback;
-
-        if (type != "function") {
-            throw new TypeError("sinon.test needs to wrap a test function, got " + type);
-        }
-
-        return function () {
-            var config = sinon.getConfig(sinon.config);
-            config.injectInto = config.injectIntoThis && this || config.injectInto;
-            var sandbox = sinon.sandbox.create(config);
-            var exception, result;
-            var args = Array.prototype.slice.call(arguments).concat(sandbox.args);
-
-            try {
-                result = callback.apply(this, args);
-            } catch (e) {
-                exception = e;
-            }
-
-            if (typeof exception !== "undefined") {
-                sandbox.restore();
-                throw exception;
-            }
-            else {
-                sandbox.verifyAndRestore();
-            }
-
-            return result;
-        };
-    }
-
-    test.config = {
-        injectIntoThis: true,
-        injectInto: null,
-        properties: ["spy", "stub", "mock", "clock", "server", "requests"],
-        useFakeTimers: true,
-        useFakeServer: true
-    };
-
-    if (commonJSModule) {
-        module.exports = test;
-    } else {
-        sinon.test = test;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/**
- * @depend ../sinon.js
- * @depend test.js
- */
-/*jslint eqeqeq: false, onevar: false, eqeqeq: false*/
-/*global module, require, sinon*/
-/**
- * Test case, sandboxes all test functions
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon || !Object.prototype.hasOwnProperty) {
-        return;
-    }
-
-    function createTest(property, setUp, tearDown) {
-        return function () {
-            if (setUp) {
-                setUp.apply(this, arguments);
-            }
-
-            var exception, result;
-
-            try {
-                result = property.apply(this, arguments);
-            } catch (e) {
-                exception = e;
-            }
-
-            if (tearDown) {
-                tearDown.apply(this, arguments);
-            }
-
-            if (exception) {
-                throw exception;
-            }
-
-            return result;
-        };
-    }
-
-    function testCase(tests, prefix) {
-        /*jsl:ignore*/
-        if (!tests || typeof tests != "object") {
-            throw new TypeError("sinon.testCase needs an object with test functions");
-        }
-        /*jsl:end*/
-
-        prefix = prefix || "test";
-        var rPrefix = new RegExp("^" + prefix);
-        var methods = {}, testName, property, method;
-        var setUp = tests.setUp;
-        var tearDown = tests.tearDown;
-
-        for (testName in tests) {
-            if (tests.hasOwnProperty(testName)) {
-                property = tests[testName];
-
-                if (/^(setUp|tearDown)$/.test(testName)) {
-                    continue;
-                }
-
-                if (typeof property == "function" && rPrefix.test(testName)) {
-                    method = property;
-
-                    if (setUp || tearDown) {
-                        method = createTest(property, setUp, tearDown);
-                    }
-
-                    methods[testName] = sinon.test(method);
-                } else {
-                    methods[testName] = tests[testName];
-                }
-            }
-        }
-
-        return methods;
-    }
-
-    if (commonJSModule) {
-        module.exports = testCase;
-    } else {
-        sinon.testCase = testCase;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/**
- * @depend ../sinon.js
- * @depend stub.js
- */
-/*jslint eqeqeq: false, onevar: false, nomen: false, plusplus: false*/
-/*global module, require, sinon*/
-/**
- * Assertions matching the test spy retrieval interface.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon, global) {
-    var commonJSModule = typeof module !== "undefined" && module.exports;
-    var slice = Array.prototype.slice;
-    var assert;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function verifyIsStub() {
-        var method;
-
-        for (var i = 0, l = arguments.length; i < l; ++i) {
-            method = arguments[i];
-
-            if (!method) {
-                assert.fail("fake is not a spy");
-            }
-
-            if (typeof method != "function") {
-                assert.fail(method + " is not a function");
-            }
-
-            if (typeof method.getCall != "function") {
-                assert.fail(method + " is not stubbed");
-            }
-        }
-    }
-
-    function failAssertion(object, msg) {
-        object = object || global;
-        var failMethod = object.fail || assert.fail;
-        failMethod.call(object, msg);
-    }
-
-    function mirrorPropAsAssertion(name, method, message) {
-        if (arguments.length == 2) {
-            message = method;
-            method = name;
-        }
-
-        assert[name] = function (fake) {
-            verifyIsStub(fake);
-
-            var args = slice.call(arguments, 1);
-            var failed = false;
-
-            if (typeof method == "function") {
-                failed = !method(fake);
-            } else {
-                failed = typeof fake[method] == "function" ?
-                    !fake[method].apply(fake, args) : !fake[method];
-            }
-
-            if (failed) {
-                failAssertion(this, fake.printf.apply(fake, [message].concat(args)));
-            } else {
-                assert.pass(name);
-            }
-        };
-    }
-
-    function exposedName(prefix, prop) {
-        return !prefix || /^fail/.test(prop) ? prop :
-            prefix + prop.slice(0, 1).toUpperCase() + prop.slice(1);
-    }
-
-    assert = {
-        failException: "AssertError",
-
-        fail: function fail(message) {
-            var error = new Error(message);
-            error.name = this.failException || assert.failException;
-
-            throw error;
-        },
-
-        pass: function pass(assertion) {},
-
-        callOrder: function assertCallOrder() {
-            verifyIsStub.apply(null, arguments);
-            var expected = "", actual = "";
-
-            if (!sinon.calledInOrder(arguments)) {
-                try {
-                    expected = [].join.call(arguments, ", ");
-                    var calls = slice.call(arguments);
-                    var i = calls.length;
-                    while (i) {
-                        if (!calls[--i].called) {
-                            calls.splice(i, 1);
-                        }
-                    }
-                    actual = sinon.orderByFirstCall(calls).join(", ");
-                } catch (e) {
-                    // If this fails, we'll just fall back to the blank string
-                }
-
-                failAssertion(this, "expected " + expected + " to be " +
-                              "called in order but were called as " + actual);
-            } else {
-                assert.pass("callOrder");
-            }
-        },
-
-        callCount: function assertCallCount(method, count) {
-            verifyIsStub(method);
-
-            if (method.callCount != count) {
-                var msg = "expected %n to be called " + sinon.timesInWords(count) +
-                    " but was called %c%C";
-                failAssertion(this, method.printf(msg));
-            } else {
-                assert.pass("callCount");
-            }
-        },
-
-        expose: function expose(target, options) {
-            if (!target) {
-                throw new TypeError("target is null or undefined");
-            }
-
-            var o = options || {};
-            var prefix = typeof o.prefix == "undefined" && "assert" || o.prefix;
-            var includeFail = typeof o.includeFail == "undefined" || !!o.includeFail;
-
-            for (var method in this) {
-                if (method != "export" && (includeFail || !/^(fail)/.test(method))) {
-                    target[exposedName(prefix, method)] = this[method];
-                }
-            }
-
-            return target;
-        }
-    };
-
-    mirrorPropAsAssertion("called", "expected %n to have been called at least once but was never called");
-    mirrorPropAsAssertion("notCalled", function (spy) { return !spy.called; },
-                          "expected %n to not have been called but was called %c%C");
-    mirrorPropAsAssertion("calledOnce", "expected %n to be called once but was called %c%C");
-    mirrorPropAsAssertion("calledTwice", "expected %n to be called twice but was called %c%C");
-    mirrorPropAsAssertion("calledThrice", "expected %n to be called thrice but was called %c%C");
-    mirrorPropAsAssertion("calledOn", "expected %n to be called with %1 as this but was called with %t");
-    mirrorPropAsAssertion("alwaysCalledOn", "expected %n to always be called with %1 as this but was called with %t");
-    mirrorPropAsAssertion("calledWithNew", "expected %n to be called with new");
-    mirrorPropAsAssertion("alwaysCalledWithNew", "expected %n to always be called with new");
-    mirrorPropAsAssertion("calledWith", "expected %n to be called with arguments %*%C");
-    mirrorPropAsAssertion("calledWithMatch", "expected %n to be called with match %*%C");
-    mirrorPropAsAssertion("alwaysCalledWith", "expected %n to always be called with arguments %*%C");
-    mirrorPropAsAssertion("alwaysCalledWithMatch", "expected %n to always be called with match %*%C");
-    mirrorPropAsAssertion("calledWithExactly", "expected %n to be called with exact arguments %*%C");
-    mirrorPropAsAssertion("alwaysCalledWithExactly", "expected %n to always be called with exact arguments %*%C");
-    mirrorPropAsAssertion("neverCalledWith", "expected %n to never be called with arguments %*%C");
-    mirrorPropAsAssertion("neverCalledWithMatch", "expected %n to never be called with match %*%C");
-    mirrorPropAsAssertion("threw", "%n did not throw exception%C");
-    mirrorPropAsAssertion("alwaysThrew", "%n did not always throw exception%C");
-
-    if (commonJSModule) {
-        module.exports = assert;
-    } else {
-        sinon.assert = assert;
-    }
-}(typeof sinon == "object" && sinon || null, typeof window != "undefined" ? window : (typeof self != "undefined") ? self : global));
-
-return sinon;}.call(typeof window != 'undefined' && window || {}));
diff --git a/test/utils/sinon/sinon-ie-1.8.2.js b/test/utils/sinon/sinon-ie-1.8.2.js
deleted file mode 100644
index 6e255ba83bd94..0000000000000
--- a/test/utils/sinon/sinon-ie-1.8.2.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Sinon.JS 1.8.2, 2014/02/13
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @author Contributors: https://github.com/cjohansen/Sinon.JS/blob/master/AUTHORS
- *
- * (The BSD License)
- * 
- * Copyright (c) 2010-2014, Christian Johansen, christian@cjohansen.no
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice,
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice,
- *       this list of conditions and the following disclaimer in the documentation
- *       and/or other materials provided with the distribution.
- *     * Neither the name of Christian Johansen nor the names of his contributors
- *       may be used to endorse or promote products derived from this software
- *       without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*global sinon, setTimeout, setInterval, clearTimeout, clearInterval, Date*/
-/**
- * Helps IE run the fake timers. By defining global functions, IE allows
- * them to be overwritten at a later point. If these are not defined like
- * this, overwriting them will result in anything from an exception to browser
- * crash.
- *
- * If you don't require fake timers to work in IE, don't include this file.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-function setTimeout() {}
-function clearTimeout() {}
-function setImmediate() {}
-function clearImmediate() {}
-function setInterval() {}
-function clearInterval() {}
-function Date() {}
-
-// Reassign the original functions. Now their writable attribute
-// should be true. Hackish, I know, but it works.
-setTimeout = sinon.timers.setTimeout;
-clearTimeout = sinon.timers.clearTimeout;
-setImmediate = sinon.timers.setImmediate;
-clearImmediate = sinon.timers.clearImmediate;
-setInterval = sinon.timers.setInterval;
-clearInterval = sinon.timers.clearInterval;
-Date = sinon.timers.Date;
-
-/*global sinon*/
-/**
- * Helps IE run the fake XMLHttpRequest. By defining global functions, IE allows
- * them to be overwritten at a later point. If these are not defined like
- * this, overwriting them will result in anything from an exception to browser
- * crash.
- *
- * If you don't require fake XHR to work in IE, don't include this file.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-function XMLHttpRequest() {}
-
-// Reassign the original function. Now its writable attribute
-// should be true. Hackish, I know, but it works.
-XMLHttpRequest = sinon.xhr.XMLHttpRequest || undefined;
diff --git a/test/utils/sinon/sinon-ie.js b/test/utils/sinon/sinon-ie.js
deleted file mode 100644
index 6e255ba83bd94..0000000000000
--- a/test/utils/sinon/sinon-ie.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Sinon.JS 1.8.2, 2014/02/13
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @author Contributors: https://github.com/cjohansen/Sinon.JS/blob/master/AUTHORS
- *
- * (The BSD License)
- * 
- * Copyright (c) 2010-2014, Christian Johansen, christian@cjohansen.no
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice,
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice,
- *       this list of conditions and the following disclaimer in the documentation
- *       and/or other materials provided with the distribution.
- *     * Neither the name of Christian Johansen nor the names of his contributors
- *       may be used to endorse or promote products derived from this software
- *       without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*global sinon, setTimeout, setInterval, clearTimeout, clearInterval, Date*/
-/**
- * Helps IE run the fake timers. By defining global functions, IE allows
- * them to be overwritten at a later point. If these are not defined like
- * this, overwriting them will result in anything from an exception to browser
- * crash.
- *
- * If you don't require fake timers to work in IE, don't include this file.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-function setTimeout() {}
-function clearTimeout() {}
-function setImmediate() {}
-function clearImmediate() {}
-function setInterval() {}
-function clearInterval() {}
-function Date() {}
-
-// Reassign the original functions. Now their writable attribute
-// should be true. Hackish, I know, but it works.
-setTimeout = sinon.timers.setTimeout;
-clearTimeout = sinon.timers.clearTimeout;
-setImmediate = sinon.timers.setImmediate;
-clearImmediate = sinon.timers.clearImmediate;
-setInterval = sinon.timers.setInterval;
-clearInterval = sinon.timers.clearInterval;
-Date = sinon.timers.Date;
-
-/*global sinon*/
-/**
- * Helps IE run the fake XMLHttpRequest. By defining global functions, IE allows
- * them to be overwritten at a later point. If these are not defined like
- * this, overwriting them will result in anything from an exception to browser
- * crash.
- *
- * If you don't require fake XHR to work in IE, don't include this file.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-function XMLHttpRequest() {}
-
-// Reassign the original function. Now its writable attribute
-// should be true. Hackish, I know, but it works.
-XMLHttpRequest = sinon.xhr.XMLHttpRequest || undefined;
diff --git a/test/utils/sinon/sinon-server-1.8.2.js b/test/utils/sinon/sinon-server-1.8.2.js
deleted file mode 100644
index 409c0dc16c258..0000000000000
--- a/test/utils/sinon/sinon-server-1.8.2.js
+++ /dev/null
@@ -1,1726 +0,0 @@
-/**
- * Sinon.JS 1.8.2, 2014/02/13
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @author Contributors: https://github.com/cjohansen/Sinon.JS/blob/master/AUTHORS
- *
- * (The BSD License)
- * 
- * Copyright (c) 2010-2014, Christian Johansen, christian@cjohansen.no
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice,
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice,
- *       this list of conditions and the following disclaimer in the documentation
- *       and/or other materials provided with the distribution.
- *     * Neither the name of Christian Johansen nor the names of his contributors
- *       may be used to endorse or promote products derived from this software
- *       without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*jslint eqeqeq: false, onevar: false, forin: true, nomen: false, regexp: false, plusplus: false*/
-/*global module, require, __dirname, document*/
-/**
- * Sinon core utilities. For internal use only.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-var sinon = (function (formatio) {
-    var div = typeof document != "undefined" && document.createElement("div");
-    var hasOwn = Object.prototype.hasOwnProperty;
-
-    function isDOMNode(obj) {
-        var success = false;
-
-        try {
-            obj.appendChild(div);
-            success = div.parentNode == obj;
-        } catch (e) {
-            return false;
-        } finally {
-            try {
-                obj.removeChild(div);
-            } catch (e) {
-                // Remove failed, not much we can do about that
-            }
-        }
-
-        return success;
-    }
-
-    function isElement(obj) {
-        return div && obj && obj.nodeType === 1 && isDOMNode(obj);
-    }
-
-    function isFunction(obj) {
-        return typeof obj === "function" || !!(obj && obj.constructor && obj.call && obj.apply);
-    }
-
-    function mirrorProperties(target, source) {
-        for (var prop in source) {
-            if (!hasOwn.call(target, prop)) {
-                target[prop] = source[prop];
-            }
-        }
-    }
-
-    function isRestorable (obj) {
-        return typeof obj === "function" && typeof obj.restore === "function" && obj.restore.sinon;
-    }
-
-    var sinon = {
-        wrapMethod: function wrapMethod(object, property, method) {
-            if (!object) {
-                throw new TypeError("Should wrap property of object");
-            }
-
-            if (typeof method != "function") {
-                throw new TypeError("Method wrapper should be function");
-            }
-
-            var wrappedMethod = object[property],
-                error;
-
-            if (!isFunction(wrappedMethod)) {
-                error = new TypeError("Attempted to wrap " + (typeof wrappedMethod) + " property " +
-                                    property + " as function");
-            }
-
-            if (wrappedMethod.restore && wrappedMethod.restore.sinon) {
-                error = new TypeError("Attempted to wrap " + property + " which is already wrapped");
-            }
-
-            if (wrappedMethod.calledBefore) {
-                var verb = !!wrappedMethod.returns ? "stubbed" : "spied on";
-                error = new TypeError("Attempted to wrap " + property + " which is already " + verb);
-            }
-
-            if (error) {
-                if (wrappedMethod._stack) {
-                    error.stack += '\n--------------\n' + wrappedMethod._stack;
-                }
-                throw error;
-            }
-
-            // IE 8 does not support hasOwnProperty on the window object and Firefox has a problem
-            // when using hasOwn.call on objects from other frames.
-            var owned = object.hasOwnProperty ? object.hasOwnProperty(property) : hasOwn.call(object, property);
-            object[property] = method;
-            method.displayName = property;
-            // Set up a stack trace which can be used later to find what line of
-            // code the original method was created on.
-            method._stack = (new Error('Stack Trace for original')).stack;
-
-            method.restore = function () {
-                // For prototype properties try to reset by delete first.
-                // If this fails (ex: localStorage on mobile safari) then force a reset
-                // via direct assignment.
-                if (!owned) {
-                    delete object[property];
-                }
-                if (object[property] === method) {
-                    object[property] = wrappedMethod;
-                }
-            };
-
-            method.restore.sinon = true;
-            mirrorProperties(method, wrappedMethod);
-
-            return method;
-        },
-
-        extend: function extend(target) {
-            for (var i = 1, l = arguments.length; i < l; i += 1) {
-                for (var prop in arguments[i]) {
-                    if (arguments[i].hasOwnProperty(prop)) {
-                        target[prop] = arguments[i][prop];
-                    }
-
-                    // DONT ENUM bug, only care about toString
-                    if (arguments[i].hasOwnProperty("toString") &&
-                        arguments[i].toString != target.toString) {
-                        target.toString = arguments[i].toString;
-                    }
-                }
-            }
-
-            return target;
-        },
-
-        create: function create(proto) {
-            var F = function () {};
-            F.prototype = proto;
-            return new F();
-        },
-
-        deepEqual: function deepEqual(a, b) {
-            if (sinon.match && sinon.match.isMatcher(a)) {
-                return a.test(b);
-            }
-            if (typeof a != "object" || typeof b != "object") {
-                return a === b;
-            }
-
-            if (isElement(a) || isElement(b)) {
-                return a === b;
-            }
-
-            if (a === b) {
-                return true;
-            }
-
-            if ((a === null && b !== null) || (a !== null && b === null)) {
-                return false;
-            }
-
-            var aString = Object.prototype.toString.call(a);
-            if (aString != Object.prototype.toString.call(b)) {
-                return false;
-            }
-
-            if (aString == "[object Date]") {
-                return a.valueOf() === b.valueOf();
-            }
-
-            var prop, aLength = 0, bLength = 0;
-
-            if (aString == "[object Array]" && a.length !== b.length) {
-                return false;
-            }
-
-            for (prop in a) {
-                aLength += 1;
-
-                if (!deepEqual(a[prop], b[prop])) {
-                    return false;
-                }
-            }
-
-            for (prop in b) {
-                bLength += 1;
-            }
-
-            return aLength == bLength;
-        },
-
-        functionName: function functionName(func) {
-            var name = func.displayName || func.name;
-
-            // Use function decomposition as a last resort to get function
-            // name. Does not rely on function decomposition to work - if it
-            // doesn't debugging will be slightly less informative
-            // (i.e. toString will say 'spy' rather than 'myFunc').
-            if (!name) {
-                var matches = func.toString().match(/function ([^\s\(]+)/);
-                name = matches && matches[1];
-            }
-
-            return name;
-        },
-
-        functionToString: function toString() {
-            if (this.getCall && this.callCount) {
-                var thisValue, prop, i = this.callCount;
-
-                while (i--) {
-                    thisValue = this.getCall(i).thisValue;
-
-                    for (prop in thisValue) {
-                        if (thisValue[prop] === this) {
-                            return prop;
-                        }
-                    }
-                }
-            }
-
-            return this.displayName || "sinon fake";
-        },
-
-        getConfig: function (custom) {
-            var config = {};
-            custom = custom || {};
-            var defaults = sinon.defaultConfig;
-
-            for (var prop in defaults) {
-                if (defaults.hasOwnProperty(prop)) {
-                    config[prop] = custom.hasOwnProperty(prop) ? custom[prop] : defaults[prop];
-                }
-            }
-
-            return config;
-        },
-
-        format: function (val) {
-            return "" + val;
-        },
-
-        defaultConfig: {
-            injectIntoThis: true,
-            injectInto: null,
-            properties: ["spy", "stub", "mock", "clock", "server", "requests"],
-            useFakeTimers: true,
-            useFakeServer: true
-        },
-
-        timesInWords: function timesInWords(count) {
-            return count == 1 && "once" ||
-                count == 2 && "twice" ||
-                count == 3 && "thrice" ||
-                (count || 0) + " times";
-        },
-
-        calledInOrder: function (spies) {
-            for (var i = 1, l = spies.length; i < l; i++) {
-                if (!spies[i - 1].calledBefore(spies[i]) || !spies[i].called) {
-                    return false;
-                }
-            }
-
-            return true;
-        },
-
-        orderByFirstCall: function (spies) {
-            return spies.sort(function (a, b) {
-                // uuid, won't ever be equal
-                var aCall = a.getCall(0);
-                var bCall = b.getCall(0);
-                var aId = aCall && aCall.callId || -1;
-                var bId = bCall && bCall.callId || -1;
-
-                return aId < bId ? -1 : 1;
-            });
-        },
-
-        log: function () {},
-
-        logError: function (label, err) {
-            var msg = label + " threw exception: ";
-            sinon.log(msg + "[" + err.name + "] " + err.message);
-            if (err.stack) { sinon.log(err.stack); }
-
-            setTimeout(function () {
-                err.message = msg + err.message;
-                throw err;
-            }, 0);
-        },
-
-        typeOf: function (value) {
-            if (value === null) {
-                return "null";
-            }
-            else if (value === undefined) {
-                return "undefined";
-            }
-            var string = Object.prototype.toString.call(value);
-            return string.substring(8, string.length - 1).toLowerCase();
-        },
-
-        createStubInstance: function (constructor) {
-            if (typeof constructor !== "function") {
-                throw new TypeError("The constructor should be a function.");
-            }
-            return sinon.stub(sinon.create(constructor.prototype));
-        },
-
-        restore: function (object) {
-            if (object !== null && typeof object === "object") {
-                for (var prop in object) {
-                    if (isRestorable(object[prop])) {
-                        object[prop].restore();
-                    }
-                }
-            }
-            else if (isRestorable(object)) {
-                object.restore();
-            }
-        }
-    };
-
-    var isNode = typeof module !== "undefined" && module.exports;
-    var isAMD = typeof define === 'function' && typeof define.amd === 'object' && define.amd;
-
-    if (isAMD) {
-        define(function(){
-            return sinon;
-        });
-    } else if (isNode) {
-        try {
-            formatio = require("formatio");
-        } catch (e) {}
-        module.exports = sinon;
-        module.exports.spy = require("./sinon/spy");
-        module.exports.spyCall = require("./sinon/call");
-        module.exports.behavior = require("./sinon/behavior");
-        module.exports.stub = require("./sinon/stub");
-        module.exports.mock = require("./sinon/mock");
-        module.exports.collection = require("./sinon/collection");
-        module.exports.assert = require("./sinon/assert");
-        module.exports.sandbox = require("./sinon/sandbox");
-        module.exports.test = require("./sinon/test");
-        module.exports.testCase = require("./sinon/test_case");
-        module.exports.assert = require("./sinon/assert");
-        module.exports.match = require("./sinon/match");
-    }
-
-    if (formatio) {
-        var formatter = formatio.configure({ quoteStrings: false });
-        sinon.format = function () {
-            return formatter.ascii.apply(formatter, arguments);
-        };
-    } else if (isNode) {
-        try {
-            var util = require("util");
-            sinon.format = function (value) {
-                return typeof value == "object" && value.toString === Object.prototype.toString ? util.inspect(value) : value;
-            };
-        } catch (e) {
-            /* Node, but no util module - would be very old, but better safe than
-             sorry */
-        }
-    }
-
-    return sinon;
-}(typeof formatio == "object" && formatio));
-
-/*jslint eqeqeq: false, onevar: false*/
-/*global sinon, module, require, ActiveXObject, XMLHttpRequest, DOMParser*/
-/**
- * Minimal Event interface implementation
- *
- * Original implementation by Sven Fuchs: https://gist.github.com/995028
- * Modifications and tests by Christian Johansen.
- *
- * @author Sven Fuchs (svenfuchs@artweb-design.de)
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2011 Sven Fuchs, Christian Johansen
- */
-
-if (typeof sinon == "undefined") {
-    this.sinon = {};
-}
-
-(function () {
-    var push = [].push;
-
-    sinon.Event = function Event(type, bubbles, cancelable, target) {
-        this.initEvent(type, bubbles, cancelable, target);
-    };
-
-    sinon.Event.prototype = {
-        initEvent: function(type, bubbles, cancelable, target) {
-            this.type = type;
-            this.bubbles = bubbles;
-            this.cancelable = cancelable;
-            this.target = target;
-        },
-
-        stopPropagation: function () {},
-
-        preventDefault: function () {
-            this.defaultPrevented = true;
-        }
-    };
-
-    sinon.EventTarget = {
-        addEventListener: function addEventListener(event, listener) {
-            this.eventListeners = this.eventListeners || {};
-            this.eventListeners[event] = this.eventListeners[event] || [];
-            push.call(this.eventListeners[event], listener);
-        },
-
-        removeEventListener: function removeEventListener(event, listener) {
-            var listeners = this.eventListeners && this.eventListeners[event] || [];
-
-            for (var i = 0, l = listeners.length; i < l; ++i) {
-                if (listeners[i] == listener) {
-                    return listeners.splice(i, 1);
-                }
-            }
-        },
-
-        dispatchEvent: function dispatchEvent(event) {
-            var type = event.type;
-            var listeners = this.eventListeners && this.eventListeners[type] || [];
-
-            for (var i = 0; i < listeners.length; i++) {
-                if (typeof listeners[i] == "function") {
-                    listeners[i].call(this, event);
-                } else {
-                    listeners[i].handleEvent(event);
-                }
-            }
-
-            return !!event.defaultPrevented;
-        }
-    };
-}());
-
-/**
- * @depend ../../sinon.js
- * @depend event.js
- */
-/*jslint eqeqeq: false, onevar: false*/
-/*global sinon, module, require, ActiveXObject, XMLHttpRequest, DOMParser*/
-/**
- * Fake XMLHttpRequest object
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-// wrapper for global
-(function(global) {
-    if (typeof sinon === "undefined") {
-        global.sinon = {};
-    }
-
-    var supportsProgress = typeof ProgressEvent !== "undefined";
-    var supportsCustomEvent = typeof CustomEvent !== "undefined";
-    sinon.xhr = { XMLHttpRequest: global.XMLHttpRequest };
-    var xhr = sinon.xhr;
-    xhr.GlobalXMLHttpRequest = global.XMLHttpRequest;
-    xhr.GlobalActiveXObject = global.ActiveXObject;
-    xhr.supportsActiveX = typeof xhr.GlobalActiveXObject != "undefined";
-    xhr.supportsXHR = typeof xhr.GlobalXMLHttpRequest != "undefined";
-    xhr.workingXHR = xhr.supportsXHR ? xhr.GlobalXMLHttpRequest : xhr.supportsActiveX
-                                     ? function() { return new xhr.GlobalActiveXObject("MSXML2.XMLHTTP.3.0") } : false;
-    xhr.supportsCORS = 'withCredentials' in (new sinon.xhr.GlobalXMLHttpRequest());
-
-    /*jsl:ignore*/
-    var unsafeHeaders = {
-        "Accept-Charset": true,
-        "Accept-Encoding": true,
-        "Connection": true,
-        "Content-Length": true,
-        "Cookie": true,
-        "Cookie2": true,
-        "Content-Transfer-Encoding": true,
-        "Date": true,
-        "Expect": true,
-        "Host": true,
-        "Keep-Alive": true,
-        "Referer": true,
-        "TE": true,
-        "Trailer": true,
-        "Transfer-Encoding": true,
-        "Upgrade": true,
-        "User-Agent": true,
-        "Via": true
-    };
-    /*jsl:end*/
-
-    function FakeXMLHttpRequest() {
-        this.readyState = FakeXMLHttpRequest.UNSENT;
-        this.requestHeaders = {};
-        this.requestBody = null;
-        this.status = 0;
-        this.statusText = "";
-        this.upload = new UploadProgress();
-        if (sinon.xhr.supportsCORS) {
-            this.withCredentials = false;
-        }
-
-
-        var xhr = this;
-        var events = ["loadstart", "load", "abort", "loadend"];
-
-        function addEventListener(eventName) {
-            xhr.addEventListener(eventName, function (event) {
-                var listener = xhr["on" + eventName];
-
-                if (listener && typeof listener == "function") {
-                    listener(event);
-                }
-            });
-        }
-
-        for (var i = events.length - 1; i >= 0; i--) {
-            addEventListener(events[i]);
-        }
-
-        if (typeof FakeXMLHttpRequest.onCreate == "function") {
-            FakeXMLHttpRequest.onCreate(this);
-        }
-    }
-
-    // An upload object is created for each
-    // FakeXMLHttpRequest and allows upload
-    // events to be simulated using uploadProgress
-    // and uploadError.
-    function UploadProgress() {
-        this.eventListeners = {
-            "progress": [],
-            "load": [],
-            "abort": [],
-            "error": []
-        }
-    }
-
-    UploadProgress.prototype.addEventListener = function(event, listener) {
-        this.eventListeners[event].push(listener);
-    };
-
-    UploadProgress.prototype.removeEventListener = function(event, listener) {
-        var listeners = this.eventListeners[event] || [];
-
-        for (var i = 0, l = listeners.length; i < l; ++i) {
-            if (listeners[i] == listener) {
-                return listeners.splice(i, 1);
-            }
-        }
-    };
-
-    UploadProgress.prototype.dispatchEvent = function(event) {
-        var listeners = this.eventListeners[event.type] || [];
-
-        for (var i = 0, listener; (listener = listeners[i]) != null; i++) {
-            listener(event);
-        }
-    };
-
-    function verifyState(xhr) {
-        if (xhr.readyState !== FakeXMLHttpRequest.OPENED) {
-            throw new Error("INVALID_STATE_ERR");
-        }
-
-        if (xhr.sendFlag) {
-            throw new Error("INVALID_STATE_ERR");
-        }
-    }
-
-    // filtering to enable a white-list version of Sinon FakeXhr,
-    // where whitelisted requests are passed through to real XHR
-    function each(collection, callback) {
-        if (!collection) return;
-        for (var i = 0, l = collection.length; i < l; i += 1) {
-            callback(collection[i]);
-        }
-    }
-    function some(collection, callback) {
-        for (var index = 0; index < collection.length; index++) {
-            if(callback(collection[index]) === true) return true;
-        }
-        return false;
-    }
-    // largest arity in XHR is 5 - XHR#open
-    var apply = function(obj,method,args) {
-        switch(args.length) {
-        case 0: return obj[method]();
-        case 1: return obj[method](args[0]);
-        case 2: return obj[method](args[0],args[1]);
-        case 3: return obj[method](args[0],args[1],args[2]);
-        case 4: return obj[method](args[0],args[1],args[2],args[3]);
-        case 5: return obj[method](args[0],args[1],args[2],args[3],args[4]);
-        }
-    };
-
-    FakeXMLHttpRequest.filters = [];
-    FakeXMLHttpRequest.addFilter = function(fn) {
-        this.filters.push(fn)
-    };
-    var IE6Re = /MSIE 6/;
-    FakeXMLHttpRequest.defake = function(fakeXhr,xhrArgs) {
-        var xhr = new sinon.xhr.workingXHR();
-        each(["open","setRequestHeader","send","abort","getResponseHeader",
-              "getAllResponseHeaders","addEventListener","overrideMimeType","removeEventListener"],
-             function(method) {
-                 fakeXhr[method] = function() {
-                   return apply(xhr,method,arguments);
-                 };
-             });
-
-        var copyAttrs = function(args) {
-            each(args, function(attr) {
-              try {
-                fakeXhr[attr] = xhr[attr]
-              } catch(e) {
-                if(!IE6Re.test(navigator.userAgent)) throw e;
-              }
-            });
-        };
-
-        var stateChange = function() {
-            fakeXhr.readyState = xhr.readyState;
-            if(xhr.readyState >= FakeXMLHttpRequest.HEADERS_RECEIVED) {
-                copyAttrs(["status","statusText"]);
-            }
-            if(xhr.readyState >= FakeXMLHttpRequest.LOADING) {
-                copyAttrs(["responseText"]);
-            }
-            if(xhr.readyState === FakeXMLHttpRequest.DONE) {
-                copyAttrs(["responseXML"]);
-            }
-            if(fakeXhr.onreadystatechange) fakeXhr.onreadystatechange.call(fakeXhr, { target: fakeXhr });
-        };
-        if(xhr.addEventListener) {
-          for(var event in fakeXhr.eventListeners) {
-              if(fakeXhr.eventListeners.hasOwnProperty(event)) {
-                  each(fakeXhr.eventListeners[event],function(handler) {
-                      xhr.addEventListener(event, handler);
-                  });
-              }
-          }
-          xhr.addEventListener("readystatechange",stateChange);
-        } else {
-          xhr.onreadystatechange = stateChange;
-        }
-        apply(xhr,"open",xhrArgs);
-    };
-    FakeXMLHttpRequest.useFilters = false;
-
-    function verifyRequestSent(xhr) {
-        if (xhr.readyState == FakeXMLHttpRequest.DONE) {
-            throw new Error("Request done");
-        }
-    }
-
-    function verifyHeadersReceived(xhr) {
-        if (xhr.async && xhr.readyState != FakeXMLHttpRequest.HEADERS_RECEIVED) {
-            throw new Error("No headers received");
-        }
-    }
-
-    function verifyResponseBodyType(body) {
-        if (typeof body != "string") {
-            var error = new Error("Attempted to respond to fake XMLHttpRequest with " +
-                                 body + ", which is not a string.");
-            error.name = "InvalidBodyException";
-            throw error;
-        }
-    }
-
-    sinon.extend(FakeXMLHttpRequest.prototype, sinon.EventTarget, {
-        async: true,
-
-        open: function open(method, url, async, username, password) {
-            this.method = method;
-            this.url = url;
-            this.async = typeof async == "boolean" ? async : true;
-            this.username = username;
-            this.password = password;
-            this.responseText = null;
-            this.responseXML = null;
-            this.requestHeaders = {};
-            this.sendFlag = false;
-            if(sinon.FakeXMLHttpRequest.useFilters === true) {
-                var xhrArgs = arguments;
-                var defake = some(FakeXMLHttpRequest.filters,function(filter) {
-                    return filter.apply(this,xhrArgs)
-                });
-                if (defake) {
-                  return sinon.FakeXMLHttpRequest.defake(this,arguments);
-                }
-            }
-            this.readyStateChange(FakeXMLHttpRequest.OPENED);
-        },
-
-        readyStateChange: function readyStateChange(state) {
-            this.readyState = state;
-
-            if (typeof this.onreadystatechange == "function") {
-                try {
-                    this.onreadystatechange();
-                } catch (e) {
-                    sinon.logError("Fake XHR onreadystatechange handler", e);
-                }
-            }
-
-            this.dispatchEvent(new sinon.Event("readystatechange"));
-
-            switch (this.readyState) {
-                case FakeXMLHttpRequest.DONE:
-                    this.dispatchEvent(new sinon.Event("load", false, false, this));
-                    this.dispatchEvent(new sinon.Event("loadend", false, false, this));
-                    this.upload.dispatchEvent(new sinon.Event("load", false, false, this));
-                    if (supportsProgress) {
-                        this.upload.dispatchEvent(new ProgressEvent("progress", {loaded: 100, total: 100}));
-                    }
-                    break;
-            }
-        },
-
-        setRequestHeader: function setRequestHeader(header, value) {
-            verifyState(this);
-
-            if (unsafeHeaders[header] || /^(Sec-|Proxy-)/.test(header)) {
-                throw new Error("Refused to set unsafe header \"" + header + "\"");
-            }
-
-            if (this.requestHeaders[header]) {
-                this.requestHeaders[header] += "," + value;
-            } else {
-                this.requestHeaders[header] = value;
-            }
-        },
-
-        // Helps testing
-        setResponseHeaders: function setResponseHeaders(headers) {
-            this.responseHeaders = {};
-
-            for (var header in headers) {
-                if (headers.hasOwnProperty(header)) {
-                    this.responseHeaders[header] = headers[header];
-                }
-            }
-
-            if (this.async) {
-                this.readyStateChange(FakeXMLHttpRequest.HEADERS_RECEIVED);
-            } else {
-                this.readyState = FakeXMLHttpRequest.HEADERS_RECEIVED;
-            }
-        },
-
-        // Currently treats ALL data as a DOMString (i.e. no Document)
-        send: function send(data) {
-            verifyState(this);
-
-            if (!/^(get|head)$/i.test(this.method)) {
-                if (this.requestHeaders["Content-Type"]) {
-                    var value = this.requestHeaders["Content-Type"].split(";");
-                    this.requestHeaders["Content-Type"] = value[0] + ";charset=utf-8";
-                } else {
-                    this.requestHeaders["Content-Type"] = "text/plain;charset=utf-8";
-                }
-
-                this.requestBody = data;
-            }
-
-            this.errorFlag = false;
-            this.sendFlag = this.async;
-            this.readyStateChange(FakeXMLHttpRequest.OPENED);
-
-            if (typeof this.onSend == "function") {
-                this.onSend(this);
-            }
-
-            this.dispatchEvent(new sinon.Event("loadstart", false, false, this));
-        },
-
-        abort: function abort() {
-            this.aborted = true;
-            this.responseText = null;
-            this.errorFlag = true;
-            this.requestHeaders = {};
-
-            if (this.readyState > sinon.FakeXMLHttpRequest.UNSENT && this.sendFlag) {
-                this.readyStateChange(sinon.FakeXMLHttpRequest.DONE);
-                this.sendFlag = false;
-            }
-
-            this.readyState = sinon.FakeXMLHttpRequest.UNSENT;
-
-            this.dispatchEvent(new sinon.Event("abort", false, false, this));
-
-            this.upload.dispatchEvent(new sinon.Event("abort", false, false, this));
-
-            if (typeof this.onerror === "function") {
-                this.onerror();
-            }
-        },
-
-        getResponseHeader: function getResponseHeader(header) {
-            if (this.readyState < FakeXMLHttpRequest.HEADERS_RECEIVED) {
-                return null;
-            }
-
-            if (/^Set-Cookie2?$/i.test(header)) {
-                return null;
-            }
-
-            header = header.toLowerCase();
-
-            for (var h in this.responseHeaders) {
-                if (h.toLowerCase() == header) {
-                    return this.responseHeaders[h];
-                }
-            }
-
-            return null;
-        },
-
-        getAllResponseHeaders: function getAllResponseHeaders() {
-            if (this.readyState < FakeXMLHttpRequest.HEADERS_RECEIVED) {
-                return "";
-            }
-
-            var headers = "";
-
-            for (var header in this.responseHeaders) {
-                if (this.responseHeaders.hasOwnProperty(header) &&
-                    !/^Set-Cookie2?$/i.test(header)) {
-                    headers += header + ": " + this.responseHeaders[header] + "\r\n";
-                }
-            }
-
-            return headers;
-        },
-
-        setResponseBody: function setResponseBody(body) {
-            verifyRequestSent(this);
-            verifyHeadersReceived(this);
-            verifyResponseBodyType(body);
-
-            var chunkSize = this.chunkSize || 10;
-            var index = 0;
-            this.responseText = "";
-
-            do {
-                if (this.async) {
-                    this.readyStateChange(FakeXMLHttpRequest.LOADING);
-                }
-
-                this.responseText += body.substring(index, index + chunkSize);
-                index += chunkSize;
-            } while (index < body.length);
-
-            var type = this.getResponseHeader("Content-Type");
-
-            if (this.responseText &&
-                (!type || /(text\/xml)|(application\/xml)|(\+xml)/.test(type))) {
-                try {
-                    this.responseXML = FakeXMLHttpRequest.parseXML(this.responseText);
-                } catch (e) {
-                    // Unable to parse XML - no biggie
-                }
-            }
-
-            if (this.async) {
-                this.readyStateChange(FakeXMLHttpRequest.DONE);
-            } else {
-                this.readyState = FakeXMLHttpRequest.DONE;
-            }
-        },
-
-        respond: function respond(status, headers, body) {
-            this.status = typeof status == "number" ? status : 200;
-            this.statusText = FakeXMLHttpRequest.statusCodes[this.status];
-            this.setResponseHeaders(headers || {});
-            this.setResponseBody(body || "");
-        },
-
-        uploadProgress: function uploadProgress(progressEventRaw) {
-            if (supportsProgress) {
-                this.upload.dispatchEvent(new ProgressEvent("progress", progressEventRaw));
-            }
-        },
-
-        uploadError: function uploadError(error) {
-            if (supportsCustomEvent) {
-                this.upload.dispatchEvent(new CustomEvent("error", {"detail": error}));
-            }
-        }
-    });
-
-    sinon.extend(FakeXMLHttpRequest, {
-        UNSENT: 0,
-        OPENED: 1,
-        HEADERS_RECEIVED: 2,
-        LOADING: 3,
-        DONE: 4
-    });
-
-    // Borrowed from JSpec
-    FakeXMLHttpRequest.parseXML = function parseXML(text) {
-        var xmlDoc;
-
-        if (typeof DOMParser != "undefined") {
-            var parser = new DOMParser();
-            xmlDoc = parser.parseFromString(text, "text/xml");
-        } else {
-            xmlDoc = new ActiveXObject("Microsoft.XMLDOM");
-            xmlDoc.async = "false";
-            xmlDoc.loadXML(text);
-        }
-
-        return xmlDoc;
-    };
-
-    FakeXMLHttpRequest.statusCodes = {
-        100: "Continue",
-        101: "Switching Protocols",
-        200: "OK",
-        201: "Created",
-        202: "Accepted",
-        203: "Non-Authoritative Information",
-        204: "No Content",
-        205: "Reset Content",
-        206: "Partial Content",
-        300: "Multiple Choice",
-        301: "Moved Permanently",
-        302: "Found",
-        303: "See Other",
-        304: "Not Modified",
-        305: "Use Proxy",
-        307: "Temporary Redirect",
-        400: "Bad Request",
-        401: "Unauthorized",
-        402: "Payment Required",
-        403: "Forbidden",
-        404: "Not Found",
-        405: "Method Not Allowed",
-        406: "Not Acceptable",
-        407: "Proxy Authentication Required",
-        408: "Request Timeout",
-        409: "Conflict",
-        410: "Gone",
-        411: "Length Required",
-        412: "Precondition Failed",
-        413: "Request Entity Too Large",
-        414: "Request-URI Too Long",
-        415: "Unsupported Media Type",
-        416: "Requested Range Not Satisfiable",
-        417: "Expectation Failed",
-        422: "Unprocessable Entity",
-        500: "Internal Server Error",
-        501: "Not Implemented",
-        502: "Bad Gateway",
-        503: "Service Unavailable",
-        504: "Gateway Timeout",
-        505: "HTTP Version Not Supported"
-    };
-
-    sinon.useFakeXMLHttpRequest = function () {
-        sinon.FakeXMLHttpRequest.restore = function restore(keepOnCreate) {
-            if (xhr.supportsXHR) {
-                global.XMLHttpRequest = xhr.GlobalXMLHttpRequest;
-            }
-
-            if (xhr.supportsActiveX) {
-                global.ActiveXObject = xhr.GlobalActiveXObject;
-            }
-
-            delete sinon.FakeXMLHttpRequest.restore;
-
-            if (keepOnCreate !== true) {
-                delete sinon.FakeXMLHttpRequest.onCreate;
-            }
-        };
-        if (xhr.supportsXHR) {
-            global.XMLHttpRequest = sinon.FakeXMLHttpRequest;
-        }
-
-        if (xhr.supportsActiveX) {
-            global.ActiveXObject = function ActiveXObject(objId) {
-                if (objId == "Microsoft.XMLHTTP" || /^Msxml2\.XMLHTTP/i.test(objId)) {
-
-                    return new sinon.FakeXMLHttpRequest();
-                }
-
-                return new xhr.GlobalActiveXObject(objId);
-            };
-        }
-
-        return sinon.FakeXMLHttpRequest;
-    };
-
-    sinon.FakeXMLHttpRequest = FakeXMLHttpRequest;
-
-})(typeof global === "object" ? global : this);
-
-if (typeof module !== 'undefined' && module.exports) {
-    module.exports = sinon;
-}
-
-/**
- * @depend fake_xml_http_request.js
- */
-/*jslint eqeqeq: false, onevar: false, regexp: false, plusplus: false*/
-/*global module, require, window*/
-/**
- * The Sinon "server" mimics a web server that receives requests from
- * sinon.FakeXMLHttpRequest and provides an API to respond to those requests,
- * both synchronously and asynchronously. To respond synchronuously, canned
- * answers have to be provided upfront.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-if (typeof sinon == "undefined") {
-    var sinon = {};
-}
-
-sinon.fakeServer = (function () {
-    var push = [].push;
-    function F() {}
-
-    function create(proto) {
-        F.prototype = proto;
-        return new F();
-    }
-
-    function responseArray(handler) {
-        var response = handler;
-
-        if (Object.prototype.toString.call(handler) != "[object Array]") {
-            response = [200, {}, handler];
-        }
-
-        if (typeof response[2] != "string") {
-            throw new TypeError("Fake server response body should be string, but was " +
-                                typeof response[2]);
-        }
-
-        return response;
-    }
-
-    var wloc = typeof window !== "undefined" ? window.location : {};
-    var rCurrLoc = new RegExp("^" + wloc.protocol + "//" + wloc.host);
-
-    function matchOne(response, reqMethod, reqUrl) {
-        var rmeth = response.method;
-        var matchMethod = !rmeth || rmeth.toLowerCase() == reqMethod.toLowerCase();
-        var url = response.url;
-        var matchUrl = !url || url == reqUrl || (typeof url.test == "function" && url.test(reqUrl));
-
-        return matchMethod && matchUrl;
-    }
-
-    function match(response, request) {
-        var requestUrl = request.url;
-
-        if (!/^https?:\/\//.test(requestUrl) || rCurrLoc.test(requestUrl)) {
-            requestUrl = requestUrl.replace(rCurrLoc, "");
-        }
-
-        if (matchOne(response, this.getHTTPMethod(request), requestUrl)) {
-            if (typeof response.response == "function") {
-                var ru = response.url;
-                var args = [request].concat(ru && typeof ru.exec == "function" ? ru.exec(requestUrl).slice(1) : []);
-                return response.response.apply(response, args);
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    function log(response, request) {
-        var str;
-
-        str =  "Request:\n"  + sinon.format(request)  + "\n\n";
-        str += "Response:\n" + sinon.format(response) + "\n\n";
-
-        sinon.log(str);
-    }
-
-    return {
-        create: function () {
-            var server = create(this);
-            this.xhr = sinon.useFakeXMLHttpRequest();
-            server.requests = [];
-
-            this.xhr.onCreate = function (xhrObj) {
-                server.addRequest(xhrObj);
-            };
-
-            return server;
-        },
-
-        addRequest: function addRequest(xhrObj) {
-            var server = this;
-            push.call(this.requests, xhrObj);
-
-            xhrObj.onSend = function () {
-                server.handleRequest(this);
-
-                if (server.autoRespond && !server.responding) {
-                    setTimeout(function () {
-                        server.responding = false;
-                        server.respond();
-                    }, server.autoRespondAfter || 10);
-
-                    server.responding = true;
-                }
-            };
-        },
-
-        getHTTPMethod: function getHTTPMethod(request) {
-            if (this.fakeHTTPMethods && /post/i.test(request.method)) {
-                var matches = (request.requestBody || "").match(/_method=([^\b;]+)/);
-                return !!matches ? matches[1] : request.method;
-            }
-
-            return request.method;
-        },
-
-        handleRequest: function handleRequest(xhr) {
-            if (xhr.async) {
-                if (!this.queue) {
-                    this.queue = [];
-                }
-
-                push.call(this.queue, xhr);
-            } else {
-                this.processRequest(xhr);
-            }
-        },
-
-        respondWith: function respondWith(method, url, body) {
-            if (arguments.length == 1 && typeof method != "function") {
-                this.response = responseArray(method);
-                return;
-            }
-
-            if (!this.responses) { this.responses = []; }
-
-            if (arguments.length == 1) {
-                body = method;
-                url = method = null;
-            }
-
-            if (arguments.length == 2) {
-                body = url;
-                url = method;
-                method = null;
-            }
-
-            push.call(this.responses, {
-                method: method,
-                url: url,
-                response: typeof body == "function" ? body : responseArray(body)
-            });
-        },
-
-        respond: function respond() {
-            if (arguments.length > 0) this.respondWith.apply(this, arguments);
-            var queue = this.queue || [];
-            var requests = queue.splice(0);
-            var request;
-
-            while(request = requests.shift()) {
-                this.processRequest(request);
-            }
-        },
-
-        processRequest: function processRequest(request) {
-            try {
-                if (request.aborted) {
-                    return;
-                }
-
-                var response = this.response || [404, {}, ""];
-
-                if (this.responses) {
-                    for (var l = this.responses.length, i = l - 1; i >= 0; i--) {
-                        if (match.call(this, this.responses[i], request)) {
-                            response = this.responses[i].response;
-                            break;
-                        }
-                    }
-                }
-
-                if (request.readyState != 4) {
-                    log(response, request);
-
-                    request.respond(response[0], response[1], response[2]);
-                }
-            } catch (e) {
-                sinon.logError("Fake server request processing", e);
-            }
-        },
-
-        restore: function restore() {
-            return this.xhr.restore && this.xhr.restore.apply(this.xhr, arguments);
-        }
-    };
-}());
-
-if (typeof module !== 'undefined' && module.exports) {
-    module.exports = sinon;
-}
-
-/*jslint eqeqeq: false, plusplus: false, evil: true, onevar: false, browser: true, forin: false*/
-/*global module, require, window*/
-/**
- * Fake timer API
- * setTimeout
- * setInterval
- * clearTimeout
- * clearInterval
- * tick
- * reset
- * Date
- *
- * Inspired by jsUnitMockTimeOut from JsUnit
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-if (typeof sinon == "undefined") {
-    var sinon = {};
-}
-
-(function (global) {
-    var id = 1;
-
-    function addTimer(args, recurring) {
-        if (args.length === 0) {
-            throw new Error("Function requires at least 1 parameter");
-        }
-
-        if (typeof args[0] === "undefined") {
-            throw new Error("Callback must be provided to timer calls");
-        }
-
-        var toId = id++;
-        var delay = args[1] || 0;
-
-        if (!this.timeouts) {
-            this.timeouts = {};
-        }
-
-        this.timeouts[toId] = {
-            id: toId,
-            func: args[0],
-            callAt: this.now + delay,
-            invokeArgs: Array.prototype.slice.call(args, 2)
-        };
-
-        if (recurring === true) {
-            this.timeouts[toId].interval = delay;
-        }
-
-        return toId;
-    }
-
-    function parseTime(str) {
-        if (!str) {
-            return 0;
-        }
-
-        var strings = str.split(":");
-        var l = strings.length, i = l;
-        var ms = 0, parsed;
-
-        if (l > 3 || !/^(\d\d:){0,2}\d\d?$/.test(str)) {
-            throw new Error("tick only understands numbers and 'h:m:s'");
-        }
-
-        while (i--) {
-            parsed = parseInt(strings[i], 10);
-
-            if (parsed >= 60) {
-                throw new Error("Invalid time " + str);
-            }
-
-            ms += parsed * Math.pow(60, (l - i - 1));
-        }
-
-        return ms * 1000;
-    }
-
-    function createObject(object) {
-        var newObject;
-
-        if (Object.create) {
-            newObject = Object.create(object);
-        } else {
-            var F = function () {};
-            F.prototype = object;
-            newObject = new F();
-        }
-
-        newObject.Date.clock = newObject;
-        return newObject;
-    }
-
-    sinon.clock = {
-        now: 0,
-
-        create: function create(now) {
-            var clock = createObject(this);
-
-            if (typeof now == "number") {
-                clock.now = now;
-            }
-
-            if (!!now && typeof now == "object") {
-                throw new TypeError("now should be milliseconds since UNIX epoch");
-            }
-
-            return clock;
-        },
-
-        setTimeout: function setTimeout(callback, timeout) {
-            return addTimer.call(this, arguments, false);
-        },
-
-        clearTimeout: function clearTimeout(timerId) {
-            if (!this.timeouts) {
-                this.timeouts = [];
-            }
-
-            if (timerId in this.timeouts) {
-                delete this.timeouts[timerId];
-            }
-        },
-
-        setInterval: function setInterval(callback, timeout) {
-            return addTimer.call(this, arguments, true);
-        },
-
-        clearInterval: function clearInterval(timerId) {
-            this.clearTimeout(timerId);
-        },
-
-        setImmediate: function setImmediate(callback) {
-            var passThruArgs = Array.prototype.slice.call(arguments, 1);
-
-            return addTimer.call(this, [callback, 0].concat(passThruArgs), false);
-        },
-
-        clearImmediate: function clearImmediate(timerId) {
-            this.clearTimeout(timerId);
-        },
-
-        tick: function tick(ms) {
-            ms = typeof ms == "number" ? ms : parseTime(ms);
-            var tickFrom = this.now, tickTo = this.now + ms, previous = this.now;
-            var timer = this.firstTimerInRange(tickFrom, tickTo);
-
-            var firstException;
-            while (timer && tickFrom <= tickTo) {
-                if (this.timeouts[timer.id]) {
-                    tickFrom = this.now = timer.callAt;
-                    try {
-                      this.callTimer(timer);
-                    } catch (e) {
-                      firstException = firstException || e;
-                    }
-                }
-
-                timer = this.firstTimerInRange(previous, tickTo);
-                previous = tickFrom;
-            }
-
-            this.now = tickTo;
-
-            if (firstException) {
-              throw firstException;
-            }
-
-            return this.now;
-        },
-
-        firstTimerInRange: function (from, to) {
-            var timer, smallest = null, originalTimer;
-
-            for (var id in this.timeouts) {
-                if (this.timeouts.hasOwnProperty(id)) {
-                    if (this.timeouts[id].callAt < from || this.timeouts[id].callAt > to) {
-                        continue;
-                    }
-
-                    if (smallest === null || this.timeouts[id].callAt < smallest) {
-                        originalTimer = this.timeouts[id];
-                        smallest = this.timeouts[id].callAt;
-
-                        timer = {
-                            func: this.timeouts[id].func,
-                            callAt: this.timeouts[id].callAt,
-                            interval: this.timeouts[id].interval,
-                            id: this.timeouts[id].id,
-                            invokeArgs: this.timeouts[id].invokeArgs
-                        };
-                    }
-                }
-            }
-
-            return timer || null;
-        },
-
-        callTimer: function (timer) {
-            if (typeof timer.interval == "number") {
-                this.timeouts[timer.id].callAt += timer.interval;
-            } else {
-                delete this.timeouts[timer.id];
-            }
-
-            try {
-                if (typeof timer.func == "function") {
-                    timer.func.apply(null, timer.invokeArgs);
-                } else {
-                    eval(timer.func);
-                }
-            } catch (e) {
-              var exception = e;
-            }
-
-            if (!this.timeouts[timer.id]) {
-                if (exception) {
-                  throw exception;
-                }
-                return;
-            }
-
-            if (exception) {
-              throw exception;
-            }
-        },
-
-        reset: function reset() {
-            this.timeouts = {};
-        },
-
-        Date: (function () {
-            var NativeDate = Date;
-
-            function ClockDate(year, month, date, hour, minute, second, ms) {
-                // Defensive and verbose to avoid potential harm in passing
-                // explicit undefined when user does not pass argument
-                switch (arguments.length) {
-                case 0:
-                    return new NativeDate(ClockDate.clock.now);
-                case 1:
-                    return new NativeDate(year);
-                case 2:
-                    return new NativeDate(year, month);
-                case 3:
-                    return new NativeDate(year, month, date);
-                case 4:
-                    return new NativeDate(year, month, date, hour);
-                case 5:
-                    return new NativeDate(year, month, date, hour, minute);
-                case 6:
-                    return new NativeDate(year, month, date, hour, minute, second);
-                default:
-                    return new NativeDate(year, month, date, hour, minute, second, ms);
-                }
-            }
-
-            return mirrorDateProperties(ClockDate, NativeDate);
-        }())
-    };
-
-    function mirrorDateProperties(target, source) {
-        if (source.now) {
-            target.now = function now() {
-                return target.clock.now;
-            };
-        } else {
-            delete target.now;
-        }
-
-        if (source.toSource) {
-            target.toSource = function toSource() {
-                return source.toSource();
-            };
-        } else {
-            delete target.toSource;
-        }
-
-        target.toString = function toString() {
-            return source.toString();
-        };
-
-        target.prototype = source.prototype;
-        target.parse = source.parse;
-        target.UTC = source.UTC;
-        target.prototype.toUTCString = source.prototype.toUTCString;
-
-        for (var prop in source) {
-            if (source.hasOwnProperty(prop)) {
-                target[prop] = source[prop];
-            }
-        }
-
-        return target;
-    }
-
-    var methods = ["Date", "setTimeout", "setInterval",
-                   "clearTimeout", "clearInterval"];
-
-    if (typeof global.setImmediate !== "undefined") {
-        methods.push("setImmediate");
-    }
-
-    if (typeof global.clearImmediate !== "undefined") {
-        methods.push("clearImmediate");
-    }
-
-    function restore() {
-        var method;
-
-        for (var i = 0, l = this.methods.length; i < l; i++) {
-            method = this.methods[i];
-
-            if (global[method].hadOwnProperty) {
-                global[method] = this["_" + method];
-            } else {
-                try {
-                    delete global[method];
-                } catch (e) {}
-            }
-        }
-
-        // Prevent multiple executions which will completely remove these props
-        this.methods = [];
-    }
-
-    function stubGlobal(method, clock) {
-        clock[method].hadOwnProperty = Object.prototype.hasOwnProperty.call(global, method);
-        clock["_" + method] = global[method];
-
-        if (method == "Date") {
-            var date = mirrorDateProperties(clock[method], global[method]);
-            global[method] = date;
-        } else {
-            global[method] = function () {
-                return clock[method].apply(clock, arguments);
-            };
-
-            for (var prop in clock[method]) {
-                if (clock[method].hasOwnProperty(prop)) {
-                    global[method][prop] = clock[method][prop];
-                }
-            }
-        }
-
-        global[method].clock = clock;
-    }
-
-    sinon.useFakeTimers = function useFakeTimers(now) {
-        var clock = sinon.clock.create(now);
-        clock.restore = restore;
-        clock.methods = Array.prototype.slice.call(arguments,
-                                                   typeof now == "number" ? 1 : 0);
-
-        if (clock.methods.length === 0) {
-            clock.methods = methods;
-        }
-
-        for (var i = 0, l = clock.methods.length; i < l; i++) {
-            stubGlobal(clock.methods[i], clock);
-        }
-
-        return clock;
-    };
-}(typeof global != "undefined" && typeof global !== "function" ? global : this));
-
-sinon.timers = {
-    setTimeout: setTimeout,
-    clearTimeout: clearTimeout,
-    setImmediate: (typeof setImmediate !== "undefined" ? setImmediate : undefined),
-    clearImmediate: (typeof clearImmediate !== "undefined" ? clearImmediate: undefined),
-    setInterval: setInterval,
-    clearInterval: clearInterval,
-    Date: Date
-};
-
-if (typeof module !== 'undefined' && module.exports) {
-    module.exports = sinon;
-}
-
-/**
- * @depend fake_server.js
- * @depend fake_timers.js
- */
-/*jslint browser: true, eqeqeq: false, onevar: false*/
-/*global sinon*/
-/**
- * Add-on for sinon.fakeServer that automatically handles a fake timer along with
- * the FakeXMLHttpRequest. The direct inspiration for this add-on is jQuery
- * 1.3.x, which does not use xhr object's onreadystatehandler at all - instead,
- * it polls the object for completion with setInterval. Dispite the direct
- * motivation, there is nothing jQuery-specific in this file, so it can be used
- * in any environment where the ajax implementation depends on setInterval or
- * setTimeout.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function () {
-    function Server() {}
-    Server.prototype = sinon.fakeServer;
-
-    sinon.fakeServerWithClock = new Server();
-
-    sinon.fakeServerWithClock.addRequest = function addRequest(xhr) {
-        if (xhr.async) {
-            if (typeof setTimeout.clock == "object") {
-                this.clock = setTimeout.clock;
-            } else {
-                this.clock = sinon.useFakeTimers();
-                this.resetClock = true;
-            }
-
-            if (!this.longestTimeout) {
-                var clockSetTimeout = this.clock.setTimeout;
-                var clockSetInterval = this.clock.setInterval;
-                var server = this;
-
-                this.clock.setTimeout = function (fn, timeout) {
-                    server.longestTimeout = Math.max(timeout, server.longestTimeout || 0);
-
-                    return clockSetTimeout.apply(this, arguments);
-                };
-
-                this.clock.setInterval = function (fn, timeout) {
-                    server.longestTimeout = Math.max(timeout, server.longestTimeout || 0);
-
-                    return clockSetInterval.apply(this, arguments);
-                };
-            }
-        }
-
-        return sinon.fakeServer.addRequest.call(this, xhr);
-    };
-
-    sinon.fakeServerWithClock.respond = function respond() {
-        var returnVal = sinon.fakeServer.respond.apply(this, arguments);
-
-        if (this.clock) {
-            this.clock.tick(this.longestTimeout || 0);
-            this.longestTimeout = 0;
-
-            if (this.resetClock) {
-                this.clock.restore();
-                this.resetClock = false;
-            }
-        }
-
-        return returnVal;
-    };
-
-    sinon.fakeServerWithClock.restore = function restore() {
-        if (this.clock) {
-            this.clock.restore();
-        }
-
-        return sinon.fakeServer.restore.apply(this, arguments);
-    };
-}());
-
diff --git a/test/utils/sinon/sinon-timers-1.8.2.js b/test/utils/sinon/sinon-timers-1.8.2.js
deleted file mode 100644
index b08f5c03bee30..0000000000000
--- a/test/utils/sinon/sinon-timers-1.8.2.js
+++ /dev/null
@@ -1,419 +0,0 @@
-/**
- * Sinon.JS 1.8.2, 2014/02/13
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @author Contributors: https://github.com/cjohansen/Sinon.JS/blob/master/AUTHORS
- *
- * (The BSD License)
- * 
- * Copyright (c) 2010-2014, Christian Johansen, christian@cjohansen.no
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice,
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice,
- *       this list of conditions and the following disclaimer in the documentation
- *       and/or other materials provided with the distribution.
- *     * Neither the name of Christian Johansen nor the names of his contributors
- *       may be used to endorse or promote products derived from this software
- *       without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*jslint eqeqeq: false, plusplus: false, evil: true, onevar: false, browser: true, forin: false*/
-/*global module, require, window*/
-/**
- * Fake timer API
- * setTimeout
- * setInterval
- * clearTimeout
- * clearInterval
- * tick
- * reset
- * Date
- *
- * Inspired by jsUnitMockTimeOut from JsUnit
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-if (typeof sinon == "undefined") {
-    var sinon = {};
-}
-
-(function (global) {
-    var id = 1;
-
-    function addTimer(args, recurring) {
-        if (args.length === 0) {
-            throw new Error("Function requires at least 1 parameter");
-        }
-
-        if (typeof args[0] === "undefined") {
-            throw new Error("Callback must be provided to timer calls");
-        }
-
-        var toId = id++;
-        var delay = args[1] || 0;
-
-        if (!this.timeouts) {
-            this.timeouts = {};
-        }
-
-        this.timeouts[toId] = {
-            id: toId,
-            func: args[0],
-            callAt: this.now + delay,
-            invokeArgs: Array.prototype.slice.call(args, 2)
-        };
-
-        if (recurring === true) {
-            this.timeouts[toId].interval = delay;
-        }
-
-        return toId;
-    }
-
-    function parseTime(str) {
-        if (!str) {
-            return 0;
-        }
-
-        var strings = str.split(":");
-        var l = strings.length, i = l;
-        var ms = 0, parsed;
-
-        if (l > 3 || !/^(\d\d:){0,2}\d\d?$/.test(str)) {
-            throw new Error("tick only understands numbers and 'h:m:s'");
-        }
-
-        while (i--) {
-            parsed = parseInt(strings[i], 10);
-
-            if (parsed >= 60) {
-                throw new Error("Invalid time " + str);
-            }
-
-            ms += parsed * Math.pow(60, (l - i - 1));
-        }
-
-        return ms * 1000;
-    }
-
-    function createObject(object) {
-        var newObject;
-
-        if (Object.create) {
-            newObject = Object.create(object);
-        } else {
-            var F = function () {};
-            F.prototype = object;
-            newObject = new F();
-        }
-
-        newObject.Date.clock = newObject;
-        return newObject;
-    }
-
-    sinon.clock = {
-        now: 0,
-
-        create: function create(now) {
-            var clock = createObject(this);
-
-            if (typeof now == "number") {
-                clock.now = now;
-            }
-
-            if (!!now && typeof now == "object") {
-                throw new TypeError("now should be milliseconds since UNIX epoch");
-            }
-
-            return clock;
-        },
-
-        setTimeout: function setTimeout(callback, timeout) {
-            return addTimer.call(this, arguments, false);
-        },
-
-        clearTimeout: function clearTimeout(timerId) {
-            if (!this.timeouts) {
-                this.timeouts = [];
-            }
-
-            if (timerId in this.timeouts) {
-                delete this.timeouts[timerId];
-            }
-        },
-
-        setInterval: function setInterval(callback, timeout) {
-            return addTimer.call(this, arguments, true);
-        },
-
-        clearInterval: function clearInterval(timerId) {
-            this.clearTimeout(timerId);
-        },
-
-        setImmediate: function setImmediate(callback) {
-            var passThruArgs = Array.prototype.slice.call(arguments, 1);
-
-            return addTimer.call(this, [callback, 0].concat(passThruArgs), false);
-        },
-
-        clearImmediate: function clearImmediate(timerId) {
-            this.clearTimeout(timerId);
-        },
-
-        tick: function tick(ms) {
-            ms = typeof ms == "number" ? ms : parseTime(ms);
-            var tickFrom = this.now, tickTo = this.now + ms, previous = this.now;
-            var timer = this.firstTimerInRange(tickFrom, tickTo);
-
-            var firstException;
-            while (timer && tickFrom <= tickTo) {
-                if (this.timeouts[timer.id]) {
-                    tickFrom = this.now = timer.callAt;
-                    try {
-                      this.callTimer(timer);
-                    } catch (e) {
-                      firstException = firstException || e;
-                    }
-                }
-
-                timer = this.firstTimerInRange(previous, tickTo);
-                previous = tickFrom;
-            }
-
-            this.now = tickTo;
-
-            if (firstException) {
-              throw firstException;
-            }
-
-            return this.now;
-        },
-
-        firstTimerInRange: function (from, to) {
-            var timer, smallest = null, originalTimer;
-
-            for (var id in this.timeouts) {
-                if (this.timeouts.hasOwnProperty(id)) {
-                    if (this.timeouts[id].callAt < from || this.timeouts[id].callAt > to) {
-                        continue;
-                    }
-
-                    if (smallest === null || this.timeouts[id].callAt < smallest) {
-                        originalTimer = this.timeouts[id];
-                        smallest = this.timeouts[id].callAt;
-
-                        timer = {
-                            func: this.timeouts[id].func,
-                            callAt: this.timeouts[id].callAt,
-                            interval: this.timeouts[id].interval,
-                            id: this.timeouts[id].id,
-                            invokeArgs: this.timeouts[id].invokeArgs
-                        };
-                    }
-                }
-            }
-
-            return timer || null;
-        },
-
-        callTimer: function (timer) {
-            if (typeof timer.interval == "number") {
-                this.timeouts[timer.id].callAt += timer.interval;
-            } else {
-                delete this.timeouts[timer.id];
-            }
-
-            try {
-                if (typeof timer.func == "function") {
-                    timer.func.apply(null, timer.invokeArgs);
-                } else {
-                    eval(timer.func);
-                }
-            } catch (e) {
-              var exception = e;
-            }
-
-            if (!this.timeouts[timer.id]) {
-                if (exception) {
-                  throw exception;
-                }
-                return;
-            }
-
-            if (exception) {
-              throw exception;
-            }
-        },
-
-        reset: function reset() {
-            this.timeouts = {};
-        },
-
-        Date: (function () {
-            var NativeDate = Date;
-
-            function ClockDate(year, month, date, hour, minute, second, ms) {
-                // Defensive and verbose to avoid potential harm in passing
-                // explicit undefined when user does not pass argument
-                switch (arguments.length) {
-                case 0:
-                    return new NativeDate(ClockDate.clock.now);
-                case 1:
-                    return new NativeDate(year);
-                case 2:
-                    return new NativeDate(year, month);
-                case 3:
-                    return new NativeDate(year, month, date);
-                case 4:
-                    return new NativeDate(year, month, date, hour);
-                case 5:
-                    return new NativeDate(year, month, date, hour, minute);
-                case 6:
-                    return new NativeDate(year, month, date, hour, minute, second);
-                default:
-                    return new NativeDate(year, month, date, hour, minute, second, ms);
-                }
-            }
-
-            return mirrorDateProperties(ClockDate, NativeDate);
-        }())
-    };
-
-    function mirrorDateProperties(target, source) {
-        if (source.now) {
-            target.now = function now() {
-                return target.clock.now;
-            };
-        } else {
-            delete target.now;
-        }
-
-        if (source.toSource) {
-            target.toSource = function toSource() {
-                return source.toSource();
-            };
-        } else {
-            delete target.toSource;
-        }
-
-        target.toString = function toString() {
-            return source.toString();
-        };
-
-        target.prototype = source.prototype;
-        target.parse = source.parse;
-        target.UTC = source.UTC;
-        target.prototype.toUTCString = source.prototype.toUTCString;
-
-        for (var prop in source) {
-            if (source.hasOwnProperty(prop)) {
-                target[prop] = source[prop];
-            }
-        }
-
-        return target;
-    }
-
-    var methods = ["Date", "setTimeout", "setInterval",
-                   "clearTimeout", "clearInterval"];
-
-    if (typeof global.setImmediate !== "undefined") {
-        methods.push("setImmediate");
-    }
-
-    if (typeof global.clearImmediate !== "undefined") {
-        methods.push("clearImmediate");
-    }
-
-    function restore() {
-        var method;
-
-        for (var i = 0, l = this.methods.length; i < l; i++) {
-            method = this.methods[i];
-
-            if (global[method].hadOwnProperty) {
-                global[method] = this["_" + method];
-            } else {
-                try {
-                    delete global[method];
-                } catch (e) {}
-            }
-        }
-
-        // Prevent multiple executions which will completely remove these props
-        this.methods = [];
-    }
-
-    function stubGlobal(method, clock) {
-        clock[method].hadOwnProperty = Object.prototype.hasOwnProperty.call(global, method);
-        clock["_" + method] = global[method];
-
-        if (method == "Date") {
-            var date = mirrorDateProperties(clock[method], global[method]);
-            global[method] = date;
-        } else {
-            global[method] = function () {
-                return clock[method].apply(clock, arguments);
-            };
-
-            for (var prop in clock[method]) {
-                if (clock[method].hasOwnProperty(prop)) {
-                    global[method][prop] = clock[method][prop];
-                }
-            }
-        }
-
-        global[method].clock = clock;
-    }
-
-    sinon.useFakeTimers = function useFakeTimers(now) {
-        var clock = sinon.clock.create(now);
-        clock.restore = restore;
-        clock.methods = Array.prototype.slice.call(arguments,
-                                                   typeof now == "number" ? 1 : 0);
-
-        if (clock.methods.length === 0) {
-            clock.methods = methods;
-        }
-
-        for (var i = 0, l = clock.methods.length; i < l; i++) {
-            stubGlobal(clock.methods[i], clock);
-        }
-
-        return clock;
-    };
-}(typeof global != "undefined" && typeof global !== "function" ? global : this));
-
-sinon.timers = {
-    setTimeout: setTimeout,
-    clearTimeout: clearTimeout,
-    setImmediate: (typeof setImmediate !== "undefined" ? setImmediate : undefined),
-    clearImmediate: (typeof clearImmediate !== "undefined" ? clearImmediate: undefined),
-    setInterval: setInterval,
-    clearInterval: clearInterval,
-    Date: Date
-};
-
-if (typeof module !== 'undefined' && module.exports) {
-    module.exports = sinon;
-}
diff --git a/test/utils/sinon/sinon-timers-ie-1.8.2.js b/test/utils/sinon/sinon-timers-ie-1.8.2.js
deleted file mode 100644
index 5a7509a91a85c..0000000000000
--- a/test/utils/sinon/sinon-timers-ie-1.8.2.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Sinon.JS 1.8.2, 2014/02/13
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @author Contributors: https://github.com/cjohansen/Sinon.JS/blob/master/AUTHORS
- *
- * (The BSD License)
- * 
- * Copyright (c) 2010-2014, Christian Johansen, christian@cjohansen.no
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice,
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice,
- *       this list of conditions and the following disclaimer in the documentation
- *       and/or other materials provided with the distribution.
- *     * Neither the name of Christian Johansen nor the names of his contributors
- *       may be used to endorse or promote products derived from this software
- *       without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*global sinon, setTimeout, setInterval, clearTimeout, clearInterval, Date*/
-/**
- * Helps IE run the fake timers. By defining global functions, IE allows
- * them to be overwritten at a later point. If these are not defined like
- * this, overwriting them will result in anything from an exception to browser
- * crash.
- *
- * If you don't require fake timers to work in IE, don't include this file.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-function setTimeout() {}
-function clearTimeout() {}
-function setImmediate() {}
-function clearImmediate() {}
-function setInterval() {}
-function clearInterval() {}
-function Date() {}
-
-// Reassign the original functions. Now their writable attribute
-// should be true. Hackish, I know, but it works.
-setTimeout = sinon.timers.setTimeout;
-clearTimeout = sinon.timers.clearTimeout;
-setImmediate = sinon.timers.setImmediate;
-clearImmediate = sinon.timers.clearImmediate;
-setInterval = sinon.timers.setInterval;
-clearInterval = sinon.timers.clearInterval;
-Date = sinon.timers.Date;
diff --git a/test/utils/sinon/sinon.js b/test/utils/sinon/sinon.js
deleted file mode 100644
index 657ee9e957d74..0000000000000
--- a/test/utils/sinon/sinon.js
+++ /dev/null
@@ -1,4728 +0,0 @@
-/**
- * Sinon.JS 1.8.2, 2014/02/13
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @author Contributors: https://github.com/cjohansen/Sinon.JS/blob/master/AUTHORS
- *
- * (The BSD License)
- * 
- * Copyright (c) 2010-2014, Christian Johansen, christian@cjohansen.no
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice,
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice,
- *       this list of conditions and the following disclaimer in the documentation
- *       and/or other materials provided with the distribution.
- *     * Neither the name of Christian Johansen nor the names of his contributors
- *       may be used to endorse or promote products derived from this software
- *       without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-this.sinon = (function () {
-var samsam, formatio;
-function define(mod, deps, fn) { if (mod == "samsam") { samsam = deps(); } else { formatio = fn(samsam); } }
-define.amd = true;
-((typeof define === "function" && define.amd && function (m) { define("samsam", m); }) ||
- (typeof module === "object" &&
-      function (m) { module.exports = m(); }) || // Node
- function (m) { this.samsam = m(); } // Browser globals
-)(function () {
-    var o = Object.prototype;
-    var div = typeof document !== "undefined" && document.createElement("div");
-
-    function isNaN(value) {
-        // Unlike global isNaN, this avoids type coercion
-        // typeof check avoids IE host object issues, hat tip to
-        // lodash
-        var val = value; // JsLint thinks value !== value is "weird"
-        return typeof value === "number" && value !== val;
-    }
-
-    function getClass(value) {
-        // Returns the internal [[Class]] by calling Object.prototype.toString
-        // with the provided value as this. Return value is a string, naming the
-        // internal class, e.g. "Array"
-        return o.toString.call(value).split(/[ \]]/)[1];
-    }
-
-    /**
-     * @name samsam.isArguments
-     * @param Object object
-     *
-     * Returns ``true`` if ``object`` is an ``arguments`` object,
-     * ``false`` otherwise.
-     */
-    function isArguments(object) {
-        if (typeof object !== "object" || typeof object.length !== "number" ||
-                getClass(object) === "Array") {
-            return false;
-        }
-        if (typeof object.callee == "function") { return true; }
-        try {
-            object[object.length] = 6;
-            delete object[object.length];
-        } catch (e) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * @name samsam.isElement
-     * @param Object object
-     *
-     * Returns ``true`` if ``object`` is a DOM element node. Unlike
-     * Underscore.js/lodash, this function will return ``false`` if ``object``
-     * is an *element-like* object, i.e. a regular object with a ``nodeType``
-     * property that holds the value ``1``.
-     */
-    function isElement(object) {
-        if (!object || object.nodeType !== 1 || !div) { return false; }
-        try {
-            object.appendChild(div);
-            object.removeChild(div);
-        } catch (e) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * @name samsam.keys
-     * @param Object object
-     *
-     * Return an array of own property names.
-     */
-    function keys(object) {
-        var ks = [], prop;
-        for (prop in object) {
-            if (o.hasOwnProperty.call(object, prop)) { ks.push(prop); }
-        }
-        return ks;
-    }
-
-    /**
-     * @name samsam.isDate
-     * @param Object value
-     *
-     * Returns true if the object is a ``Date``, or *date-like*. Duck typing
-     * of date objects work by checking that the object has a ``getTime``
-     * function whose return value equals the return value from the object's
-     * ``valueOf``.
-     */
-    function isDate(value) {
-        return typeof value.getTime == "function" &&
-            value.getTime() == value.valueOf();
-    }
-
-    /**
-     * @name samsam.isNegZero
-     * @param Object value
-     *
-     * Returns ``true`` if ``value`` is ``-0``.
-     */
-    function isNegZero(value) {
-        return value === 0 && 1 / value === -Infinity;
-    }
-
-    /**
-     * @name samsam.equal
-     * @param Object obj1
-     * @param Object obj2
-     *
-     * Returns ``true`` if two objects are strictly equal. Compared to
-     * ``===`` there are two exceptions:
-     *
-     *   - NaN is considered equal to NaN
-     *   - -0 and +0 are not considered equal
-     */
-    function identical(obj1, obj2) {
-        if (obj1 === obj2 || (isNaN(obj1) && isNaN(obj2))) {
-            return obj1 !== 0 || isNegZero(obj1) === isNegZero(obj2);
-        }
-    }
-
-
-    /**
-     * @name samsam.deepEqual
-     * @param Object obj1
-     * @param Object obj2
-     *
-     * Deep equal comparison. Two values are "deep equal" if:
-     *
-     *   - They are equal, according to samsam.identical
-     *   - They are both date objects representing the same time
-     *   - They are both arrays containing elements that are all deepEqual
-     *   - They are objects with the same set of properties, and each property
-     *     in ``obj1`` is deepEqual to the corresponding property in ``obj2``
-     *
-     * Supports cyclic objects.
-     */
-    function deepEqualCyclic(obj1, obj2) {
-
-        // used for cyclic comparison
-        // contain already visited objects
-        var objects1 = [],
-            objects2 = [],
-        // contain pathes (position in the object structure)
-        // of the already visited objects
-        // indexes same as in objects arrays
-            paths1 = [],
-            paths2 = [],
-        // contains combinations of already compared objects
-        // in the manner: { "$1['ref']$2['ref']": true }
-            compared = {};
-
-        /**
-         * used to check, if the value of a property is an object
-         * (cyclic logic is only needed for objects)
-         * only needed for cyclic logic
-         */
-        function isObject(value) {
-
-            if (typeof value === 'object' && value !== null &&
-                    !(value instanceof Boolean) &&
-                    !(value instanceof Date)    &&
-                    !(value instanceof Number)  &&
-                    !(value instanceof RegExp)  &&
-                    !(value instanceof String)) {
-
-                return true;
-            }
-
-            return false;
-        }
-
-        /**
-         * returns the index of the given object in the
-         * given objects array, -1 if not contained
-         * only needed for cyclic logic
-         */
-        function getIndex(objects, obj) {
-
-            var i;
-            for (i = 0; i < objects.length; i++) {
-                if (objects[i] === obj) {
-                    return i;
-                }
-            }
-
-            return -1;
-        }
-
-        // does the recursion for the deep equal check
-        return (function deepEqual(obj1, obj2, path1, path2) {
-            var type1 = typeof obj1;
-            var type2 = typeof obj2;
-
-            // == null also matches undefined
-            if (obj1 === obj2 ||
-                    isNaN(obj1) || isNaN(obj2) ||
-                    obj1 == null || obj2 == null ||
-                    type1 !== "object" || type2 !== "object") {
-
-                return identical(obj1, obj2);
-            }
-
-            // Elements are only equal if identical(expected, actual)
-            if (isElement(obj1) || isElement(obj2)) { return false; }
-
-            var isDate1 = isDate(obj1), isDate2 = isDate(obj2);
-            if (isDate1 || isDate2) {
-                if (!isDate1 || !isDate2 || obj1.getTime() !== obj2.getTime()) {
-                    return false;
-                }
-            }
-
-            if (obj1 instanceof RegExp && obj2 instanceof RegExp) {
-                if (obj1.toString() !== obj2.toString()) { return false; }
-            }
-
-            var class1 = getClass(obj1);
-            var class2 = getClass(obj2);
-            var keys1 = keys(obj1);
-            var keys2 = keys(obj2);
-
-            if (isArguments(obj1) || isArguments(obj2)) {
-                if (obj1.length !== obj2.length) { return false; }
-            } else {
-                if (type1 !== type2 || class1 !== class2 ||
-                        keys1.length !== keys2.length) {
-                    return false;
-                }
-            }
-
-            var key, i, l,
-                // following vars are used for the cyclic logic
-                value1, value2,
-                isObject1, isObject2,
-                index1, index2,
-                newPath1, newPath2;
-
-            for (i = 0, l = keys1.length; i < l; i++) {
-                key = keys1[i];
-                if (!o.hasOwnProperty.call(obj2, key)) {
-                    return false;
-                }
-
-                // Start of the cyclic logic
-
-                value1 = obj1[key];
-                value2 = obj2[key];
-
-                isObject1 = isObject(value1);
-                isObject2 = isObject(value2);
-
-                // determine, if the objects were already visited
-                // (it's faster to check for isObject first, than to
-                // get -1 from getIndex for non objects)
-                index1 = isObject1 ? getIndex(objects1, value1) : -1;
-                index2 = isObject2 ? getIndex(objects2, value2) : -1;
-
-                // determine the new pathes of the objects
-                // - for non cyclic objects the current path will be extended
-                //   by current property name
-                // - for cyclic objects the stored path is taken
-                newPath1 = index1 !== -1
-                    ? paths1[index1]
-                    : path1 + '[' + JSON.stringify(key) + ']';
-                newPath2 = index2 !== -1
-                    ? paths2[index2]
-                    : path2 + '[' + JSON.stringify(key) + ']';
-
-                // stop recursion if current objects are already compared
-                if (compared[newPath1 + newPath2]) {
-                    return true;
-                }
-
-                // remember the current objects and their pathes
-                if (index1 === -1 && isObject1) {
-                    objects1.push(value1);
-                    paths1.push(newPath1);
-                }
-                if (index2 === -1 && isObject2) {
-                    objects2.push(value2);
-                    paths2.push(newPath2);
-                }
-
-                // remember that the current objects are already compared
-                if (isObject1 && isObject2) {
-                    compared[newPath1 + newPath2] = true;
-                }
-
-                // End of cyclic logic
-
-                // neither value1 nor value2 is a cycle
-                // continue with next level
-                if (!deepEqual(value1, value2, newPath1, newPath2)) {
-                    return false;
-                }
-            }
-
-            return true;
-
-        }(obj1, obj2, '$1', '$2'));
-    }
-
-    var match;
-
-    function arrayContains(array, subset) {
-        if (subset.length === 0) { return true; }
-        var i, l, j, k;
-        for (i = 0, l = array.length; i < l; ++i) {
-            if (match(array[i], subset[0])) {
-                for (j = 0, k = subset.length; j < k; ++j) {
-                    if (!match(array[i + j], subset[j])) { return false; }
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @name samsam.match
-     * @param Object object
-     * @param Object matcher
-     *
-     * Compare arbitrary value ``object`` with matcher.
-     */
-    match = function match(object, matcher) {
-        if (matcher && typeof matcher.test === "function") {
-            return matcher.test(object);
-        }
-
-        if (typeof matcher === "function") {
-            return matcher(object) === true;
-        }
-
-        if (typeof matcher === "string") {
-            matcher = matcher.toLowerCase();
-            var notNull = typeof object === "string" || !!object;
-            return notNull &&
-                (String(object)).toLowerCase().indexOf(matcher) >= 0;
-        }
-
-        if (typeof matcher === "number") {
-            return matcher === object;
-        }
-
-        if (typeof matcher === "boolean") {
-            return matcher === object;
-        }
-
-        if (getClass(object) === "Array" && getClass(matcher) === "Array") {
-            return arrayContains(object, matcher);
-        }
-
-        if (matcher && typeof matcher === "object") {
-            var prop;
-            for (prop in matcher) {
-                if (!match(object[prop], matcher[prop])) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        throw new Error("Matcher was not a string, a number, a " +
-                        "function, a boolean or an object");
-    };
-
-    return {
-        isArguments: isArguments,
-        isElement: isElement,
-        isDate: isDate,
-        isNegZero: isNegZero,
-        identical: identical,
-        deepEqual: deepEqualCyclic,
-        match: match,
-        keys: keys
-    };
-});
-((typeof define === "function" && define.amd && function (m) {
-    define("formatio", ["samsam"], m);
-}) || (typeof module === "object" && function (m) {
-    module.exports = m(require("samsam"));
-}) || function (m) { this.formatio = m(this.samsam); }
-)(function (samsam) {
-    
-    var formatio = {
-        excludeConstructors: ["Object", /^.$/],
-        quoteStrings: true
-    };
-
-    var hasOwn = Object.prototype.hasOwnProperty;
-
-    var specialObjects = [];
-    if (typeof global !== "undefined") {
-        specialObjects.push({ object: global, value: "[object global]" });
-    }
-    if (typeof document !== "undefined") {
-        specialObjects.push({
-            object: document,
-            value: "[object HTMLDocument]"
-        });
-    }
-    if (typeof window !== "undefined") {
-        specialObjects.push({ object: window, value: "[object Window]" });
-    }
-
-    function functionName(func) {
-        if (!func) { return ""; }
-        if (func.displayName) { return func.displayName; }
-        if (func.name) { return func.name; }
-        var matches = func.toString().match(/function\s+([^\(]+)/m);
-        return (matches && matches[1]) || "";
-    }
-
-    function constructorName(f, object) {
-        var name = functionName(object && object.constructor);
-        var excludes = f.excludeConstructors ||
-                formatio.excludeConstructors || [];
-
-        var i, l;
-        for (i = 0, l = excludes.length; i < l; ++i) {
-            if (typeof excludes[i] === "string" && excludes[i] === name) {
-                return "";
-            } else if (excludes[i].test && excludes[i].test(name)) {
-                return "";
-            }
-        }
-
-        return name;
-    }
-
-    function isCircular(object, objects) {
-        if (typeof object !== "object") { return false; }
-        var i, l;
-        for (i = 0, l = objects.length; i < l; ++i) {
-            if (objects[i] === object) { return true; }
-        }
-        return false;
-    }
-
-    function ascii(f, object, processed, indent) {
-        if (typeof object === "string") {
-            var qs = f.quoteStrings;
-            var quote = typeof qs !== "boolean" || qs;
-            return processed || quote ? '"' + object + '"' : object;
-        }
-
-        if (typeof object === "function" && !(object instanceof RegExp)) {
-            return ascii.func(object);
-        }
-
-        processed = processed || [];
-
-        if (isCircular(object, processed)) { return "[Circular]"; }
-
-        if (Object.prototype.toString.call(object) === "[object Array]") {
-            return ascii.array.call(f, object, processed);
-        }
-
-        if (!object) { return String((1/object) === -Infinity ? "-0" : object); }
-        if (samsam.isElement(object)) { return ascii.element(object); }
-
-        if (typeof object.toString === "function" &&
-                object.toString !== Object.prototype.toString) {
-            return object.toString();
-        }
-
-        var i, l;
-        for (i = 0, l = specialObjects.length; i < l; i++) {
-            if (object === specialObjects[i].object) {
-                return specialObjects[i].value;
-            }
-        }
-
-        return ascii.object.call(f, object, processed, indent);
-    }
-
-    ascii.func = function (func) {
-        return "function " + functionName(func) + "() {}";
-    };
-
-    ascii.array = function (array, processed) {
-        processed = processed || [];
-        processed.push(array);
-        var i, l, pieces = [];
-        for (i = 0, l = array.length; i < l; ++i) {
-            pieces.push(ascii(this, array[i], processed));
-        }
-        return "[" + pieces.join(", ") + "]";
-    };
-
-    ascii.object = function (object, processed, indent) {
-        processed = processed || [];
-        processed.push(object);
-        indent = indent || 0;
-        var pieces = [], properties = samsam.keys(object).sort();
-        var length = 3;
-        var prop, str, obj, i, l;
-
-        for (i = 0, l = properties.length; i < l; ++i) {
-            prop = properties[i];
-            obj = object[prop];
-
-            if (isCircular(obj, processed)) {
-                str = "[Circular]";
-            } else {
-                str = ascii(this, obj, processed, indent + 2);
-            }
-
-            str = (/\s/.test(prop) ? '"' + prop + '"' : prop) + ": " + str;
-            length += str.length;
-            pieces.push(str);
-        }
-
-        var cons = constructorName(this, object);
-        var prefix = cons ? "[" + cons + "] " : "";
-        var is = "";
-        for (i = 0, l = indent; i < l; ++i) { is += " "; }
-
-        if (length + indent > 80) {
-            return prefix + "{\n  " + is + pieces.join(",\n  " + is) + "\n" +
-                is + "}";
-        }
-        return prefix + "{ " + pieces.join(", ") + " }";
-    };
-
-    ascii.element = function (element) {
-        var tagName = element.tagName.toLowerCase();
-        var attrs = element.attributes, attr, pairs = [], attrName, i, l, val;
-
-        for (i = 0, l = attrs.length; i < l; ++i) {
-            attr = attrs.item(i);
-            attrName = attr.nodeName.toLowerCase().replace("html:", "");
-            val = attr.nodeValue;
-            if (attrName !== "contenteditable" || val !== "inherit") {
-                if (!!val) { pairs.push(attrName + "=\"" + val + "\""); }
-            }
-        }
-
-        var formatted = "<" + tagName + (pairs.length > 0 ? " " : "");
-        var content = element.innerHTML;
-
-        if (content.length > 20) {
-            content = content.substr(0, 20) + "[...]";
-        }
-
-        var res = formatted + pairs.join(" ") + ">" + content +
-                "</" + tagName + ">";
-
-        return res.replace(/ contentEditable="inherit"/, "");
-    };
-
-    function Formatio(options) {
-        for (var opt in options) {
-            this[opt] = options[opt];
-        }
-    }
-
-    Formatio.prototype = {
-        functionName: functionName,
-
-        configure: function (options) {
-            return new Formatio(options);
-        },
-
-        constructorName: function (object) {
-            return constructorName(this, object);
-        },
-
-        ascii: function (object, processed, indent) {
-            return ascii(this, object, processed, indent);
-        }
-    };
-
-    return Formatio.prototype;
-});
-/*jslint eqeqeq: false, onevar: false, forin: true, nomen: false, regexp: false, plusplus: false*/
-/*global module, require, __dirname, document*/
-/**
- * Sinon core utilities. For internal use only.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-var sinon = (function (formatio) {
-    var div = typeof document != "undefined" && document.createElement("div");
-    var hasOwn = Object.prototype.hasOwnProperty;
-
-    function isDOMNode(obj) {
-        var success = false;
-
-        try {
-            obj.appendChild(div);
-            success = div.parentNode == obj;
-        } catch (e) {
-            return false;
-        } finally {
-            try {
-                obj.removeChild(div);
-            } catch (e) {
-                // Remove failed, not much we can do about that
-            }
-        }
-
-        return success;
-    }
-
-    function isElement(obj) {
-        return div && obj && obj.nodeType === 1 && isDOMNode(obj);
-    }
-
-    function isFunction(obj) {
-        return typeof obj === "function" || !!(obj && obj.constructor && obj.call && obj.apply);
-    }
-
-    function mirrorProperties(target, source) {
-        for (var prop in source) {
-            if (!hasOwn.call(target, prop)) {
-                target[prop] = source[prop];
-            }
-        }
-    }
-
-    function isRestorable (obj) {
-        return typeof obj === "function" && typeof obj.restore === "function" && obj.restore.sinon;
-    }
-
-    var sinon = {
-        wrapMethod: function wrapMethod(object, property, method) {
-            if (!object) {
-                throw new TypeError("Should wrap property of object");
-            }
-
-            if (typeof method != "function") {
-                throw new TypeError("Method wrapper should be function");
-            }
-
-            var wrappedMethod = object[property],
-                error;
-
-            if (!isFunction(wrappedMethod)) {
-                error = new TypeError("Attempted to wrap " + (typeof wrappedMethod) + " property " +
-                                    property + " as function");
-            }
-
-            if (wrappedMethod.restore && wrappedMethod.restore.sinon) {
-                error = new TypeError("Attempted to wrap " + property + " which is already wrapped");
-            }
-
-            if (wrappedMethod.calledBefore) {
-                var verb = !!wrappedMethod.returns ? "stubbed" : "spied on";
-                error = new TypeError("Attempted to wrap " + property + " which is already " + verb);
-            }
-
-            if (error) {
-                if (wrappedMethod._stack) {
-                    error.stack += '\n--------------\n' + wrappedMethod._stack;
-                }
-                throw error;
-            }
-
-            // IE 8 does not support hasOwnProperty on the window object and Firefox has a problem
-            // when using hasOwn.call on objects from other frames.
-            var owned = object.hasOwnProperty ? object.hasOwnProperty(property) : hasOwn.call(object, property);
-            object[property] = method;
-            method.displayName = property;
-            // Set up a stack trace which can be used later to find what line of
-            // code the original method was created on.
-            method._stack = (new Error('Stack Trace for original')).stack;
-
-            method.restore = function () {
-                // For prototype properties try to reset by delete first.
-                // If this fails (ex: localStorage on mobile safari) then force a reset
-                // via direct assignment.
-                if (!owned) {
-                    delete object[property];
-                }
-                if (object[property] === method) {
-                    object[property] = wrappedMethod;
-                }
-            };
-
-            method.restore.sinon = true;
-            mirrorProperties(method, wrappedMethod);
-
-            return method;
-        },
-
-        extend: function extend(target) {
-            for (var i = 1, l = arguments.length; i < l; i += 1) {
-                for (var prop in arguments[i]) {
-                    if (arguments[i].hasOwnProperty(prop)) {
-                        target[prop] = arguments[i][prop];
-                    }
-
-                    // DONT ENUM bug, only care about toString
-                    if (arguments[i].hasOwnProperty("toString") &&
-                        arguments[i].toString != target.toString) {
-                        target.toString = arguments[i].toString;
-                    }
-                }
-            }
-
-            return target;
-        },
-
-        create: function create(proto) {
-            var F = function () {};
-            F.prototype = proto;
-            return new F();
-        },
-
-        deepEqual: function deepEqual(a, b) {
-            if (sinon.match && sinon.match.isMatcher(a)) {
-                return a.test(b);
-            }
-            if (typeof a != "object" || typeof b != "object") {
-                return a === b;
-            }
-
-            if (isElement(a) || isElement(b)) {
-                return a === b;
-            }
-
-            if (a === b) {
-                return true;
-            }
-
-            if ((a === null && b !== null) || (a !== null && b === null)) {
-                return false;
-            }
-
-            var aString = Object.prototype.toString.call(a);
-            if (aString != Object.prototype.toString.call(b)) {
-                return false;
-            }
-
-            if (aString == "[object Date]") {
-                return a.valueOf() === b.valueOf();
-            }
-
-            var prop, aLength = 0, bLength = 0;
-
-            if (aString == "[object Array]" && a.length !== b.length) {
-                return false;
-            }
-
-            for (prop in a) {
-                aLength += 1;
-
-                if (!deepEqual(a[prop], b[prop])) {
-                    return false;
-                }
-            }
-
-            for (prop in b) {
-                bLength += 1;
-            }
-
-            return aLength == bLength;
-        },
-
-        functionName: function functionName(func) {
-            var name = func.displayName || func.name;
-
-            // Use function decomposition as a last resort to get function
-            // name. Does not rely on function decomposition to work - if it
-            // doesn't debugging will be slightly less informative
-            // (i.e. toString will say 'spy' rather than 'myFunc').
-            if (!name) {
-                var matches = func.toString().match(/function ([^\s\(]+)/);
-                name = matches && matches[1];
-            }
-
-            return name;
-        },
-
-        functionToString: function toString() {
-            if (this.getCall && this.callCount) {
-                var thisValue, prop, i = this.callCount;
-
-                while (i--) {
-                    thisValue = this.getCall(i).thisValue;
-
-                    for (prop in thisValue) {
-                        if (thisValue[prop] === this) {
-                            return prop;
-                        }
-                    }
-                }
-            }
-
-            return this.displayName || "sinon fake";
-        },
-
-        getConfig: function (custom) {
-            var config = {};
-            custom = custom || {};
-            var defaults = sinon.defaultConfig;
-
-            for (var prop in defaults) {
-                if (defaults.hasOwnProperty(prop)) {
-                    config[prop] = custom.hasOwnProperty(prop) ? custom[prop] : defaults[prop];
-                }
-            }
-
-            return config;
-        },
-
-        format: function (val) {
-            return "" + val;
-        },
-
-        defaultConfig: {
-            injectIntoThis: true,
-            injectInto: null,
-            properties: ["spy", "stub", "mock", "clock", "server", "requests"],
-            useFakeTimers: true,
-            useFakeServer: true
-        },
-
-        timesInWords: function timesInWords(count) {
-            return count == 1 && "once" ||
-                count == 2 && "twice" ||
-                count == 3 && "thrice" ||
-                (count || 0) + " times";
-        },
-
-        calledInOrder: function (spies) {
-            for (var i = 1, l = spies.length; i < l; i++) {
-                if (!spies[i - 1].calledBefore(spies[i]) || !spies[i].called) {
-                    return false;
-                }
-            }
-
-            return true;
-        },
-
-        orderByFirstCall: function (spies) {
-            return spies.sort(function (a, b) {
-                // uuid, won't ever be equal
-                var aCall = a.getCall(0);
-                var bCall = b.getCall(0);
-                var aId = aCall && aCall.callId || -1;
-                var bId = bCall && bCall.callId || -1;
-
-                return aId < bId ? -1 : 1;
-            });
-        },
-
-        log: function () {},
-
-        logError: function (label, err) {
-            var msg = label + " threw exception: ";
-            sinon.log(msg + "[" + err.name + "] " + err.message);
-            if (err.stack) { sinon.log(err.stack); }
-
-            setTimeout(function () {
-                err.message = msg + err.message;
-                throw err;
-            }, 0);
-        },
-
-        typeOf: function (value) {
-            if (value === null) {
-                return "null";
-            }
-            else if (value === undefined) {
-                return "undefined";
-            }
-            var string = Object.prototype.toString.call(value);
-            return string.substring(8, string.length - 1).toLowerCase();
-        },
-
-        createStubInstance: function (constructor) {
-            if (typeof constructor !== "function") {
-                throw new TypeError("The constructor should be a function.");
-            }
-            return sinon.stub(sinon.create(constructor.prototype));
-        },
-
-        restore: function (object) {
-            if (object !== null && typeof object === "object") {
-                for (var prop in object) {
-                    if (isRestorable(object[prop])) {
-                        object[prop].restore();
-                    }
-                }
-            }
-            else if (isRestorable(object)) {
-                object.restore();
-            }
-        }
-    };
-
-    var isNode = typeof module !== "undefined" && module.exports;
-    var isAMD = typeof define === 'function' && typeof define.amd === 'object' && define.amd;
-
-    if (isAMD) {
-        define(function(){
-            return sinon;
-        });
-    } else if (isNode) {
-        try {
-            formatio = require("formatio");
-        } catch (e) {}
-        module.exports = sinon;
-        module.exports.spy = require("./sinon/spy");
-        module.exports.spyCall = require("./sinon/call");
-        module.exports.behavior = require("./sinon/behavior");
-        module.exports.stub = require("./sinon/stub");
-        module.exports.mock = require("./sinon/mock");
-        module.exports.collection = require("./sinon/collection");
-        module.exports.assert = require("./sinon/assert");
-        module.exports.sandbox = require("./sinon/sandbox");
-        module.exports.test = require("./sinon/test");
-        module.exports.testCase = require("./sinon/test_case");
-        module.exports.assert = require("./sinon/assert");
-        module.exports.match = require("./sinon/match");
-    }
-
-    if (formatio) {
-        var formatter = formatio.configure({ quoteStrings: false });
-        sinon.format = function () {
-            return formatter.ascii.apply(formatter, arguments);
-        };
-    } else if (isNode) {
-        try {
-            var util = require("util");
-            sinon.format = function (value) {
-                return typeof value == "object" && value.toString === Object.prototype.toString ? util.inspect(value) : value;
-            };
-        } catch (e) {
-            /* Node, but no util module - would be very old, but better safe than
-             sorry */
-        }
-    }
-
-    return sinon;
-}(typeof formatio == "object" && formatio));
-
-/* @depend ../sinon.js */
-/*jslint eqeqeq: false, onevar: false, plusplus: false*/
-/*global module, require, sinon*/
-/**
- * Match functions
- *
- * @author Maximilian Antoni (mail@maxantoni.de)
- * @license BSD
- *
- * Copyright (c) 2012 Maximilian Antoni
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function assertType(value, type, name) {
-        var actual = sinon.typeOf(value);
-        if (actual !== type) {
-            throw new TypeError("Expected type of " + name + " to be " +
-                type + ", but was " + actual);
-        }
-    }
-
-    var matcher = {
-        toString: function () {
-            return this.message;
-        }
-    };
-
-    function isMatcher(object) {
-        return matcher.isPrototypeOf(object);
-    }
-
-    function matchObject(expectation, actual) {
-        if (actual === null || actual === undefined) {
-            return false;
-        }
-        for (var key in expectation) {
-            if (expectation.hasOwnProperty(key)) {
-                var exp = expectation[key];
-                var act = actual[key];
-                if (match.isMatcher(exp)) {
-                    if (!exp.test(act)) {
-                        return false;
-                    }
-                } else if (sinon.typeOf(exp) === "object") {
-                    if (!matchObject(exp, act)) {
-                        return false;
-                    }
-                } else if (!sinon.deepEqual(exp, act)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    matcher.or = function (m2) {
-        if (!isMatcher(m2)) {
-            throw new TypeError("Matcher expected");
-        }
-        var m1 = this;
-        var or = sinon.create(matcher);
-        or.test = function (actual) {
-            return m1.test(actual) || m2.test(actual);
-        };
-        or.message = m1.message + ".or(" + m2.message + ")";
-        return or;
-    };
-
-    matcher.and = function (m2) {
-        if (!isMatcher(m2)) {
-            throw new TypeError("Matcher expected");
-        }
-        var m1 = this;
-        var and = sinon.create(matcher);
-        and.test = function (actual) {
-            return m1.test(actual) && m2.test(actual);
-        };
-        and.message = m1.message + ".and(" + m2.message + ")";
-        return and;
-    };
-
-    var match = function (expectation, message) {
-        var m = sinon.create(matcher);
-        var type = sinon.typeOf(expectation);
-        switch (type) {
-        case "object":
-            if (typeof expectation.test === "function") {
-                m.test = function (actual) {
-                    return expectation.test(actual) === true;
-                };
-                m.message = "match(" + sinon.functionName(expectation.test) + ")";
-                return m;
-            }
-            var str = [];
-            for (var key in expectation) {
-                if (expectation.hasOwnProperty(key)) {
-                    str.push(key + ": " + expectation[key]);
-                }
-            }
-            m.test = function (actual) {
-                return matchObject(expectation, actual);
-            };
-            m.message = "match(" + str.join(", ") + ")";
-            break;
-        case "number":
-            m.test = function (actual) {
-                return expectation == actual;
-            };
-            break;
-        case "string":
-            m.test = function (actual) {
-                if (typeof actual !== "string") {
-                    return false;
-                }
-                return actual.indexOf(expectation) !== -1;
-            };
-            m.message = "match(\"" + expectation + "\")";
-            break;
-        case "regexp":
-            m.test = function (actual) {
-                if (typeof actual !== "string") {
-                    return false;
-                }
-                return expectation.test(actual);
-            };
-            break;
-        case "function":
-            m.test = expectation;
-            if (message) {
-                m.message = message;
-            } else {
-                m.message = "match(" + sinon.functionName(expectation) + ")";
-            }
-            break;
-        default:
-            m.test = function (actual) {
-              return sinon.deepEqual(expectation, actual);
-            };
-        }
-        if (!m.message) {
-            m.message = "match(" + expectation + ")";
-        }
-        return m;
-    };
-
-    match.isMatcher = isMatcher;
-
-    match.any = match(function () {
-        return true;
-    }, "any");
-
-    match.defined = match(function (actual) {
-        return actual !== null && actual !== undefined;
-    }, "defined");
-
-    match.truthy = match(function (actual) {
-        return !!actual;
-    }, "truthy");
-
-    match.falsy = match(function (actual) {
-        return !actual;
-    }, "falsy");
-
-    match.same = function (expectation) {
-        return match(function (actual) {
-            return expectation === actual;
-        }, "same(" + expectation + ")");
-    };
-
-    match.typeOf = function (type) {
-        assertType(type, "string", "type");
-        return match(function (actual) {
-            return sinon.typeOf(actual) === type;
-        }, "typeOf(\"" + type + "\")");
-    };
-
-    match.instanceOf = function (type) {
-        assertType(type, "function", "type");
-        return match(function (actual) {
-            return actual instanceof type;
-        }, "instanceOf(" + sinon.functionName(type) + ")");
-    };
-
-    function createPropertyMatcher(propertyTest, messagePrefix) {
-        return function (property, value) {
-            assertType(property, "string", "property");
-            var onlyProperty = arguments.length === 1;
-            var message = messagePrefix + "(\"" + property + "\"";
-            if (!onlyProperty) {
-                message += ", " + value;
-            }
-            message += ")";
-            return match(function (actual) {
-                if (actual === undefined || actual === null ||
-                        !propertyTest(actual, property)) {
-                    return false;
-                }
-                return onlyProperty || sinon.deepEqual(value, actual[property]);
-            }, message);
-        };
-    }
-
-    match.has = createPropertyMatcher(function (actual, property) {
-        if (typeof actual === "object") {
-            return property in actual;
-        }
-        return actual[property] !== undefined;
-    }, "has");
-
-    match.hasOwn = createPropertyMatcher(function (actual, property) {
-        return actual.hasOwnProperty(property);
-    }, "hasOwn");
-
-    match.bool = match.typeOf("boolean");
-    match.number = match.typeOf("number");
-    match.string = match.typeOf("string");
-    match.object = match.typeOf("object");
-    match.func = match.typeOf("function");
-    match.array = match.typeOf("array");
-    match.regexp = match.typeOf("regexp");
-    match.date = match.typeOf("date");
-
-    if (commonJSModule) {
-        module.exports = match;
-    } else {
-        sinon.match = match;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/**
-  * @depend ../sinon.js
-  * @depend match.js
-  */
-/*jslint eqeqeq: false, onevar: false, plusplus: false*/
-/*global module, require, sinon*/
-/**
-  * Spy calls
-  *
-  * @author Christian Johansen (christian@cjohansen.no)
-  * @author Maximilian Antoni (mail@maxantoni.de)
-  * @license BSD
-  *
-  * Copyright (c) 2010-2013 Christian Johansen
-  * Copyright (c) 2013 Maximilian Antoni
-  */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function throwYieldError(proxy, text, args) {
-        var msg = sinon.functionName(proxy) + text;
-        if (args.length) {
-            msg += " Received [" + slice.call(args).join(", ") + "]";
-        }
-        throw new Error(msg);
-    }
-
-    var slice = Array.prototype.slice;
-
-    var callProto = {
-        calledOn: function calledOn(thisValue) {
-            if (sinon.match && sinon.match.isMatcher(thisValue)) {
-                return thisValue.test(this.thisValue);
-            }
-            return this.thisValue === thisValue;
-        },
-
-        calledWith: function calledWith() {
-            for (var i = 0, l = arguments.length; i < l; i += 1) {
-                if (!sinon.deepEqual(arguments[i], this.args[i])) {
-                    return false;
-                }
-            }
-
-            return true;
-        },
-
-        calledWithMatch: function calledWithMatch() {
-            for (var i = 0, l = arguments.length; i < l; i += 1) {
-                var actual = this.args[i];
-                var expectation = arguments[i];
-                if (!sinon.match || !sinon.match(expectation).test(actual)) {
-                    return false;
-                }
-            }
-            return true;
-        },
-
-        calledWithExactly: function calledWithExactly() {
-            return arguments.length == this.args.length &&
-                this.calledWith.apply(this, arguments);
-        },
-
-        notCalledWith: function notCalledWith() {
-            return !this.calledWith.apply(this, arguments);
-        },
-
-        notCalledWithMatch: function notCalledWithMatch() {
-            return !this.calledWithMatch.apply(this, arguments);
-        },
-
-        returned: function returned(value) {
-            return sinon.deepEqual(value, this.returnValue);
-        },
-
-        threw: function threw(error) {
-            if (typeof error === "undefined" || !this.exception) {
-                return !!this.exception;
-            }
-
-            return this.exception === error || this.exception.name === error;
-        },
-
-        calledWithNew: function calledWithNew() {
-            return this.proxy.prototype && this.thisValue instanceof this.proxy;
-        },
-
-        calledBefore: function (other) {
-            return this.callId < other.callId;
-        },
-
-        calledAfter: function (other) {
-            return this.callId > other.callId;
-        },
-
-        callArg: function (pos) {
-            this.args[pos]();
-        },
-
-        callArgOn: function (pos, thisValue) {
-            this.args[pos].apply(thisValue);
-        },
-
-        callArgWith: function (pos) {
-            this.callArgOnWith.apply(this, [pos, null].concat(slice.call(arguments, 1)));
-        },
-
-        callArgOnWith: function (pos, thisValue) {
-            var args = slice.call(arguments, 2);
-            this.args[pos].apply(thisValue, args);
-        },
-
-        "yield": function () {
-            this.yieldOn.apply(this, [null].concat(slice.call(arguments, 0)));
-        },
-
-        yieldOn: function (thisValue) {
-            var args = this.args;
-            for (var i = 0, l = args.length; i < l; ++i) {
-                if (typeof args[i] === "function") {
-                    args[i].apply(thisValue, slice.call(arguments, 1));
-                    return;
-                }
-            }
-            throwYieldError(this.proxy, " cannot yield since no callback was passed.", args);
-        },
-
-        yieldTo: function (prop) {
-            this.yieldToOn.apply(this, [prop, null].concat(slice.call(arguments, 1)));
-        },
-
-        yieldToOn: function (prop, thisValue) {
-            var args = this.args;
-            for (var i = 0, l = args.length; i < l; ++i) {
-                if (args[i] && typeof args[i][prop] === "function") {
-                    args[i][prop].apply(thisValue, slice.call(arguments, 2));
-                    return;
-                }
-            }
-            throwYieldError(this.proxy, " cannot yield to '" + prop +
-                "' since no callback was passed.", args);
-        },
-
-        toString: function () {
-            var callStr = this.proxy.toString() + "(";
-            var args = [];
-
-            for (var i = 0, l = this.args.length; i < l; ++i) {
-                args.push(sinon.format(this.args[i]));
-            }
-
-            callStr = callStr + args.join(", ") + ")";
-
-            if (typeof this.returnValue != "undefined") {
-                callStr += " => " + sinon.format(this.returnValue);
-            }
-
-            if (this.exception) {
-                callStr += " !" + this.exception.name;
-
-                if (this.exception.message) {
-                    callStr += "(" + this.exception.message + ")";
-                }
-            }
-
-            return callStr;
-        }
-    };
-
-    callProto.invokeCallback = callProto.yield;
-
-    function createSpyCall(spy, thisValue, args, returnValue, exception, id) {
-        if (typeof id !== "number") {
-            throw new TypeError("Call id is not a number");
-        }
-        var proxyCall = sinon.create(callProto);
-        proxyCall.proxy = spy;
-        proxyCall.thisValue = thisValue;
-        proxyCall.args = args;
-        proxyCall.returnValue = returnValue;
-        proxyCall.exception = exception;
-        proxyCall.callId = id;
-
-        return proxyCall;
-    }
-    createSpyCall.toString = callProto.toString; // used by mocks
-
-    if (commonJSModule) {
-        module.exports = createSpyCall;
-    } else {
-        sinon.spyCall = createSpyCall;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-
-/**
-  * @depend ../sinon.js
-  * @depend call.js
-  */
-/*jslint eqeqeq: false, onevar: false, plusplus: false*/
-/*global module, require, sinon*/
-/**
-  * Spy functions
-  *
-  * @author Christian Johansen (christian@cjohansen.no)
-  * @license BSD
-  *
-  * Copyright (c) 2010-2013 Christian Johansen
-  */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-    var push = Array.prototype.push;
-    var slice = Array.prototype.slice;
-    var callId = 0;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function spy(object, property) {
-        if (!property && typeof object == "function") {
-            return spy.create(object);
-        }
-
-        if (!object && !property) {
-            return spy.create(function () { });
-        }
-
-        var method = object[property];
-        return sinon.wrapMethod(object, property, spy.create(method));
-    }
-
-    function matchingFake(fakes, args, strict) {
-        if (!fakes) {
-            return;
-        }
-
-        for (var i = 0, l = fakes.length; i < l; i++) {
-            if (fakes[i].matches(args, strict)) {
-                return fakes[i];
-            }
-        }
-    }
-
-    function incrementCallCount() {
-        this.called = true;
-        this.callCount += 1;
-        this.notCalled = false;
-        this.calledOnce = this.callCount == 1;
-        this.calledTwice = this.callCount == 2;
-        this.calledThrice = this.callCount == 3;
-    }
-
-    function createCallProperties() {
-        this.firstCall = this.getCall(0);
-        this.secondCall = this.getCall(1);
-        this.thirdCall = this.getCall(2);
-        this.lastCall = this.getCall(this.callCount - 1);
-    }
-
-    var vars = "a,b,c,d,e,f,g,h,i,j,k,l";
-    function createProxy(func) {
-        // Retain the function length:
-        var p;
-        if (func.length) {
-            eval("p = (function proxy(" + vars.substring(0, func.length * 2 - 1) +
-                ") { return p.invoke(func, this, slice.call(arguments)); });");
-        }
-        else {
-            p = function proxy() {
-                return p.invoke(func, this, slice.call(arguments));
-            };
-        }
-        return p;
-    }
-
-    var uuid = 0;
-
-    // Public API
-    var spyApi = {
-        reset: function () {
-            this.called = false;
-            this.notCalled = true;
-            this.calledOnce = false;
-            this.calledTwice = false;
-            this.calledThrice = false;
-            this.callCount = 0;
-            this.firstCall = null;
-            this.secondCall = null;
-            this.thirdCall = null;
-            this.lastCall = null;
-            this.args = [];
-            this.returnValues = [];
-            this.thisValues = [];
-            this.exceptions = [];
-            this.callIds = [];
-            if (this.fakes) {
-                for (var i = 0; i < this.fakes.length; i++) {
-                    this.fakes[i].reset();
-                }
-            }
-        },
-
-        create: function create(func) {
-            var name;
-
-            if (typeof func != "function") {
-                func = function () { };
-            } else {
-                name = sinon.functionName(func);
-            }
-
-            var proxy = createProxy(func);
-
-            sinon.extend(proxy, spy);
-            delete proxy.create;
-            sinon.extend(proxy, func);
-
-            proxy.reset();
-            proxy.prototype = func.prototype;
-            proxy.displayName = name || "spy";
-            proxy.toString = sinon.functionToString;
-            proxy._create = sinon.spy.create;
-            proxy.id = "spy#" + uuid++;
-
-            return proxy;
-        },
-
-        invoke: function invoke(func, thisValue, args) {
-            var matching = matchingFake(this.fakes, args);
-            var exception, returnValue;
-
-            incrementCallCount.call(this);
-            push.call(this.thisValues, thisValue);
-            push.call(this.args, args);
-            push.call(this.callIds, callId++);
-
-            try {
-                if (matching) {
-                    returnValue = matching.invoke(func, thisValue, args);
-                } else {
-                    returnValue = (this.func || func).apply(thisValue, args);
-                }
-
-                var thisCall = this.getCall(this.callCount - 1);
-                if (thisCall.calledWithNew() && typeof returnValue !== 'object') {
-                    returnValue = thisValue;
-                }
-            } catch (e) {
-                exception = e;
-            }
-
-            push.call(this.exceptions, exception);
-            push.call(this.returnValues, returnValue);
-
-            createCallProperties.call(this);
-
-            if (exception !== undefined) {
-                throw exception;
-            }
-
-            return returnValue;
-        },
-
-        getCall: function getCall(i) {
-            if (i < 0 || i >= this.callCount) {
-                return null;
-            }
-
-            return sinon.spyCall(this, this.thisValues[i], this.args[i],
-                                    this.returnValues[i], this.exceptions[i],
-                                    this.callIds[i]);
-        },
-
-        getCalls: function () {
-            var calls = [];
-            var i;
-
-            for (i = 0; i < this.callCount; i++) {
-                calls.push(this.getCall(i));
-            }
-
-            return calls;
-        },
-
-        calledBefore: function calledBefore(spyFn) {
-            if (!this.called) {
-                return false;
-            }
-
-            if (!spyFn.called) {
-                return true;
-            }
-
-            return this.callIds[0] < spyFn.callIds[spyFn.callIds.length - 1];
-        },
-
-        calledAfter: function calledAfter(spyFn) {
-            if (!this.called || !spyFn.called) {
-                return false;
-            }
-
-            return this.callIds[this.callCount - 1] > spyFn.callIds[spyFn.callCount - 1];
-        },
-
-        withArgs: function () {
-            var args = slice.call(arguments);
-
-            if (this.fakes) {
-                var match = matchingFake(this.fakes, args, true);
-
-                if (match) {
-                    return match;
-                }
-            } else {
-                this.fakes = [];
-            }
-
-            var original = this;
-            var fake = this._create();
-            fake.matchingAguments = args;
-            fake.parent = this;
-            push.call(this.fakes, fake);
-
-            fake.withArgs = function () {
-                return original.withArgs.apply(original, arguments);
-            };
-
-            for (var i = 0; i < this.args.length; i++) {
-                if (fake.matches(this.args[i])) {
-                    incrementCallCount.call(fake);
-                    push.call(fake.thisValues, this.thisValues[i]);
-                    push.call(fake.args, this.args[i]);
-                    push.call(fake.returnValues, this.returnValues[i]);
-                    push.call(fake.exceptions, this.exceptions[i]);
-                    push.call(fake.callIds, this.callIds[i]);
-                }
-            }
-            createCallProperties.call(fake);
-
-            return fake;
-        },
-
-        matches: function (args, strict) {
-            var margs = this.matchingAguments;
-
-            if (margs.length <= args.length &&
-                sinon.deepEqual(margs, args.slice(0, margs.length))) {
-                return !strict || margs.length == args.length;
-            }
-        },
-
-        printf: function (format) {
-            var spy = this;
-            var args = slice.call(arguments, 1);
-            var formatter;
-
-            return (format || "").replace(/%(.)/g, function (match, specifyer) {
-                formatter = spyApi.formatters[specifyer];
-
-                if (typeof formatter == "function") {
-                    return formatter.call(null, spy, args);
-                } else if (!isNaN(parseInt(specifyer, 10))) {
-                    return sinon.format(args[specifyer - 1]);
-                }
-
-                return "%" + specifyer;
-            });
-        }
-    };
-
-    function delegateToCalls(method, matchAny, actual, notCalled) {
-        spyApi[method] = function () {
-            if (!this.called) {
-                if (notCalled) {
-                    return notCalled.apply(this, arguments);
-                }
-                return false;
-            }
-
-            var currentCall;
-            var matches = 0;
-
-            for (var i = 0, l = this.callCount; i < l; i += 1) {
-                currentCall = this.getCall(i);
-
-                if (currentCall[actual || method].apply(currentCall, arguments)) {
-                    matches += 1;
-
-                    if (matchAny) {
-                        return true;
-                    }
-                }
-            }
-
-            return matches === this.callCount;
-        };
-    }
-
-    delegateToCalls("calledOn", true);
-    delegateToCalls("alwaysCalledOn", false, "calledOn");
-    delegateToCalls("calledWith", true);
-    delegateToCalls("calledWithMatch", true);
-    delegateToCalls("alwaysCalledWith", false, "calledWith");
-    delegateToCalls("alwaysCalledWithMatch", false, "calledWithMatch");
-    delegateToCalls("calledWithExactly", true);
-    delegateToCalls("alwaysCalledWithExactly", false, "calledWithExactly");
-    delegateToCalls("neverCalledWith", false, "notCalledWith",
-        function () { return true; });
-    delegateToCalls("neverCalledWithMatch", false, "notCalledWithMatch",
-        function () { return true; });
-    delegateToCalls("threw", true);
-    delegateToCalls("alwaysThrew", false, "threw");
-    delegateToCalls("returned", true);
-    delegateToCalls("alwaysReturned", false, "returned");
-    delegateToCalls("calledWithNew", true);
-    delegateToCalls("alwaysCalledWithNew", false, "calledWithNew");
-    delegateToCalls("callArg", false, "callArgWith", function () {
-        throw new Error(this.toString() + " cannot call arg since it was not yet invoked.");
-    });
-    spyApi.callArgWith = spyApi.callArg;
-    delegateToCalls("callArgOn", false, "callArgOnWith", function () {
-        throw new Error(this.toString() + " cannot call arg since it was not yet invoked.");
-    });
-    spyApi.callArgOnWith = spyApi.callArgOn;
-    delegateToCalls("yield", false, "yield", function () {
-        throw new Error(this.toString() + " cannot yield since it was not yet invoked.");
-    });
-    // "invokeCallback" is an alias for "yield" since "yield" is invalid in strict mode.
-    spyApi.invokeCallback = spyApi.yield;
-    delegateToCalls("yieldOn", false, "yieldOn", function () {
-        throw new Error(this.toString() + " cannot yield since it was not yet invoked.");
-    });
-    delegateToCalls("yieldTo", false, "yieldTo", function (property) {
-        throw new Error(this.toString() + " cannot yield to '" + property +
-            "' since it was not yet invoked.");
-    });
-    delegateToCalls("yieldToOn", false, "yieldToOn", function (property) {
-        throw new Error(this.toString() + " cannot yield to '" + property +
-            "' since it was not yet invoked.");
-    });
-
-    spyApi.formatters = {
-        "c": function (spy) {
-            return sinon.timesInWords(spy.callCount);
-        },
-
-        "n": function (spy) {
-            return spy.toString();
-        },
-
-        "C": function (spy) {
-            var calls = [];
-
-            for (var i = 0, l = spy.callCount; i < l; ++i) {
-                var stringifiedCall = "    " + spy.getCall(i).toString();
-                if (/\n/.test(calls[i - 1])) {
-                    stringifiedCall = "\n" + stringifiedCall;
-                }
-                push.call(calls, stringifiedCall);
-            }
-
-            return calls.length > 0 ? "\n" + calls.join("\n") : "";
-        },
-
-        "t": function (spy) {
-            var objects = [];
-
-            for (var i = 0, l = spy.callCount; i < l; ++i) {
-                push.call(objects, sinon.format(spy.thisValues[i]));
-            }
-
-            return objects.join(", ");
-        },
-
-        "*": function (spy, args) {
-            var formatted = [];
-
-            for (var i = 0, l = args.length; i < l; ++i) {
-                push.call(formatted, sinon.format(args[i]));
-            }
-
-            return formatted.join(", ");
-        }
-    };
-
-    sinon.extend(spy, spyApi);
-
-    spy.spyCall = sinon.spyCall;
-
-    if (commonJSModule) {
-        module.exports = spy;
-    } else {
-        sinon.spy = spy;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/**
- * @depend ../sinon.js
- */
-/*jslint eqeqeq: false, onevar: false*/
-/*global module, require, sinon, process, setImmediate, setTimeout*/
-/**
- * Stub behavior
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @author Tim Fischbach (mail@timfischbach.de)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    var slice = Array.prototype.slice;
-    var join = Array.prototype.join;
-    var proto;
-
-    var nextTick = (function () {
-        if (typeof process === "object" && typeof process.nextTick === "function") {
-            return process.nextTick;
-        } else if (typeof setImmediate === "function") {
-            return setImmediate;
-        } else {
-            return function (callback) {
-                setTimeout(callback, 0);
-            };
-        }
-    })();
-
-    function throwsException(error, message) {
-        if (typeof error == "string") {
-            this.exception = new Error(message || "");
-            this.exception.name = error;
-        } else if (!error) {
-            this.exception = new Error("Error");
-        } else {
-            this.exception = error;
-        }
-
-        return this;
-    }
-
-    function getCallback(behavior, args) {
-        var callArgAt = behavior.callArgAt;
-
-        if (callArgAt < 0) {
-            var callArgProp = behavior.callArgProp;
-
-            for (var i = 0, l = args.length; i < l; ++i) {
-                if (!callArgProp && typeof args[i] == "function") {
-                    return args[i];
-                }
-
-                if (callArgProp && args[i] &&
-                    typeof args[i][callArgProp] == "function") {
-                    return args[i][callArgProp];
-                }
-            }
-
-            return null;
-        }
-
-        return args[callArgAt];
-    }
-
-    function getCallbackError(behavior, func, args) {
-        if (behavior.callArgAt < 0) {
-            var msg;
-
-            if (behavior.callArgProp) {
-                msg = sinon.functionName(behavior.stub) +
-                    " expected to yield to '" + behavior.callArgProp +
-                    "', but no object with such a property was passed.";
-            } else {
-                msg = sinon.functionName(behavior.stub) +
-                    " expected to yield, but no callback was passed.";
-            }
-
-            if (args.length > 0) {
-                msg += " Received [" + join.call(args, ", ") + "]";
-            }
-
-            return msg;
-        }
-
-        return "argument at index " + behavior.callArgAt + " is not a function: " + func;
-    }
-
-    function callCallback(behavior, args) {
-        if (typeof behavior.callArgAt == "number") {
-            var func = getCallback(behavior, args);
-
-            if (typeof func != "function") {
-                throw new TypeError(getCallbackError(behavior, func, args));
-            }
-
-            if (behavior.callbackAsync) {
-                nextTick(function() {
-                    func.apply(behavior.callbackContext, behavior.callbackArguments);
-                });
-            } else {
-                func.apply(behavior.callbackContext, behavior.callbackArguments);
-            }
-        }
-    }
-
-    proto = {
-        create: function(stub) {
-            var behavior = sinon.extend({}, sinon.behavior);
-            delete behavior.create;
-            behavior.stub = stub;
-
-            return behavior;
-        },
-
-        isPresent: function() {
-            return (typeof this.callArgAt == 'number' ||
-                    this.exception ||
-                    typeof this.returnArgAt == 'number' ||
-                    this.returnThis ||
-                    this.returnValueDefined);
-        },
-
-        invoke: function(context, args) {
-            callCallback(this, args);
-
-            if (this.exception) {
-                throw this.exception;
-            } else if (typeof this.returnArgAt == 'number') {
-                return args[this.returnArgAt];
-            } else if (this.returnThis) {
-                return context;
-            }
-
-            return this.returnValue;
-        },
-
-        onCall: function(index) {
-            return this.stub.onCall(index);
-        },
-
-        onFirstCall: function() {
-            return this.stub.onFirstCall();
-        },
-
-        onSecondCall: function() {
-            return this.stub.onSecondCall();
-        },
-
-        onThirdCall: function() {
-            return this.stub.onThirdCall();
-        },
-
-        withArgs: function(/* arguments */) {
-            throw new Error('Defining a stub by invoking "stub.onCall(...).withArgs(...)" is not supported. ' +
-                            'Use "stub.withArgs(...).onCall(...)" to define sequential behavior for calls with certain arguments.');
-        },
-
-        callsArg: function callsArg(pos) {
-            if (typeof pos != "number") {
-                throw new TypeError("argument index is not number");
-            }
-
-            this.callArgAt = pos;
-            this.callbackArguments = [];
-            this.callbackContext = undefined;
-            this.callArgProp = undefined;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        callsArgOn: function callsArgOn(pos, context) {
-            if (typeof pos != "number") {
-                throw new TypeError("argument index is not number");
-            }
-            if (typeof context != "object") {
-                throw new TypeError("argument context is not an object");
-            }
-
-            this.callArgAt = pos;
-            this.callbackArguments = [];
-            this.callbackContext = context;
-            this.callArgProp = undefined;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        callsArgWith: function callsArgWith(pos) {
-            if (typeof pos != "number") {
-                throw new TypeError("argument index is not number");
-            }
-
-            this.callArgAt = pos;
-            this.callbackArguments = slice.call(arguments, 1);
-            this.callbackContext = undefined;
-            this.callArgProp = undefined;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        callsArgOnWith: function callsArgWith(pos, context) {
-            if (typeof pos != "number") {
-                throw new TypeError("argument index is not number");
-            }
-            if (typeof context != "object") {
-                throw new TypeError("argument context is not an object");
-            }
-
-            this.callArgAt = pos;
-            this.callbackArguments = slice.call(arguments, 2);
-            this.callbackContext = context;
-            this.callArgProp = undefined;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        yields: function () {
-            this.callArgAt = -1;
-            this.callbackArguments = slice.call(arguments, 0);
-            this.callbackContext = undefined;
-            this.callArgProp = undefined;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        yieldsOn: function (context) {
-            if (typeof context != "object") {
-                throw new TypeError("argument context is not an object");
-            }
-
-            this.callArgAt = -1;
-            this.callbackArguments = slice.call(arguments, 1);
-            this.callbackContext = context;
-            this.callArgProp = undefined;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        yieldsTo: function (prop) {
-            this.callArgAt = -1;
-            this.callbackArguments = slice.call(arguments, 1);
-            this.callbackContext = undefined;
-            this.callArgProp = prop;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-        yieldsToOn: function (prop, context) {
-            if (typeof context != "object") {
-                throw new TypeError("argument context is not an object");
-            }
-
-            this.callArgAt = -1;
-            this.callbackArguments = slice.call(arguments, 2);
-            this.callbackContext = context;
-            this.callArgProp = prop;
-            this.callbackAsync = false;
-
-            return this;
-        },
-
-
-        "throws": throwsException,
-        throwsException: throwsException,
-
-        returns: function returns(value) {
-            this.returnValue = value;
-            this.returnValueDefined = true;
-
-            return this;
-        },
-
-        returnsArg: function returnsArg(pos) {
-            if (typeof pos != "number") {
-                throw new TypeError("argument index is not number");
-            }
-
-            this.returnArgAt = pos;
-
-            return this;
-        },
-
-        returnsThis: function returnsThis() {
-            this.returnThis = true;
-
-            return this;
-        }
-    };
-
-    // create asynchronous versions of callsArg* and yields* methods
-    for (var method in proto) {
-        // need to avoid creating anotherasync versions of the newly added async methods
-        if (proto.hasOwnProperty(method) &&
-            method.match(/^(callsArg|yields)/) &&
-            !method.match(/Async/)) {
-            proto[method + 'Async'] = (function (syncFnName) {
-                return function () {
-                    var result = this[syncFnName].apply(this, arguments);
-                    this.callbackAsync = true;
-                    return result;
-                };
-            })(method);
-        }
-    }
-
-    if (commonJSModule) {
-        module.exports = proto;
-    } else {
-        sinon.behavior = proto;
-    }
-}(typeof sinon == "object" && sinon || null));
-/**
- * @depend ../sinon.js
- * @depend spy.js
- * @depend behavior.js
- */
-/*jslint eqeqeq: false, onevar: false*/
-/*global module, require, sinon*/
-/**
- * Stub functions
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function stub(object, property, func) {
-        if (!!func && typeof func != "function") {
-            throw new TypeError("Custom stub should be function");
-        }
-
-        var wrapper;
-
-        if (func) {
-            wrapper = sinon.spy && sinon.spy.create ? sinon.spy.create(func) : func;
-        } else {
-            wrapper = stub.create();
-        }
-
-        if (!object && typeof property === "undefined") {
-            return sinon.stub.create();
-        }
-
-        if (typeof property === "undefined" && typeof object == "object") {
-            for (var prop in object) {
-                if (typeof object[prop] === "function") {
-                    stub(object, prop);
-                }
-            }
-
-            return object;
-        }
-
-        return sinon.wrapMethod(object, property, wrapper);
-    }
-
-    function getDefaultBehavior(stub) {
-        return stub.defaultBehavior || getParentBehaviour(stub) || sinon.behavior.create(stub);
-    }
-
-    function getParentBehaviour(stub) {
-        return (stub.parent && getCurrentBehavior(stub.parent));
-    }
-
-    function getCurrentBehavior(stub) {
-        var behavior = stub.behaviors[stub.callCount - 1];
-        return behavior && behavior.isPresent() ? behavior : getDefaultBehavior(stub);
-    }
-
-    var uuid = 0;
-
-    sinon.extend(stub, (function () {
-        var proto = {
-            create: function create() {
-                var functionStub = function () {
-                    return getCurrentBehavior(functionStub).invoke(this, arguments);
-                };
-
-                functionStub.id = "stub#" + uuid++;
-                var orig = functionStub;
-                functionStub = sinon.spy.create(functionStub);
-                functionStub.func = orig;
-
-                sinon.extend(functionStub, stub);
-                functionStub._create = sinon.stub.create;
-                functionStub.displayName = "stub";
-                functionStub.toString = sinon.functionToString;
-
-                functionStub.defaultBehavior = null;
-                functionStub.behaviors = [];
-
-                return functionStub;
-            },
-
-            resetBehavior: function () {
-                var i;
-
-                this.defaultBehavior = null;
-                this.behaviors = [];
-
-                delete this.returnValue;
-                delete this.returnArgAt;
-                this.returnThis = false;
-
-                if (this.fakes) {
-                    for (i = 0; i < this.fakes.length; i++) {
-                        this.fakes[i].resetBehavior();
-                    }
-                }
-            },
-
-            onCall: function(index) {
-                if (!this.behaviors[index]) {
-                    this.behaviors[index] = sinon.behavior.create(this);
-                }
-
-                return this.behaviors[index];
-            },
-
-            onFirstCall: function() {
-                return this.onCall(0);
-            },
-
-            onSecondCall: function() {
-                return this.onCall(1);
-            },
-
-            onThirdCall: function() {
-                return this.onCall(2);
-            }
-        };
-
-        for (var method in sinon.behavior) {
-            if (sinon.behavior.hasOwnProperty(method) &&
-                !proto.hasOwnProperty(method) &&
-                method != 'create' &&
-                method != 'withArgs' &&
-                method != 'invoke') {
-                proto[method] = (function(behaviorMethod) {
-                    return function() {
-                        this.defaultBehavior = this.defaultBehavior || sinon.behavior.create(this);
-                        this.defaultBehavior[behaviorMethod].apply(this.defaultBehavior, arguments);
-                        return this;
-                    };
-                }(method));
-            }
-        }
-
-        return proto;
-    }()));
-
-    if (commonJSModule) {
-        module.exports = stub;
-    } else {
-        sinon.stub = stub;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/**
- * @depend ../sinon.js
- * @depend stub.js
- */
-/*jslint eqeqeq: false, onevar: false, nomen: false*/
-/*global module, require, sinon*/
-/**
- * Mock functions.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-    var push = [].push;
-    var match;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    match = sinon.match;
-
-    if (!match && commonJSModule) {
-        match = require("./match");
-    }
-
-    function mock(object) {
-        if (!object) {
-            return sinon.expectation.create("Anonymous mock");
-        }
-
-        return mock.create(object);
-    }
-
-    sinon.mock = mock;
-
-    sinon.extend(mock, (function () {
-        function each(collection, callback) {
-            if (!collection) {
-                return;
-            }
-
-            for (var i = 0, l = collection.length; i < l; i += 1) {
-                callback(collection[i]);
-            }
-        }
-
-        return {
-            create: function create(object) {
-                if (!object) {
-                    throw new TypeError("object is null");
-                }
-
-                var mockObject = sinon.extend({}, mock);
-                mockObject.object = object;
-                delete mockObject.create;
-
-                return mockObject;
-            },
-
-            expects: function expects(method) {
-                if (!method) {
-                    throw new TypeError("method is falsy");
-                }
-
-                if (!this.expectations) {
-                    this.expectations = {};
-                    this.proxies = [];
-                }
-
-                if (!this.expectations[method]) {
-                    this.expectations[method] = [];
-                    var mockObject = this;
-
-                    sinon.wrapMethod(this.object, method, function () {
-                        return mockObject.invokeMethod(method, this, arguments);
-                    });
-
-                    push.call(this.proxies, method);
-                }
-
-                var expectation = sinon.expectation.create(method);
-                push.call(this.expectations[method], expectation);
-
-                return expectation;
-            },
-
-            restore: function restore() {
-                var object = this.object;
-
-                each(this.proxies, function (proxy) {
-                    if (typeof object[proxy].restore == "function") {
-                        object[proxy].restore();
-                    }
-                });
-            },
-
-            verify: function verify() {
-                var expectations = this.expectations || {};
-                var messages = [], met = [];
-
-                each(this.proxies, function (proxy) {
-                    each(expectations[proxy], function (expectation) {
-                        if (!expectation.met()) {
-                            push.call(messages, expectation.toString());
-                        } else {
-                            push.call(met, expectation.toString());
-                        }
-                    });
-                });
-
-                this.restore();
-
-                if (messages.length > 0) {
-                    sinon.expectation.fail(messages.concat(met).join("\n"));
-                } else {
-                    sinon.expectation.pass(messages.concat(met).join("\n"));
-                }
-
-                return true;
-            },
-
-            invokeMethod: function invokeMethod(method, thisValue, args) {
-                var expectations = this.expectations && this.expectations[method];
-                var length = expectations && expectations.length || 0, i;
-
-                for (i = 0; i < length; i += 1) {
-                    if (!expectations[i].met() &&
-                        expectations[i].allowsCall(thisValue, args)) {
-                        return expectations[i].apply(thisValue, args);
-                    }
-                }
-
-                var messages = [], available, exhausted = 0;
-
-                for (i = 0; i < length; i += 1) {
-                    if (expectations[i].allowsCall(thisValue, args)) {
-                        available = available || expectations[i];
-                    } else {
-                        exhausted += 1;
-                    }
-                    push.call(messages, "    " + expectations[i].toString());
-                }
-
-                if (exhausted === 0) {
-                    return available.apply(thisValue, args);
-                }
-
-                messages.unshift("Unexpected call: " + sinon.spyCall.toString.call({
-                    proxy: method,
-                    args: args
-                }));
-
-                sinon.expectation.fail(messages.join("\n"));
-            }
-        };
-    }()));
-
-    var times = sinon.timesInWords;
-
-    sinon.expectation = (function () {
-        var slice = Array.prototype.slice;
-        var _invoke = sinon.spy.invoke;
-
-        function callCountInWords(callCount) {
-            if (callCount == 0) {
-                return "never called";
-            } else {
-                return "called " + times(callCount);
-            }
-        }
-
-        function expectedCallCountInWords(expectation) {
-            var min = expectation.minCalls;
-            var max = expectation.maxCalls;
-
-            if (typeof min == "number" && typeof max == "number") {
-                var str = times(min);
-
-                if (min != max) {
-                    str = "at least " + str + " and at most " + times(max);
-                }
-
-                return str;
-            }
-
-            if (typeof min == "number") {
-                return "at least " + times(min);
-            }
-
-            return "at most " + times(max);
-        }
-
-        function receivedMinCalls(expectation) {
-            var hasMinLimit = typeof expectation.minCalls == "number";
-            return !hasMinLimit || expectation.callCount >= expectation.minCalls;
-        }
-
-        function receivedMaxCalls(expectation) {
-            if (typeof expectation.maxCalls != "number") {
-                return false;
-            }
-
-            return expectation.callCount == expectation.maxCalls;
-        }
-
-        function verifyMatcher(possibleMatcher, arg){
-            if (match && match.isMatcher(possibleMatcher)) {
-                return possibleMatcher.test(arg);
-            } else {
-                return true;
-            }
-        }
-
-        return {
-            minCalls: 1,
-            maxCalls: 1,
-
-            create: function create(methodName) {
-                var expectation = sinon.extend(sinon.stub.create(), sinon.expectation);
-                delete expectation.create;
-                expectation.method = methodName;
-
-                return expectation;
-            },
-
-            invoke: function invoke(func, thisValue, args) {
-                this.verifyCallAllowed(thisValue, args);
-
-                return _invoke.apply(this, arguments);
-            },
-
-            atLeast: function atLeast(num) {
-                if (typeof num != "number") {
-                    throw new TypeError("'" + num + "' is not number");
-                }
-
-                if (!this.limitsSet) {
-                    this.maxCalls = null;
-                    this.limitsSet = true;
-                }
-
-                this.minCalls = num;
-
-                return this;
-            },
-
-            atMost: function atMost(num) {
-                if (typeof num != "number") {
-                    throw new TypeError("'" + num + "' is not number");
-                }
-
-                if (!this.limitsSet) {
-                    this.minCalls = null;
-                    this.limitsSet = true;
-                }
-
-                this.maxCalls = num;
-
-                return this;
-            },
-
-            never: function never() {
-                return this.exactly(0);
-            },
-
-            once: function once() {
-                return this.exactly(1);
-            },
-
-            twice: function twice() {
-                return this.exactly(2);
-            },
-
-            thrice: function thrice() {
-                return this.exactly(3);
-            },
-
-            exactly: function exactly(num) {
-                if (typeof num != "number") {
-                    throw new TypeError("'" + num + "' is not a number");
-                }
-
-                this.atLeast(num);
-                return this.atMost(num);
-            },
-
-            met: function met() {
-                return !this.failed && receivedMinCalls(this);
-            },
-
-            verifyCallAllowed: function verifyCallAllowed(thisValue, args) {
-                if (receivedMaxCalls(this)) {
-                    this.failed = true;
-                    sinon.expectation.fail(this.method + " already called " + times(this.maxCalls));
-                }
-
-                if ("expectedThis" in this && this.expectedThis !== thisValue) {
-                    sinon.expectation.fail(this.method + " called with " + thisValue + " as thisValue, expected " +
-                        this.expectedThis);
-                }
-
-                if (!("expectedArguments" in this)) {
-                    return;
-                }
-
-                if (!args) {
-                    sinon.expectation.fail(this.method + " received no arguments, expected " +
-                        sinon.format(this.expectedArguments));
-                }
-
-                if (args.length < this.expectedArguments.length) {
-                    sinon.expectation.fail(this.method + " received too few arguments (" + sinon.format(args) +
-                        "), expected " + sinon.format(this.expectedArguments));
-                }
-
-                if (this.expectsExactArgCount &&
-                    args.length != this.expectedArguments.length) {
-                    sinon.expectation.fail(this.method + " received too many arguments (" + sinon.format(args) +
-                        "), expected " + sinon.format(this.expectedArguments));
-                }
-
-                for (var i = 0, l = this.expectedArguments.length; i < l; i += 1) {
-
-                    if (!verifyMatcher(this.expectedArguments[i],args[i])) {
-                        sinon.expectation.fail(this.method + " received wrong arguments " + sinon.format(args) +
-                            ", didn't match " + this.expectedArguments.toString());
-                    }
-
-                    if (!sinon.deepEqual(this.expectedArguments[i], args[i])) {
-                        sinon.expectation.fail(this.method + " received wrong arguments " + sinon.format(args) +
-                            ", expected " + sinon.format(this.expectedArguments));
-                    }
-                }
-            },
-
-            allowsCall: function allowsCall(thisValue, args) {
-                if (this.met() && receivedMaxCalls(this)) {
-                    return false;
-                }
-
-                if ("expectedThis" in this && this.expectedThis !== thisValue) {
-                    return false;
-                }
-
-                if (!("expectedArguments" in this)) {
-                    return true;
-                }
-
-                args = args || [];
-
-                if (args.length < this.expectedArguments.length) {
-                    return false;
-                }
-
-                if (this.expectsExactArgCount &&
-                    args.length != this.expectedArguments.length) {
-                    return false;
-                }
-
-                for (var i = 0, l = this.expectedArguments.length; i < l; i += 1) {
-                    if (!verifyMatcher(this.expectedArguments[i],args[i])) {
-                        return false;
-                    }
-
-                    if (!sinon.deepEqual(this.expectedArguments[i], args[i])) {
-                        return false;
-                    }
-                }
-
-                return true;
-            },
-
-            withArgs: function withArgs() {
-                this.expectedArguments = slice.call(arguments);
-                return this;
-            },
-
-            withExactArgs: function withExactArgs() {
-                this.withArgs.apply(this, arguments);
-                this.expectsExactArgCount = true;
-                return this;
-            },
-
-            on: function on(thisValue) {
-                this.expectedThis = thisValue;
-                return this;
-            },
-
-            toString: function () {
-                var args = (this.expectedArguments || []).slice();
-
-                if (!this.expectsExactArgCount) {
-                    push.call(args, "[...]");
-                }
-
-                var callStr = sinon.spyCall.toString.call({
-                    proxy: this.method || "anonymous mock expectation",
-                    args: args
-                });
-
-                var message = callStr.replace(", [...", "[, ...") + " " +
-                    expectedCallCountInWords(this);
-
-                if (this.met()) {
-                    return "Expectation met: " + message;
-                }
-
-                return "Expected " + message + " (" +
-                    callCountInWords(this.callCount) + ")";
-            },
-
-            verify: function verify() {
-                if (!this.met()) {
-                    sinon.expectation.fail(this.toString());
-                } else {
-                    sinon.expectation.pass(this.toString());
-                }
-
-                return true;
-            },
-
-            pass: function(message) {
-              sinon.assert.pass(message);
-            },
-            fail: function (message) {
-                var exception = new Error(message);
-                exception.name = "ExpectationError";
-
-                throw exception;
-            }
-        };
-    }());
-
-    if (commonJSModule) {
-        module.exports = mock;
-    } else {
-        sinon.mock = mock;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/**
- * @depend ../sinon.js
- * @depend stub.js
- * @depend mock.js
- */
-/*jslint eqeqeq: false, onevar: false, forin: true*/
-/*global module, require, sinon*/
-/**
- * Collections of stubs, spies and mocks.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-    var push = [].push;
-    var hasOwnProperty = Object.prototype.hasOwnProperty;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function getFakes(fakeCollection) {
-        if (!fakeCollection.fakes) {
-            fakeCollection.fakes = [];
-        }
-
-        return fakeCollection.fakes;
-    }
-
-    function each(fakeCollection, method) {
-        var fakes = getFakes(fakeCollection);
-
-        for (var i = 0, l = fakes.length; i < l; i += 1) {
-            if (typeof fakes[i][method] == "function") {
-                fakes[i][method]();
-            }
-        }
-    }
-
-    function compact(fakeCollection) {
-        var fakes = getFakes(fakeCollection);
-        var i = 0;
-        while (i < fakes.length) {
-          fakes.splice(i, 1);
-        }
-    }
-
-    var collection = {
-        verify: function resolve() {
-            each(this, "verify");
-        },
-
-        restore: function restore() {
-            each(this, "restore");
-            compact(this);
-        },
-
-        verifyAndRestore: function verifyAndRestore() {
-            var exception;
-
-            try {
-                this.verify();
-            } catch (e) {
-                exception = e;
-            }
-
-            this.restore();
-
-            if (exception) {
-                throw exception;
-            }
-        },
-
-        add: function add(fake) {
-            push.call(getFakes(this), fake);
-            return fake;
-        },
-
-        spy: function spy() {
-            return this.add(sinon.spy.apply(sinon, arguments));
-        },
-
-        stub: function stub(object, property, value) {
-            if (property) {
-                var original = object[property];
-
-                if (typeof original != "function") {
-                    if (!hasOwnProperty.call(object, property)) {
-                        throw new TypeError("Cannot stub non-existent own property " + property);
-                    }
-
-                    object[property] = value;
-
-                    return this.add({
-                        restore: function () {
-                            object[property] = original;
-                        }
-                    });
-                }
-            }
-            if (!property && !!object && typeof object == "object") {
-                var stubbedObj = sinon.stub.apply(sinon, arguments);
-
-                for (var prop in stubbedObj) {
-                    if (typeof stubbedObj[prop] === "function") {
-                        this.add(stubbedObj[prop]);
-                    }
-                }
-
-                return stubbedObj;
-            }
-
-            return this.add(sinon.stub.apply(sinon, arguments));
-        },
-
-        mock: function mock() {
-            return this.add(sinon.mock.apply(sinon, arguments));
-        },
-
-        inject: function inject(obj) {
-            var col = this;
-
-            obj.spy = function () {
-                return col.spy.apply(col, arguments);
-            };
-
-            obj.stub = function () {
-                return col.stub.apply(col, arguments);
-            };
-
-            obj.mock = function () {
-                return col.mock.apply(col, arguments);
-            };
-
-            return obj;
-        }
-    };
-
-    if (commonJSModule) {
-        module.exports = collection;
-    } else {
-        sinon.collection = collection;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/*jslint eqeqeq: false, plusplus: false, evil: true, onevar: false, browser: true, forin: false*/
-/*global module, require, window*/
-/**
- * Fake timer API
- * setTimeout
- * setInterval
- * clearTimeout
- * clearInterval
- * tick
- * reset
- * Date
- *
- * Inspired by jsUnitMockTimeOut from JsUnit
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-if (typeof sinon == "undefined") {
-    var sinon = {};
-}
-
-(function (global) {
-    var id = 1;
-
-    function addTimer(args, recurring) {
-        if (args.length === 0) {
-            throw new Error("Function requires at least 1 parameter");
-        }
-
-        if (typeof args[0] === "undefined") {
-            throw new Error("Callback must be provided to timer calls");
-        }
-
-        var toId = id++;
-        var delay = args[1] || 0;
-
-        if (!this.timeouts) {
-            this.timeouts = {};
-        }
-
-        this.timeouts[toId] = {
-            id: toId,
-            func: args[0],
-            callAt: this.now + delay,
-            invokeArgs: Array.prototype.slice.call(args, 2)
-        };
-
-        if (recurring === true) {
-            this.timeouts[toId].interval = delay;
-        }
-
-        return toId;
-    }
-
-    function parseTime(str) {
-        if (!str) {
-            return 0;
-        }
-
-        var strings = str.split(":");
-        var l = strings.length, i = l;
-        var ms = 0, parsed;
-
-        if (l > 3 || !/^(\d\d:){0,2}\d\d?$/.test(str)) {
-            throw new Error("tick only understands numbers and 'h:m:s'");
-        }
-
-        while (i--) {
-            parsed = parseInt(strings[i], 10);
-
-            if (parsed >= 60) {
-                throw new Error("Invalid time " + str);
-            }
-
-            ms += parsed * Math.pow(60, (l - i - 1));
-        }
-
-        return ms * 1000;
-    }
-
-    function createObject(object) {
-        var newObject;
-
-        if (Object.create) {
-            newObject = Object.create(object);
-        } else {
-            var F = function () {};
-            F.prototype = object;
-            newObject = new F();
-        }
-
-        newObject.Date.clock = newObject;
-        return newObject;
-    }
-
-    sinon.clock = {
-        now: 0,
-
-        create: function create(now) {
-            var clock = createObject(this);
-
-            if (typeof now == "number") {
-                clock.now = now;
-            }
-
-            if (!!now && typeof now == "object") {
-                throw new TypeError("now should be milliseconds since UNIX epoch");
-            }
-
-            return clock;
-        },
-
-        setTimeout: function setTimeout(callback, timeout) {
-            return addTimer.call(this, arguments, false);
-        },
-
-        clearTimeout: function clearTimeout(timerId) {
-            if (!this.timeouts) {
-                this.timeouts = [];
-            }
-
-            if (timerId in this.timeouts) {
-                delete this.timeouts[timerId];
-            }
-        },
-
-        setInterval: function setInterval(callback, timeout) {
-            return addTimer.call(this, arguments, true);
-        },
-
-        clearInterval: function clearInterval(timerId) {
-            this.clearTimeout(timerId);
-        },
-
-        setImmediate: function setImmediate(callback) {
-            var passThruArgs = Array.prototype.slice.call(arguments, 1);
-
-            return addTimer.call(this, [callback, 0].concat(passThruArgs), false);
-        },
-
-        clearImmediate: function clearImmediate(timerId) {
-            this.clearTimeout(timerId);
-        },
-
-        tick: function tick(ms) {
-            ms = typeof ms == "number" ? ms : parseTime(ms);
-            var tickFrom = this.now, tickTo = this.now + ms, previous = this.now;
-            var timer = this.firstTimerInRange(tickFrom, tickTo);
-
-            var firstException;
-            while (timer && tickFrom <= tickTo) {
-                if (this.timeouts[timer.id]) {
-                    tickFrom = this.now = timer.callAt;
-                    try {
-                      this.callTimer(timer);
-                    } catch (e) {
-                      firstException = firstException || e;
-                    }
-                }
-
-                timer = this.firstTimerInRange(previous, tickTo);
-                previous = tickFrom;
-            }
-
-            this.now = tickTo;
-
-            if (firstException) {
-              throw firstException;
-            }
-
-            return this.now;
-        },
-
-        firstTimerInRange: function (from, to) {
-            var timer, smallest = null, originalTimer;
-
-            for (var id in this.timeouts) {
-                if (this.timeouts.hasOwnProperty(id)) {
-                    if (this.timeouts[id].callAt < from || this.timeouts[id].callAt > to) {
-                        continue;
-                    }
-
-                    if (smallest === null || this.timeouts[id].callAt < smallest) {
-                        originalTimer = this.timeouts[id];
-                        smallest = this.timeouts[id].callAt;
-
-                        timer = {
-                            func: this.timeouts[id].func,
-                            callAt: this.timeouts[id].callAt,
-                            interval: this.timeouts[id].interval,
-                            id: this.timeouts[id].id,
-                            invokeArgs: this.timeouts[id].invokeArgs
-                        };
-                    }
-                }
-            }
-
-            return timer || null;
-        },
-
-        callTimer: function (timer) {
-            if (typeof timer.interval == "number") {
-                this.timeouts[timer.id].callAt += timer.interval;
-            } else {
-                delete this.timeouts[timer.id];
-            }
-
-            try {
-                if (typeof timer.func == "function") {
-                    timer.func.apply(null, timer.invokeArgs);
-                } else {
-                    eval(timer.func);
-                }
-            } catch (e) {
-              var exception = e;
-            }
-
-            if (!this.timeouts[timer.id]) {
-                if (exception) {
-                  throw exception;
-                }
-                return;
-            }
-
-            if (exception) {
-              throw exception;
-            }
-        },
-
-        reset: function reset() {
-            this.timeouts = {};
-        },
-
-        Date: (function () {
-            var NativeDate = Date;
-
-            function ClockDate(year, month, date, hour, minute, second, ms) {
-                // Defensive and verbose to avoid potential harm in passing
-                // explicit undefined when user does not pass argument
-                switch (arguments.length) {
-                case 0:
-                    return new NativeDate(ClockDate.clock.now);
-                case 1:
-                    return new NativeDate(year);
-                case 2:
-                    return new NativeDate(year, month);
-                case 3:
-                    return new NativeDate(year, month, date);
-                case 4:
-                    return new NativeDate(year, month, date, hour);
-                case 5:
-                    return new NativeDate(year, month, date, hour, minute);
-                case 6:
-                    return new NativeDate(year, month, date, hour, minute, second);
-                default:
-                    return new NativeDate(year, month, date, hour, minute, second, ms);
-                }
-            }
-
-            return mirrorDateProperties(ClockDate, NativeDate);
-        }())
-    };
-
-    function mirrorDateProperties(target, source) {
-        if (source.now) {
-            target.now = function now() {
-                return target.clock.now;
-            };
-        } else {
-            delete target.now;
-        }
-
-        if (source.toSource) {
-            target.toSource = function toSource() {
-                return source.toSource();
-            };
-        } else {
-            delete target.toSource;
-        }
-
-        target.toString = function toString() {
-            return source.toString();
-        };
-
-        target.prototype = source.prototype;
-        target.parse = source.parse;
-        target.UTC = source.UTC;
-        target.prototype.toUTCString = source.prototype.toUTCString;
-
-        for (var prop in source) {
-            if (source.hasOwnProperty(prop)) {
-                target[prop] = source[prop];
-            }
-        }
-
-        return target;
-    }
-
-    var methods = ["Date", "setTimeout", "setInterval",
-                   "clearTimeout", "clearInterval"];
-
-    if (typeof global.setImmediate !== "undefined") {
-        methods.push("setImmediate");
-    }
-
-    if (typeof global.clearImmediate !== "undefined") {
-        methods.push("clearImmediate");
-    }
-
-    function restore() {
-        var method;
-
-        for (var i = 0, l = this.methods.length; i < l; i++) {
-            method = this.methods[i];
-
-            if (global[method].hadOwnProperty) {
-                global[method] = this["_" + method];
-            } else {
-                try {
-                    delete global[method];
-                } catch (e) {}
-            }
-        }
-
-        // Prevent multiple executions which will completely remove these props
-        this.methods = [];
-    }
-
-    function stubGlobal(method, clock) {
-        clock[method].hadOwnProperty = Object.prototype.hasOwnProperty.call(global, method);
-        clock["_" + method] = global[method];
-
-        if (method == "Date") {
-            var date = mirrorDateProperties(clock[method], global[method]);
-            global[method] = date;
-        } else {
-            global[method] = function () {
-                return clock[method].apply(clock, arguments);
-            };
-
-            for (var prop in clock[method]) {
-                if (clock[method].hasOwnProperty(prop)) {
-                    global[method][prop] = clock[method][prop];
-                }
-            }
-        }
-
-        global[method].clock = clock;
-    }
-
-    sinon.useFakeTimers = function useFakeTimers(now) {
-        var clock = sinon.clock.create(now);
-        clock.restore = restore;
-        clock.methods = Array.prototype.slice.call(arguments,
-                                                   typeof now == "number" ? 1 : 0);
-
-        if (clock.methods.length === 0) {
-            clock.methods = methods;
-        }
-
-        for (var i = 0, l = clock.methods.length; i < l; i++) {
-            stubGlobal(clock.methods[i], clock);
-        }
-
-        return clock;
-    };
-}(typeof global != "undefined" && typeof global !== "function" ? global : this));
-
-sinon.timers = {
-    setTimeout: setTimeout,
-    clearTimeout: clearTimeout,
-    setImmediate: (typeof setImmediate !== "undefined" ? setImmediate : undefined),
-    clearImmediate: (typeof clearImmediate !== "undefined" ? clearImmediate: undefined),
-    setInterval: setInterval,
-    clearInterval: clearInterval,
-    Date: Date
-};
-
-if (typeof module !== 'undefined' && module.exports) {
-    module.exports = sinon;
-}
-
-/*jslint eqeqeq: false, onevar: false*/
-/*global sinon, module, require, ActiveXObject, XMLHttpRequest, DOMParser*/
-/**
- * Minimal Event interface implementation
- *
- * Original implementation by Sven Fuchs: https://gist.github.com/995028
- * Modifications and tests by Christian Johansen.
- *
- * @author Sven Fuchs (svenfuchs@artweb-design.de)
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2011 Sven Fuchs, Christian Johansen
- */
-
-if (typeof sinon == "undefined") {
-    this.sinon = {};
-}
-
-(function () {
-    var push = [].push;
-
-    sinon.Event = function Event(type, bubbles, cancelable, target) {
-        this.initEvent(type, bubbles, cancelable, target);
-    };
-
-    sinon.Event.prototype = {
-        initEvent: function(type, bubbles, cancelable, target) {
-            this.type = type;
-            this.bubbles = bubbles;
-            this.cancelable = cancelable;
-            this.target = target;
-        },
-
-        stopPropagation: function () {},
-
-        preventDefault: function () {
-            this.defaultPrevented = true;
-        }
-    };
-
-    sinon.EventTarget = {
-        addEventListener: function addEventListener(event, listener) {
-            this.eventListeners = this.eventListeners || {};
-            this.eventListeners[event] = this.eventListeners[event] || [];
-            push.call(this.eventListeners[event], listener);
-        },
-
-        removeEventListener: function removeEventListener(event, listener) {
-            var listeners = this.eventListeners && this.eventListeners[event] || [];
-
-            for (var i = 0, l = listeners.length; i < l; ++i) {
-                if (listeners[i] == listener) {
-                    return listeners.splice(i, 1);
-                }
-            }
-        },
-
-        dispatchEvent: function dispatchEvent(event) {
-            var type = event.type;
-            var listeners = this.eventListeners && this.eventListeners[type] || [];
-
-            for (var i = 0; i < listeners.length; i++) {
-                if (typeof listeners[i] == "function") {
-                    listeners[i].call(this, event);
-                } else {
-                    listeners[i].handleEvent(event);
-                }
-            }
-
-            return !!event.defaultPrevented;
-        }
-    };
-}());
-
-/**
- * @depend ../../sinon.js
- * @depend event.js
- */
-/*jslint eqeqeq: false, onevar: false*/
-/*global sinon, module, require, ActiveXObject, XMLHttpRequest, DOMParser*/
-/**
- * Fake XMLHttpRequest object
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-// wrapper for global
-(function(global) {
-    if (typeof sinon === "undefined") {
-        global.sinon = {};
-    }
-
-    var supportsProgress = typeof ProgressEvent !== "undefined";
-    var supportsCustomEvent = typeof CustomEvent !== "undefined";
-    sinon.xhr = { XMLHttpRequest: global.XMLHttpRequest };
-    var xhr = sinon.xhr;
-    xhr.GlobalXMLHttpRequest = global.XMLHttpRequest;
-    xhr.GlobalActiveXObject = global.ActiveXObject;
-    xhr.supportsActiveX = typeof xhr.GlobalActiveXObject != "undefined";
-    xhr.supportsXHR = typeof xhr.GlobalXMLHttpRequest != "undefined";
-    xhr.workingXHR = xhr.supportsXHR ? xhr.GlobalXMLHttpRequest : xhr.supportsActiveX
-                                     ? function() { return new xhr.GlobalActiveXObject("MSXML2.XMLHTTP.3.0") } : false;
-    xhr.supportsCORS = 'withCredentials' in (new sinon.xhr.GlobalXMLHttpRequest());
-
-    /*jsl:ignore*/
-    var unsafeHeaders = {
-        "Accept-Charset": true,
-        "Accept-Encoding": true,
-        "Connection": true,
-        "Content-Length": true,
-        "Cookie": true,
-        "Cookie2": true,
-        "Content-Transfer-Encoding": true,
-        "Date": true,
-        "Expect": true,
-        "Host": true,
-        "Keep-Alive": true,
-        "Referer": true,
-        "TE": true,
-        "Trailer": true,
-        "Transfer-Encoding": true,
-        "Upgrade": true,
-        "User-Agent": true,
-        "Via": true
-    };
-    /*jsl:end*/
-
-    function FakeXMLHttpRequest() {
-        this.readyState = FakeXMLHttpRequest.UNSENT;
-        this.requestHeaders = {};
-        this.requestBody = null;
-        this.status = 0;
-        this.statusText = "";
-        this.upload = new UploadProgress();
-        if (sinon.xhr.supportsCORS) {
-            this.withCredentials = false;
-        }
-
-
-        var xhr = this;
-        var events = ["loadstart", "load", "abort", "loadend"];
-
-        function addEventListener(eventName) {
-            xhr.addEventListener(eventName, function (event) {
-                var listener = xhr["on" + eventName];
-
-                if (listener && typeof listener == "function") {
-                    listener(event);
-                }
-            });
-        }
-
-        for (var i = events.length - 1; i >= 0; i--) {
-            addEventListener(events[i]);
-        }
-
-        if (typeof FakeXMLHttpRequest.onCreate == "function") {
-            FakeXMLHttpRequest.onCreate(this);
-        }
-    }
-
-    // An upload object is created for each
-    // FakeXMLHttpRequest and allows upload
-    // events to be simulated using uploadProgress
-    // and uploadError.
-    function UploadProgress() {
-        this.eventListeners = {
-            "progress": [],
-            "load": [],
-            "abort": [],
-            "error": []
-        }
-    }
-
-    UploadProgress.prototype.addEventListener = function(event, listener) {
-        this.eventListeners[event].push(listener);
-    };
-
-    UploadProgress.prototype.removeEventListener = function(event, listener) {
-        var listeners = this.eventListeners[event] || [];
-
-        for (var i = 0, l = listeners.length; i < l; ++i) {
-            if (listeners[i] == listener) {
-                return listeners.splice(i, 1);
-            }
-        }
-    };
-
-    UploadProgress.prototype.dispatchEvent = function(event) {
-        var listeners = this.eventListeners[event.type] || [];
-
-        for (var i = 0, listener; (listener = listeners[i]) != null; i++) {
-            listener(event);
-        }
-    };
-
-    function verifyState(xhr) {
-        if (xhr.readyState !== FakeXMLHttpRequest.OPENED) {
-            throw new Error("INVALID_STATE_ERR");
-        }
-
-        if (xhr.sendFlag) {
-            throw new Error("INVALID_STATE_ERR");
-        }
-    }
-
-    // filtering to enable a white-list version of Sinon FakeXhr,
-    // where whitelisted requests are passed through to real XHR
-    function each(collection, callback) {
-        if (!collection) return;
-        for (var i = 0, l = collection.length; i < l; i += 1) {
-            callback(collection[i]);
-        }
-    }
-    function some(collection, callback) {
-        for (var index = 0; index < collection.length; index++) {
-            if(callback(collection[index]) === true) return true;
-        }
-        return false;
-    }
-    // largest arity in XHR is 5 - XHR#open
-    var apply = function(obj,method,args) {
-        switch(args.length) {
-        case 0: return obj[method]();
-        case 1: return obj[method](args[0]);
-        case 2: return obj[method](args[0],args[1]);
-        case 3: return obj[method](args[0],args[1],args[2]);
-        case 4: return obj[method](args[0],args[1],args[2],args[3]);
-        case 5: return obj[method](args[0],args[1],args[2],args[3],args[4]);
-        }
-    };
-
-    FakeXMLHttpRequest.filters = [];
-    FakeXMLHttpRequest.addFilter = function(fn) {
-        this.filters.push(fn)
-    };
-    var IE6Re = /MSIE 6/;
-    FakeXMLHttpRequest.defake = function(fakeXhr,xhrArgs) {
-        var xhr = new sinon.xhr.workingXHR();
-        each(["open","setRequestHeader","send","abort","getResponseHeader",
-              "getAllResponseHeaders","addEventListener","overrideMimeType","removeEventListener"],
-             function(method) {
-                 fakeXhr[method] = function() {
-                   return apply(xhr,method,arguments);
-                 };
-             });
-
-        var copyAttrs = function(args) {
-            each(args, function(attr) {
-              try {
-                fakeXhr[attr] = xhr[attr]
-              } catch(e) {
-                if(!IE6Re.test(navigator.userAgent)) throw e;
-              }
-            });
-        };
-
-        var stateChange = function() {
-            fakeXhr.readyState = xhr.readyState;
-            if(xhr.readyState >= FakeXMLHttpRequest.HEADERS_RECEIVED) {
-                copyAttrs(["status","statusText"]);
-            }
-            if(xhr.readyState >= FakeXMLHttpRequest.LOADING) {
-                copyAttrs(["responseText"]);
-            }
-            if(xhr.readyState === FakeXMLHttpRequest.DONE) {
-                copyAttrs(["responseXML"]);
-            }
-            if(fakeXhr.onreadystatechange) fakeXhr.onreadystatechange.call(fakeXhr, { target: fakeXhr });
-        };
-        if(xhr.addEventListener) {
-          for(var event in fakeXhr.eventListeners) {
-              if(fakeXhr.eventListeners.hasOwnProperty(event)) {
-                  each(fakeXhr.eventListeners[event],function(handler) {
-                      xhr.addEventListener(event, handler);
-                  });
-              }
-          }
-          xhr.addEventListener("readystatechange",stateChange);
-        } else {
-          xhr.onreadystatechange = stateChange;
-        }
-        apply(xhr,"open",xhrArgs);
-    };
-    FakeXMLHttpRequest.useFilters = false;
-
-    function verifyRequestSent(xhr) {
-        if (xhr.readyState == FakeXMLHttpRequest.DONE) {
-            throw new Error("Request done");
-        }
-    }
-
-    function verifyHeadersReceived(xhr) {
-        if (xhr.async && xhr.readyState != FakeXMLHttpRequest.HEADERS_RECEIVED) {
-            throw new Error("No headers received");
-        }
-    }
-
-    function verifyResponseBodyType(body) {
-        if (typeof body != "string") {
-            var error = new Error("Attempted to respond to fake XMLHttpRequest with " +
-                                 body + ", which is not a string.");
-            error.name = "InvalidBodyException";
-            throw error;
-        }
-    }
-
-    sinon.extend(FakeXMLHttpRequest.prototype, sinon.EventTarget, {
-        async: true,
-
-        open: function open(method, url, async, username, password) {
-            this.method = method;
-            this.url = url;
-            this.async = typeof async == "boolean" ? async : true;
-            this.username = username;
-            this.password = password;
-            this.responseText = null;
-            this.responseXML = null;
-            this.requestHeaders = {};
-            this.sendFlag = false;
-            if(sinon.FakeXMLHttpRequest.useFilters === true) {
-                var xhrArgs = arguments;
-                var defake = some(FakeXMLHttpRequest.filters,function(filter) {
-                    return filter.apply(this,xhrArgs)
-                });
-                if (defake) {
-                  return sinon.FakeXMLHttpRequest.defake(this,arguments);
-                }
-            }
-            this.readyStateChange(FakeXMLHttpRequest.OPENED);
-        },
-
-        readyStateChange: function readyStateChange(state) {
-            this.readyState = state;
-
-            if (typeof this.onreadystatechange == "function") {
-                try {
-                    this.onreadystatechange();
-                } catch (e) {
-                    sinon.logError("Fake XHR onreadystatechange handler", e);
-                }
-            }
-
-            this.dispatchEvent(new sinon.Event("readystatechange"));
-
-            switch (this.readyState) {
-                case FakeXMLHttpRequest.DONE:
-                    this.dispatchEvent(new sinon.Event("load", false, false, this));
-                    this.dispatchEvent(new sinon.Event("loadend", false, false, this));
-                    this.upload.dispatchEvent(new sinon.Event("load", false, false, this));
-                    if (supportsProgress) {
-                        this.upload.dispatchEvent(new ProgressEvent("progress", {loaded: 100, total: 100}));
-                    }
-                    break;
-            }
-        },
-
-        setRequestHeader: function setRequestHeader(header, value) {
-            verifyState(this);
-
-            if (unsafeHeaders[header] || /^(Sec-|Proxy-)/.test(header)) {
-                throw new Error("Refused to set unsafe header \"" + header + "\"");
-            }
-
-            if (this.requestHeaders[header]) {
-                this.requestHeaders[header] += "," + value;
-            } else {
-                this.requestHeaders[header] = value;
-            }
-        },
-
-        // Helps testing
-        setResponseHeaders: function setResponseHeaders(headers) {
-            this.responseHeaders = {};
-
-            for (var header in headers) {
-                if (headers.hasOwnProperty(header)) {
-                    this.responseHeaders[header] = headers[header];
-                }
-            }
-
-            if (this.async) {
-                this.readyStateChange(FakeXMLHttpRequest.HEADERS_RECEIVED);
-            } else {
-                this.readyState = FakeXMLHttpRequest.HEADERS_RECEIVED;
-            }
-        },
-
-        // Currently treats ALL data as a DOMString (i.e. no Document)
-        send: function send(data) {
-            verifyState(this);
-
-            if (!/^(get|head)$/i.test(this.method)) {
-                if (this.requestHeaders["Content-Type"]) {
-                    var value = this.requestHeaders["Content-Type"].split(";");
-                    this.requestHeaders["Content-Type"] = value[0] + ";charset=utf-8";
-                } else {
-                    this.requestHeaders["Content-Type"] = "text/plain;charset=utf-8";
-                }
-
-                this.requestBody = data;
-            }
-
-            this.errorFlag = false;
-            this.sendFlag = this.async;
-            this.readyStateChange(FakeXMLHttpRequest.OPENED);
-
-            if (typeof this.onSend == "function") {
-                this.onSend(this);
-            }
-
-            this.dispatchEvent(new sinon.Event("loadstart", false, false, this));
-        },
-
-        abort: function abort() {
-            this.aborted = true;
-            this.responseText = null;
-            this.errorFlag = true;
-            this.requestHeaders = {};
-
-            if (this.readyState > sinon.FakeXMLHttpRequest.UNSENT && this.sendFlag) {
-                this.readyStateChange(sinon.FakeXMLHttpRequest.DONE);
-                this.sendFlag = false;
-            }
-
-            this.readyState = sinon.FakeXMLHttpRequest.UNSENT;
-
-            this.dispatchEvent(new sinon.Event("abort", false, false, this));
-
-            this.upload.dispatchEvent(new sinon.Event("abort", false, false, this));
-
-            if (typeof this.onerror === "function") {
-                this.onerror();
-            }
-        },
-
-        getResponseHeader: function getResponseHeader(header) {
-            if (this.readyState < FakeXMLHttpRequest.HEADERS_RECEIVED) {
-                return null;
-            }
-
-            if (/^Set-Cookie2?$/i.test(header)) {
-                return null;
-            }
-
-            header = header.toLowerCase();
-
-            for (var h in this.responseHeaders) {
-                if (h.toLowerCase() == header) {
-                    return this.responseHeaders[h];
-                }
-            }
-
-            return null;
-        },
-
-        getAllResponseHeaders: function getAllResponseHeaders() {
-            if (this.readyState < FakeXMLHttpRequest.HEADERS_RECEIVED) {
-                return "";
-            }
-
-            var headers = "";
-
-            for (var header in this.responseHeaders) {
-                if (this.responseHeaders.hasOwnProperty(header) &&
-                    !/^Set-Cookie2?$/i.test(header)) {
-                    headers += header + ": " + this.responseHeaders[header] + "\r\n";
-                }
-            }
-
-            return headers;
-        },
-
-        setResponseBody: function setResponseBody(body) {
-            verifyRequestSent(this);
-            verifyHeadersReceived(this);
-            verifyResponseBodyType(body);
-
-            var chunkSize = this.chunkSize || 10;
-            var index = 0;
-            this.responseText = "";
-
-            do {
-                if (this.async) {
-                    this.readyStateChange(FakeXMLHttpRequest.LOADING);
-                }
-
-                this.responseText += body.substring(index, index + chunkSize);
-                index += chunkSize;
-            } while (index < body.length);
-
-            var type = this.getResponseHeader("Content-Type");
-
-            if (this.responseText &&
-                (!type || /(text\/xml)|(application\/xml)|(\+xml)/.test(type))) {
-                try {
-                    this.responseXML = FakeXMLHttpRequest.parseXML(this.responseText);
-                } catch (e) {
-                    // Unable to parse XML - no biggie
-                }
-            }
-
-            if (this.async) {
-                this.readyStateChange(FakeXMLHttpRequest.DONE);
-            } else {
-                this.readyState = FakeXMLHttpRequest.DONE;
-            }
-        },
-
-        respond: function respond(status, headers, body) {
-            this.status = typeof status == "number" ? status : 200;
-            this.statusText = FakeXMLHttpRequest.statusCodes[this.status];
-            this.setResponseHeaders(headers || {});
-            this.setResponseBody(body || "");
-        },
-
-        uploadProgress: function uploadProgress(progressEventRaw) {
-            if (supportsProgress) {
-                this.upload.dispatchEvent(new ProgressEvent("progress", progressEventRaw));
-            }
-        },
-
-        uploadError: function uploadError(error) {
-            if (supportsCustomEvent) {
-                this.upload.dispatchEvent(new CustomEvent("error", {"detail": error}));
-            }
-        }
-    });
-
-    sinon.extend(FakeXMLHttpRequest, {
-        UNSENT: 0,
-        OPENED: 1,
-        HEADERS_RECEIVED: 2,
-        LOADING: 3,
-        DONE: 4
-    });
-
-    // Borrowed from JSpec
-    FakeXMLHttpRequest.parseXML = function parseXML(text) {
-        var xmlDoc;
-
-        if (typeof DOMParser != "undefined") {
-            var parser = new DOMParser();
-            xmlDoc = parser.parseFromString(text, "text/xml");
-        } else {
-            xmlDoc = new ActiveXObject("Microsoft.XMLDOM");
-            xmlDoc.async = "false";
-            xmlDoc.loadXML(text);
-        }
-
-        return xmlDoc;
-    };
-
-    FakeXMLHttpRequest.statusCodes = {
-        100: "Continue",
-        101: "Switching Protocols",
-        200: "OK",
-        201: "Created",
-        202: "Accepted",
-        203: "Non-Authoritative Information",
-        204: "No Content",
-        205: "Reset Content",
-        206: "Partial Content",
-        300: "Multiple Choice",
-        301: "Moved Permanently",
-        302: "Found",
-        303: "See Other",
-        304: "Not Modified",
-        305: "Use Proxy",
-        307: "Temporary Redirect",
-        400: "Bad Request",
-        401: "Unauthorized",
-        402: "Payment Required",
-        403: "Forbidden",
-        404: "Not Found",
-        405: "Method Not Allowed",
-        406: "Not Acceptable",
-        407: "Proxy Authentication Required",
-        408: "Request Timeout",
-        409: "Conflict",
-        410: "Gone",
-        411: "Length Required",
-        412: "Precondition Failed",
-        413: "Request Entity Too Large",
-        414: "Request-URI Too Long",
-        415: "Unsupported Media Type",
-        416: "Requested Range Not Satisfiable",
-        417: "Expectation Failed",
-        422: "Unprocessable Entity",
-        500: "Internal Server Error",
-        501: "Not Implemented",
-        502: "Bad Gateway",
-        503: "Service Unavailable",
-        504: "Gateway Timeout",
-        505: "HTTP Version Not Supported"
-    };
-
-    sinon.useFakeXMLHttpRequest = function () {
-        sinon.FakeXMLHttpRequest.restore = function restore(keepOnCreate) {
-            if (xhr.supportsXHR) {
-                global.XMLHttpRequest = xhr.GlobalXMLHttpRequest;
-            }
-
-            if (xhr.supportsActiveX) {
-                global.ActiveXObject = xhr.GlobalActiveXObject;
-            }
-
-            delete sinon.FakeXMLHttpRequest.restore;
-
-            if (keepOnCreate !== true) {
-                delete sinon.FakeXMLHttpRequest.onCreate;
-            }
-        };
-        if (xhr.supportsXHR) {
-            global.XMLHttpRequest = sinon.FakeXMLHttpRequest;
-        }
-
-        if (xhr.supportsActiveX) {
-            global.ActiveXObject = function ActiveXObject(objId) {
-                if (objId == "Microsoft.XMLHTTP" || /^Msxml2\.XMLHTTP/i.test(objId)) {
-
-                    return new sinon.FakeXMLHttpRequest();
-                }
-
-                return new xhr.GlobalActiveXObject(objId);
-            };
-        }
-
-        return sinon.FakeXMLHttpRequest;
-    };
-
-    sinon.FakeXMLHttpRequest = FakeXMLHttpRequest;
-
-})(typeof global === "object" ? global : this);
-
-if (typeof module !== 'undefined' && module.exports) {
-    module.exports = sinon;
-}
-
-/**
- * @depend fake_xml_http_request.js
- */
-/*jslint eqeqeq: false, onevar: false, regexp: false, plusplus: false*/
-/*global module, require, window*/
-/**
- * The Sinon "server" mimics a web server that receives requests from
- * sinon.FakeXMLHttpRequest and provides an API to respond to those requests,
- * both synchronously and asynchronously. To respond synchronuously, canned
- * answers have to be provided upfront.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-if (typeof sinon == "undefined") {
-    var sinon = {};
-}
-
-sinon.fakeServer = (function () {
-    var push = [].push;
-    function F() {}
-
-    function create(proto) {
-        F.prototype = proto;
-        return new F();
-    }
-
-    function responseArray(handler) {
-        var response = handler;
-
-        if (Object.prototype.toString.call(handler) != "[object Array]") {
-            response = [200, {}, handler];
-        }
-
-        if (typeof response[2] != "string") {
-            throw new TypeError("Fake server response body should be string, but was " +
-                                typeof response[2]);
-        }
-
-        return response;
-    }
-
-    var wloc = typeof window !== "undefined" ? window.location : {};
-    var rCurrLoc = new RegExp("^" + wloc.protocol + "//" + wloc.host);
-
-    function matchOne(response, reqMethod, reqUrl) {
-        var rmeth = response.method;
-        var matchMethod = !rmeth || rmeth.toLowerCase() == reqMethod.toLowerCase();
-        var url = response.url;
-        var matchUrl = !url || url == reqUrl || (typeof url.test == "function" && url.test(reqUrl));
-
-        return matchMethod && matchUrl;
-    }
-
-    function match(response, request) {
-        var requestUrl = request.url;
-
-        if (!/^https?:\/\//.test(requestUrl) || rCurrLoc.test(requestUrl)) {
-            requestUrl = requestUrl.replace(rCurrLoc, "");
-        }
-
-        if (matchOne(response, this.getHTTPMethod(request), requestUrl)) {
-            if (typeof response.response == "function") {
-                var ru = response.url;
-                var args = [request].concat(ru && typeof ru.exec == "function" ? ru.exec(requestUrl).slice(1) : []);
-                return response.response.apply(response, args);
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    function log(response, request) {
-        var str;
-
-        str =  "Request:\n"  + sinon.format(request)  + "\n\n";
-        str += "Response:\n" + sinon.format(response) + "\n\n";
-
-        sinon.log(str);
-    }
-
-    return {
-        create: function () {
-            var server = create(this);
-            this.xhr = sinon.useFakeXMLHttpRequest();
-            server.requests = [];
-
-            this.xhr.onCreate = function (xhrObj) {
-                server.addRequest(xhrObj);
-            };
-
-            return server;
-        },
-
-        addRequest: function addRequest(xhrObj) {
-            var server = this;
-            push.call(this.requests, xhrObj);
-
-            xhrObj.onSend = function () {
-                server.handleRequest(this);
-
-                if (server.autoRespond && !server.responding) {
-                    setTimeout(function () {
-                        server.responding = false;
-                        server.respond();
-                    }, server.autoRespondAfter || 10);
-
-                    server.responding = true;
-                }
-            };
-        },
-
-        getHTTPMethod: function getHTTPMethod(request) {
-            if (this.fakeHTTPMethods && /post/i.test(request.method)) {
-                var matches = (request.requestBody || "").match(/_method=([^\b;]+)/);
-                return !!matches ? matches[1] : request.method;
-            }
-
-            return request.method;
-        },
-
-        handleRequest: function handleRequest(xhr) {
-            if (xhr.async) {
-                if (!this.queue) {
-                    this.queue = [];
-                }
-
-                push.call(this.queue, xhr);
-            } else {
-                this.processRequest(xhr);
-            }
-        },
-
-        respondWith: function respondWith(method, url, body) {
-            if (arguments.length == 1 && typeof method != "function") {
-                this.response = responseArray(method);
-                return;
-            }
-
-            if (!this.responses) { this.responses = []; }
-
-            if (arguments.length == 1) {
-                body = method;
-                url = method = null;
-            }
-
-            if (arguments.length == 2) {
-                body = url;
-                url = method;
-                method = null;
-            }
-
-            push.call(this.responses, {
-                method: method,
-                url: url,
-                response: typeof body == "function" ? body : responseArray(body)
-            });
-        },
-
-        respond: function respond() {
-            if (arguments.length > 0) this.respondWith.apply(this, arguments);
-            var queue = this.queue || [];
-            var requests = queue.splice(0);
-            var request;
-
-            while(request = requests.shift()) {
-                this.processRequest(request);
-            }
-        },
-
-        processRequest: function processRequest(request) {
-            try {
-                if (request.aborted) {
-                    return;
-                }
-
-                var response = this.response || [404, {}, ""];
-
-                if (this.responses) {
-                    for (var l = this.responses.length, i = l - 1; i >= 0; i--) {
-                        if (match.call(this, this.responses[i], request)) {
-                            response = this.responses[i].response;
-                            break;
-                        }
-                    }
-                }
-
-                if (request.readyState != 4) {
-                    log(response, request);
-
-                    request.respond(response[0], response[1], response[2]);
-                }
-            } catch (e) {
-                sinon.logError("Fake server request processing", e);
-            }
-        },
-
-        restore: function restore() {
-            return this.xhr.restore && this.xhr.restore.apply(this.xhr, arguments);
-        }
-    };
-}());
-
-if (typeof module !== 'undefined' && module.exports) {
-    module.exports = sinon;
-}
-
-/**
- * @depend fake_server.js
- * @depend fake_timers.js
- */
-/*jslint browser: true, eqeqeq: false, onevar: false*/
-/*global sinon*/
-/**
- * Add-on for sinon.fakeServer that automatically handles a fake timer along with
- * the FakeXMLHttpRequest. The direct inspiration for this add-on is jQuery
- * 1.3.x, which does not use xhr object's onreadystatehandler at all - instead,
- * it polls the object for completion with setInterval. Dispite the direct
- * motivation, there is nothing jQuery-specific in this file, so it can be used
- * in any environment where the ajax implementation depends on setInterval or
- * setTimeout.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function () {
-    function Server() {}
-    Server.prototype = sinon.fakeServer;
-
-    sinon.fakeServerWithClock = new Server();
-
-    sinon.fakeServerWithClock.addRequest = function addRequest(xhr) {
-        if (xhr.async) {
-            if (typeof setTimeout.clock == "object") {
-                this.clock = setTimeout.clock;
-            } else {
-                this.clock = sinon.useFakeTimers();
-                this.resetClock = true;
-            }
-
-            if (!this.longestTimeout) {
-                var clockSetTimeout = this.clock.setTimeout;
-                var clockSetInterval = this.clock.setInterval;
-                var server = this;
-
-                this.clock.setTimeout = function (fn, timeout) {
-                    server.longestTimeout = Math.max(timeout, server.longestTimeout || 0);
-
-                    return clockSetTimeout.apply(this, arguments);
-                };
-
-                this.clock.setInterval = function (fn, timeout) {
-                    server.longestTimeout = Math.max(timeout, server.longestTimeout || 0);
-
-                    return clockSetInterval.apply(this, arguments);
-                };
-            }
-        }
-
-        return sinon.fakeServer.addRequest.call(this, xhr);
-    };
-
-    sinon.fakeServerWithClock.respond = function respond() {
-        var returnVal = sinon.fakeServer.respond.apply(this, arguments);
-
-        if (this.clock) {
-            this.clock.tick(this.longestTimeout || 0);
-            this.longestTimeout = 0;
-
-            if (this.resetClock) {
-                this.clock.restore();
-                this.resetClock = false;
-            }
-        }
-
-        return returnVal;
-    };
-
-    sinon.fakeServerWithClock.restore = function restore() {
-        if (this.clock) {
-            this.clock.restore();
-        }
-
-        return sinon.fakeServer.restore.apply(this, arguments);
-    };
-}());
-
-/**
- * @depend ../sinon.js
- * @depend collection.js
- * @depend util/fake_timers.js
- * @depend util/fake_server_with_clock.js
- */
-/*jslint eqeqeq: false, onevar: false, plusplus: false*/
-/*global require, module*/
-/**
- * Manages fake collections as well as fake utilities such as Sinon's
- * timers and fake XHR implementation in one convenient object.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-if (typeof module !== 'undefined' && module.exports) {
-    var sinon = require("../sinon");
-    sinon.extend(sinon, require("./util/fake_timers"));
-}
-
-(function () {
-    var push = [].push;
-
-    function exposeValue(sandbox, config, key, value) {
-        if (!value) {
-            return;
-        }
-
-        if (config.injectInto && !(key in config.injectInto) ) {
-            config.injectInto[key] = value;
-        } else {
-            push.call(sandbox.args, value);
-        }
-    }
-
-    function prepareSandboxFromConfig(config) {
-        var sandbox = sinon.create(sinon.sandbox);
-
-        if (config.useFakeServer) {
-            if (typeof config.useFakeServer == "object") {
-                sandbox.serverPrototype = config.useFakeServer;
-            }
-
-            sandbox.useFakeServer();
-        }
-
-        if (config.useFakeTimers) {
-            if (typeof config.useFakeTimers == "object") {
-                sandbox.useFakeTimers.apply(sandbox, config.useFakeTimers);
-            } else {
-                sandbox.useFakeTimers();
-            }
-        }
-
-        return sandbox;
-    }
-
-    sinon.sandbox = sinon.extend(sinon.create(sinon.collection), {
-        useFakeTimers: function useFakeTimers() {
-            this.clock = sinon.useFakeTimers.apply(sinon, arguments);
-
-            return this.add(this.clock);
-        },
-
-        serverPrototype: sinon.fakeServer,
-
-        useFakeServer: function useFakeServer() {
-            var proto = this.serverPrototype || sinon.fakeServer;
-
-            if (!proto || !proto.create) {
-                return null;
-            }
-
-            this.server = proto.create();
-            return this.add(this.server);
-        },
-
-        inject: function (obj) {
-            sinon.collection.inject.call(this, obj);
-
-            if (this.clock) {
-                obj.clock = this.clock;
-            }
-
-            if (this.server) {
-                obj.server = this.server;
-                obj.requests = this.server.requests;
-            }
-
-            return obj;
-        },
-
-        create: function (config) {
-            if (!config) {
-                return sinon.create(sinon.sandbox);
-            }
-
-            var sandbox = prepareSandboxFromConfig(config);
-            sandbox.args = sandbox.args || [];
-            var prop, value, exposed = sandbox.inject({});
-
-            if (config.properties) {
-                for (var i = 0, l = config.properties.length; i < l; i++) {
-                    prop = config.properties[i];
-                    value = exposed[prop] || prop == "sandbox" && sandbox;
-                    exposeValue(sandbox, config, prop, value);
-                }
-            } else {
-                exposeValue(sandbox, config, "sandbox", value);
-            }
-
-            return sandbox;
-        }
-    });
-
-    sinon.sandbox.useFakeXMLHttpRequest = sinon.sandbox.useFakeServer;
-
-    if (typeof module !== 'undefined' && module.exports) {
-        module.exports = sinon.sandbox;
-    }
-}());
-
-/**
- * @depend ../sinon.js
- * @depend stub.js
- * @depend mock.js
- * @depend sandbox.js
- */
-/*jslint eqeqeq: false, onevar: false, forin: true, plusplus: false*/
-/*global module, require, sinon*/
-/**
- * Test function, sandboxes fakes
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function test(callback) {
-        var type = typeof callback;
-
-        if (type != "function") {
-            throw new TypeError("sinon.test needs to wrap a test function, got " + type);
-        }
-
-        return function () {
-            var config = sinon.getConfig(sinon.config);
-            config.injectInto = config.injectIntoThis && this || config.injectInto;
-            var sandbox = sinon.sandbox.create(config);
-            var exception, result;
-            var args = Array.prototype.slice.call(arguments).concat(sandbox.args);
-
-            try {
-                result = callback.apply(this, args);
-            } catch (e) {
-                exception = e;
-            }
-
-            if (typeof exception !== "undefined") {
-                sandbox.restore();
-                throw exception;
-            }
-            else {
-                sandbox.verifyAndRestore();
-            }
-
-            return result;
-        };
-    }
-
-    test.config = {
-        injectIntoThis: true,
-        injectInto: null,
-        properties: ["spy", "stub", "mock", "clock", "server", "requests"],
-        useFakeTimers: true,
-        useFakeServer: true
-    };
-
-    if (commonJSModule) {
-        module.exports = test;
-    } else {
-        sinon.test = test;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/**
- * @depend ../sinon.js
- * @depend test.js
- */
-/*jslint eqeqeq: false, onevar: false, eqeqeq: false*/
-/*global module, require, sinon*/
-/**
- * Test case, sandboxes all test functions
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon) {
-    var commonJSModule = typeof module !== 'undefined' && module.exports;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon || !Object.prototype.hasOwnProperty) {
-        return;
-    }
-
-    function createTest(property, setUp, tearDown) {
-        return function () {
-            if (setUp) {
-                setUp.apply(this, arguments);
-            }
-
-            var exception, result;
-
-            try {
-                result = property.apply(this, arguments);
-            } catch (e) {
-                exception = e;
-            }
-
-            if (tearDown) {
-                tearDown.apply(this, arguments);
-            }
-
-            if (exception) {
-                throw exception;
-            }
-
-            return result;
-        };
-    }
-
-    function testCase(tests, prefix) {
-        /*jsl:ignore*/
-        if (!tests || typeof tests != "object") {
-            throw new TypeError("sinon.testCase needs an object with test functions");
-        }
-        /*jsl:end*/
-
-        prefix = prefix || "test";
-        var rPrefix = new RegExp("^" + prefix);
-        var methods = {}, testName, property, method;
-        var setUp = tests.setUp;
-        var tearDown = tests.tearDown;
-
-        for (testName in tests) {
-            if (tests.hasOwnProperty(testName)) {
-                property = tests[testName];
-
-                if (/^(setUp|tearDown)$/.test(testName)) {
-                    continue;
-                }
-
-                if (typeof property == "function" && rPrefix.test(testName)) {
-                    method = property;
-
-                    if (setUp || tearDown) {
-                        method = createTest(property, setUp, tearDown);
-                    }
-
-                    methods[testName] = sinon.test(method);
-                } else {
-                    methods[testName] = tests[testName];
-                }
-            }
-        }
-
-        return methods;
-    }
-
-    if (commonJSModule) {
-        module.exports = testCase;
-    } else {
-        sinon.testCase = testCase;
-    }
-}(typeof sinon == "object" && sinon || null));
-
-/**
- * @depend ../sinon.js
- * @depend stub.js
- */
-/*jslint eqeqeq: false, onevar: false, nomen: false, plusplus: false*/
-/*global module, require, sinon*/
-/**
- * Assertions matching the test spy retrieval interface.
- *
- * @author Christian Johansen (christian@cjohansen.no)
- * @license BSD
- *
- * Copyright (c) 2010-2013 Christian Johansen
- */
-
-(function (sinon, global) {
-    var commonJSModule = typeof module !== "undefined" && module.exports;
-    var slice = Array.prototype.slice;
-    var assert;
-
-    if (!sinon && commonJSModule) {
-        sinon = require("../sinon");
-    }
-
-    if (!sinon) {
-        return;
-    }
-
-    function verifyIsStub() {
-        var method;
-
-        for (var i = 0, l = arguments.length; i < l; ++i) {
-            method = arguments[i];
-
-            if (!method) {
-                assert.fail("fake is not a spy");
-            }
-
-            if (typeof method != "function") {
-                assert.fail(method + " is not a function");
-            }
-
-            if (typeof method.getCall != "function") {
-                assert.fail(method + " is not stubbed");
-            }
-        }
-    }
-
-    function failAssertion(object, msg) {
-        object = object || global;
-        var failMethod = object.fail || assert.fail;
-        failMethod.call(object, msg);
-    }
-
-    function mirrorPropAsAssertion(name, method, message) {
-        if (arguments.length == 2) {
-            message = method;
-            method = name;
-        }
-
-        assert[name] = function (fake) {
-            verifyIsStub(fake);
-
-            var args = slice.call(arguments, 1);
-            var failed = false;
-
-            if (typeof method == "function") {
-                failed = !method(fake);
-            } else {
-                failed = typeof fake[method] == "function" ?
-                    !fake[method].apply(fake, args) : !fake[method];
-            }
-
-            if (failed) {
-                failAssertion(this, fake.printf.apply(fake, [message].concat(args)));
-            } else {
-                assert.pass(name);
-            }
-        };
-    }
-
-    function exposedName(prefix, prop) {
-        return !prefix || /^fail/.test(prop) ? prop :
-            prefix + prop.slice(0, 1).toUpperCase() + prop.slice(1);
-    }
-
-    assert = {
-        failException: "AssertError",
-
-        fail: function fail(message) {
-            var error = new Error(message);
-            error.name = this.failException || assert.failException;
-
-            throw error;
-        },
-
-        pass: function pass(assertion) {},
-
-        callOrder: function assertCallOrder() {
-            verifyIsStub.apply(null, arguments);
-            var expected = "", actual = "";
-
-            if (!sinon.calledInOrder(arguments)) {
-                try {
-                    expected = [].join.call(arguments, ", ");
-                    var calls = slice.call(arguments);
-                    var i = calls.length;
-                    while (i) {
-                        if (!calls[--i].called) {
-                            calls.splice(i, 1);
-                        }
-                    }
-                    actual = sinon.orderByFirstCall(calls).join(", ");
-                } catch (e) {
-                    // If this fails, we'll just fall back to the blank string
-                }
-
-                failAssertion(this, "expected " + expected + " to be " +
-                              "called in order but were called as " + actual);
-            } else {
-                assert.pass("callOrder");
-            }
-        },
-
-        callCount: function assertCallCount(method, count) {
-            verifyIsStub(method);
-
-            if (method.callCount != count) {
-                var msg = "expected %n to be called " + sinon.timesInWords(count) +
-                    " but was called %c%C";
-                failAssertion(this, method.printf(msg));
-            } else {
-                assert.pass("callCount");
-            }
-        },
-
-        expose: function expose(target, options) {
-            if (!target) {
-                throw new TypeError("target is null or undefined");
-            }
-
-            var o = options || {};
-            var prefix = typeof o.prefix == "undefined" && "assert" || o.prefix;
-            var includeFail = typeof o.includeFail == "undefined" || !!o.includeFail;
-
-            for (var method in this) {
-                if (method != "export" && (includeFail || !/^(fail)/.test(method))) {
-                    target[exposedName(prefix, method)] = this[method];
-                }
-            }
-
-            return target;
-        }
-    };
-
-    mirrorPropAsAssertion("called", "expected %n to have been called at least once but was never called");
-    mirrorPropAsAssertion("notCalled", function (spy) { return !spy.called; },
-                          "expected %n to not have been called but was called %c%C");
-    mirrorPropAsAssertion("calledOnce", "expected %n to be called once but was called %c%C");
-    mirrorPropAsAssertion("calledTwice", "expected %n to be called twice but was called %c%C");
-    mirrorPropAsAssertion("calledThrice", "expected %n to be called thrice but was called %c%C");
-    mirrorPropAsAssertion("calledOn", "expected %n to be called with %1 as this but was called with %t");
-    mirrorPropAsAssertion("alwaysCalledOn", "expected %n to always be called with %1 as this but was called with %t");
-    mirrorPropAsAssertion("calledWithNew", "expected %n to be called with new");
-    mirrorPropAsAssertion("alwaysCalledWithNew", "expected %n to always be called with new");
-    mirrorPropAsAssertion("calledWith", "expected %n to be called with arguments %*%C");
-    mirrorPropAsAssertion("calledWithMatch", "expected %n to be called with match %*%C");
-    mirrorPropAsAssertion("alwaysCalledWith", "expected %n to always be called with arguments %*%C");
-    mirrorPropAsAssertion("alwaysCalledWithMatch", "expected %n to always be called with match %*%C");
-    mirrorPropAsAssertion("calledWithExactly", "expected %n to be called with exact arguments %*%C");
-    mirrorPropAsAssertion("alwaysCalledWithExactly", "expected %n to always be called with exact arguments %*%C");
-    mirrorPropAsAssertion("neverCalledWith", "expected %n to never be called with arguments %*%C");
-    mirrorPropAsAssertion("neverCalledWithMatch", "expected %n to never be called with match %*%C");
-    mirrorPropAsAssertion("threw", "%n did not throw exception%C");
-    mirrorPropAsAssertion("alwaysThrew", "%n did not always throw exception%C");
-
-    if (commonJSModule) {
-        module.exports = assert;
-    } else {
-        sinon.assert = assert;
-    }
-}(typeof sinon == "object" && sinon || null, typeof window != "undefined" ? window : (typeof self != "undefined") ? self : global));
-
-return sinon;}.call(typeof window != 'undefined' && window || {}));
diff --git a/test/utils/stub_index_pattern.js b/test/utils/stub_index_pattern.js
deleted file mode 100644
index 751e302b1bae0..0000000000000
--- a/test/utils/stub_index_pattern.js
+++ /dev/null
@@ -1,45 +0,0 @@
-define(function (require) {
-  return function (Private) {
-    var _ = require('lodash');
-    var sinon = require('sinon/sinon');
-    var IndexedArray = require('utils/indexed_array/index');
-    var IndexPattern = require('components/index_patterns/_index_pattern');
-    var fieldFormats = Private(require('registry/field_formats'));
-    var flattenHit = Private(require('components/index_patterns/_flatten_hit'));
-    var formatHit = require('components/index_patterns/_format_hit');
-    var getComputedFields = require('components/index_patterns/_get_computed_fields');
-
-    var Field = Private(require('components/index_patterns/_field'));
-
-    function StubIndexPattern(pattern, timeField, fields) {
-      this.id = pattern;
-      this.popularizeField = sinon.spy();
-      this.timeFieldName = timeField;
-      this.getNonScriptedFields = sinon.spy();
-      this.getScriptedFields = sinon.spy();
-      this.metaFields = ['_id', '_type', '_source'];
-      this.fieldFormatMap = {};
-      this.routes = IndexPattern.prototype.routes;
-
-      this.toIndexList = _.constant([pattern]);
-      this.getComputedFields = _.bind(getComputedFields, this);
-      this.flattenHit = flattenHit(this);
-      this.formatHit = formatHit(this, fieldFormats.getDefaultInstance('string'));
-      this.formatField = this.formatHit.formatField;
-
-      this._indexFields = function () {
-        this.fields = new IndexedArray({
-          index: ['name'],
-          group: ['type'],
-          initialSet: fields.map(function (field) {
-            return new Field(this, field);
-          }, this)
-        });
-      };
-
-      this._indexFields();
-    }
-
-    return StubIndexPattern;
-  };
-});