diff --git a/examples/README.md b/examples/README.md
index 04a544be399..64341a7fdbc 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -1,3 +1,4 @@
 ## Example plugin implementations
 
-[simple-json-datasource](https://github.com/grafana/simple-json-datasource)
\ No newline at end of file
+datasource:[simple-json-datasource](https://github.com/grafana/simple-json-datasource)
+app:  [example-app](https://github.com/grafana/example-app)
\ No newline at end of file
diff --git a/examples/nginx-app/.gitignore b/examples/nginx-app/.gitignore
deleted file mode 100644
index 8c2c350441b..00000000000
--- a/examples/nginx-app/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.DS_Store
-
-node_modules
-tmp/*
-npm-debug.log
-dist/*
-
diff --git a/examples/nginx-app/.jscs.json b/examples/nginx-app/.jscs.json
deleted file mode 100644
index dcf694dcc63..00000000000
--- a/examples/nginx-app/.jscs.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "disallowImplicitTypeConversion": ["string"],
-    "disallowKeywords": ["with"],
-    "disallowMultipleLineBreaks": true,
-    "disallowMixedSpacesAndTabs": true,
-    "disallowTrailingWhitespace": true,
-    "requireSpacesInFunctionExpression": {
-        "beforeOpeningCurlyBrace": true
-    },
-    "disallowSpacesInsideArrayBrackets": true,
-    "disallowSpacesInsideParentheses": true,
-    "validateIndentation": 2
-}
\ No newline at end of file
diff --git a/examples/nginx-app/.jshintrc b/examples/nginx-app/.jshintrc
deleted file mode 100644
index 3725af83afc..00000000000
--- a/examples/nginx-app/.jshintrc
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "browser": true,
-  "esnext": true,
-
-  "bitwise":false,
-  "curly": true,
-  "eqnull": true,
-  "devel": true,
-  "eqeqeq": true,
-  "forin": false,
-  "immed": true,
-  "supernew": true,
-  "expr": true,
-  "indent": 2,
-  "latedef": true,
-  "newcap": true,
-  "noarg": true,
-  "noempty": true,
-  "undef": true,
-  "boss": true,
-  "trailing": true,
-  "laxbreak": true,
-  "laxcomma": true,
-  "sub": true,
-  "unused": true,
-  "maxdepth": 6,
-  "maxlen": 140,
-
-  "globals": {
-    "System": true,
-    "define": true,
-    "require": true,
-    "Chromath": false,
-    "setImmediate": true
-  }
-}
diff --git a/examples/nginx-app/Gruntfile.js b/examples/nginx-app/Gruntfile.js
deleted file mode 100644
index b88d857cde3..00000000000
--- a/examples/nginx-app/Gruntfile.js
+++ /dev/null
@@ -1,54 +0,0 @@
-module.exports = function(grunt) {
-
-  require('load-grunt-tasks')(grunt);
-
-  grunt.loadNpmTasks('grunt-execute');
-  grunt.loadNpmTasks('grunt-contrib-clean');
-
-  grunt.initConfig({
-
-    clean: ["dist"],
-
-    copy: {
-      src_to_dist: {
-        cwd: 'src',
-        expand: true,
-        src: ['**/*', '!**/*.js', '!**/*.scss'],
-        dest: 'dist'
-      },
-      pluginDef: {
-        expand: true,
-        src: ['plugin.json', 'readme.md'],
-        dest: 'dist',
-      }
-    },
-
-    watch: {
-      rebuild_all: {
-        files: ['src/**/*', 'plugin.json', 'readme.md'],
-        tasks: ['default'],
-        options: {spawn: false}
-      },
-    },
-
-    babel: {
-      options: {
-        sourceMap: true,
-        presets:  ["es2015"],
-        plugins: ['transform-es2015-modules-systemjs', "transform-es2015-for-of"],
-      },
-      dist: {
-        files: [{
-          cwd: 'src',
-          expand: true,
-          src: ['**/*.js'],
-          dest: 'dist',
-          ext:'.js'
-        }]
-      },
-    },
-
-  });
-
-  grunt.registerTask('default', ['clean', 'copy:src_to_dist', 'copy:pluginDef', 'babel']);
-};
diff --git a/examples/nginx-app/package.json b/examples/nginx-app/package.json
deleted file mode 100644
index 91c53734ec8..00000000000
--- a/examples/nginx-app/package.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "name": "kentik-app",
-  "private": true,
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/raintank/kentik-app-poc.git"
-  },
-  "author": "",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/raintank/kentik-app-poc/issues"
-  },
-  "devDependencies": {
-    "grunt": "~0.4.5",
-    "babel": "~6.5.1",
-    "grunt-babel": "~6.0.0",
-    "grunt-contrib-copy": "~0.8.2",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-contrib-uglify": "~0.11.0",
-    "grunt-systemjs-builder": "^0.2.5",
-    "load-grunt-tasks": "~3.2.0",
-    "grunt-execute": "~0.2.2",
-    "grunt-contrib-clean": "~0.6.0"
-  },
-  "dependencies": {
-    "babel-plugin-transform-es2015-modules-systemjs": "^6.5.0",
-    "babel-preset-es2015": "^6.5.0",
-    "lodash": "~4.0.0"
-  },
-  "homepage": "https://github.com/raintank/kentik-app-poc#readme"
-}
diff --git a/examples/nginx-app/plugin.json b/examples/nginx-app/plugin.json
deleted file mode 100644
index 65f01ad62fc..00000000000
--- a/examples/nginx-app/plugin.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "type": "app",
-  "name": "Nginx",
-  "id": "nginx-app",
-
-  "staticRoot": ".",
-
-  "pages": [
-    { "name": "Live stream", "component": "StreamPageCtrl", "role": "Editor"},
-    { "name": "Log view", "component": "LogsPageCtrl", "role": "Viewer"}
-  ],
-
-  "css": {
-    "dark":  "css/dark.css",
-    "light":  "css/light.css"
-  },
-
-  "info": {
-    "description": "Official Grafana Nginx App & Dashboard bundle",
-    "author": {
-      "name": "Nginx Inc.",
-      "url": "http://nginx.com"
-    },
-    "keywords": ["nginx"],
-    "logos": {
-      "small": "img/logo_small.png",
-      "large": "img/logo_large.png"
-    },
-    "links": [
-      {"name": "Project site", "url": "http://project.com"},
-      {"name": "License & Terms", "url": "http://license.com"}
-    ],
-    "version": "1.0.0",
-    "updated": "2015-02-10"
-  },
-
-  "includes": [
-    {"type": "dashboard", "name": "Nginx Connection stats", "path": "dashboards/nginx_connection_stats.json"},
-    {"type": "panel", "name": "Nginx Panel"},
-    {"type": "datasource", "name": "Nginx Datasource"}
-  ],
-
-  "dependencies": {
-    "grafanaVersion": "3.x.x",
-    "plugins": [
-      {"type": "datasource", "id": "graphite", "name": "Graphite", "version": "1.0.0"},
-      {"type": "panel", "id": "graph", "name": "Graph", "version": "1.0.0"}
-    ]
-  }
-}
diff --git a/examples/nginx-app/readme.md b/examples/nginx-app/readme.md
deleted file mode 100644
index c267cfbb1fc..00000000000
--- a/examples/nginx-app/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Overview
-
-This application is an example app.
-
-### Awesome
-
-Even though it does not have any features it is still pretty awesome.
diff --git a/examples/nginx-app/src/components/config.html b/examples/nginx-app/src/components/config.html
deleted file mode 100644
index c531ec36d76..00000000000
--- a/examples/nginx-app/src/components/config.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>
-	Nginx config!
-</h3>
diff --git a/examples/nginx-app/src/components/config.js b/examples/nginx-app/src/components/config.js
deleted file mode 100644
index bb8f007b9bc..00000000000
--- a/examples/nginx-app/src/components/config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-
-export class NginxAppConfigCtrl {
-}
-NginxAppConfigCtrl.templateUrl = 'components/config.html';
-
-
diff --git a/examples/nginx-app/src/components/logs.html b/examples/nginx-app/src/components/logs.html
deleted file mode 100644
index ca215772bf5..00000000000
--- a/examples/nginx-app/src/components/logs.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>
-	Logs page!
-</h3>
diff --git a/examples/nginx-app/src/components/logs.js b/examples/nginx-app/src/components/logs.js
deleted file mode 100644
index 5b67290381b..00000000000
--- a/examples/nginx-app/src/components/logs.js
+++ /dev/null
@@ -1,6 +0,0 @@
-
-export class LogsPageCtrl {
-}
-LogsPageCtrl.templateUrl = 'components/logs.html';
-
-
diff --git a/examples/nginx-app/src/components/stream.html b/examples/nginx-app/src/components/stream.html
deleted file mode 100644
index ad70ca4df50..00000000000
--- a/examples/nginx-app/src/components/stream.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>
-	Stream page!
-</h3>
diff --git a/examples/nginx-app/src/components/stream.js b/examples/nginx-app/src/components/stream.js
deleted file mode 100644
index 8684b36c64d..00000000000
--- a/examples/nginx-app/src/components/stream.js
+++ /dev/null
@@ -1,6 +0,0 @@
-
-export class StreamPageCtrl {
-}
-StreamPageCtrl.templateUrl = 'components/stream.html';
-
-
diff --git a/examples/nginx-app/src/css/dark.css b/examples/nginx-app/src/css/dark.css
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/examples/nginx-app/src/css/light.css b/examples/nginx-app/src/css/light.css
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/examples/nginx-app/src/dashboards/dashboard.js b/examples/nginx-app/src/dashboards/dashboard.js
deleted file mode 100644
index 794e2c5217b..00000000000
--- a/examples/nginx-app/src/dashboards/dashboard.js
+++ /dev/null
@@ -1,17 +0,0 @@
-require([
-], function () {
-
-  function Dashboard() {
-
-    this.getInputs = function() {
-
-    };
-
-    this.buildDashboard = function() {
-
-    };
-  }
-
-  return Dashboard;
-});
-
diff --git a/examples/nginx-app/src/dashboards/nginx_connection_stats.json b/examples/nginx-app/src/dashboards/nginx_connection_stats.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/examples/nginx-app/src/datasource/datasource.js b/examples/nginx-app/src/datasource/datasource.js
deleted file mode 100644
index 7f4ed363707..00000000000
--- a/examples/nginx-app/src/datasource/datasource.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export default class NginxDatasource {
-
-  constructor() {}
-
-  query(options) {
-    return [];
-  }
-
-  testDatasource() {
-    return false;
-  }
-}
diff --git a/examples/nginx-app/src/datasource/module.js b/examples/nginx-app/src/datasource/module.js
deleted file mode 100644
index a3473e59889..00000000000
--- a/examples/nginx-app/src/datasource/module.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import {Datasource} from  './datasource';
-
-export {
-  Datasource
-};
\ No newline at end of file
diff --git a/examples/nginx-app/src/datasource/plugin.json b/examples/nginx-app/src/datasource/plugin.json
deleted file mode 100644
index ffce9492418..00000000000
--- a/examples/nginx-app/src/datasource/plugin.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "type": "datasource",
-  "name": "Nginx Datasource",
-  "id": "nginx-datasource"
-}
diff --git a/examples/nginx-app/src/img/logo_large.png b/examples/nginx-app/src/img/logo_large.png
deleted file mode 100644
index c28955960e4..00000000000
Binary files a/examples/nginx-app/src/img/logo_large.png and /dev/null differ
diff --git a/examples/nginx-app/src/img/logo_small.png b/examples/nginx-app/src/img/logo_small.png
deleted file mode 100644
index a6040f66f3d..00000000000
Binary files a/examples/nginx-app/src/img/logo_small.png and /dev/null differ
diff --git a/examples/nginx-app/src/module.js b/examples/nginx-app/src/module.js
deleted file mode 100644
index b5aeecc6ccf..00000000000
--- a/examples/nginx-app/src/module.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import {LogsPageCtrl} from './components/logs';
-import {StreamPageCtrl} from './components/stream';
-import {NginxAppConfigCtrl} from './components/config';
-
-export {
-  NginxAppConfigCtrl as ConfigCtrl,
-  StreamPageCtrl,
-  LogsPageCtrl
-};
diff --git a/examples/nginx-app/src/panel/module.js b/examples/nginx-app/src/panel/module.js
deleted file mode 100644
index 899586da81b..00000000000
--- a/examples/nginx-app/src/panel/module.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import {PanelCtrl} from  'app/plugins/sdk';
-
-class NginxPanelCtrl extends PanelCtrl {
-
-  constructor($scope, $injector) {
-    super($scope, $injector);
-  }
-
-}
-NginxPanelCtrl.template = '<h2>nginx!</h2>';
-
-export {
-  NginxPanelCtrl as PanelCtrl
-};
-
diff --git a/examples/nginx-app/src/panel/plugin.json b/examples/nginx-app/src/panel/plugin.json
deleted file mode 100644
index f3548c987f3..00000000000
--- a/examples/nginx-app/src/panel/plugin.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "type": "panel",
-  "name": "Nginx Panel",
-  "id": "nginx-panel"
-}