diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json
index f192addf498..6f566007392 100644
--- a/packages/grafana-toolkit/package.json
+++ b/packages/grafana-toolkit/package.json
@@ -100,6 +100,5 @@
   },
   "_moduleAliases": {
     "puppeteer": "node_modules/puppeteer-core"
-  },
-  "types": "src/index.ts"
+  }
 }
diff --git a/packages/grafana-toolkit/src/cli/tasks/toolkit.build.ts b/packages/grafana-toolkit/src/cli/tasks/toolkit.build.ts
index 0c15d36dc1f..2cbcfaceb0f 100644
--- a/packages/grafana-toolkit/src/cli/tasks/toolkit.build.ts
+++ b/packages/grafana-toolkit/src/cli/tasks/toolkit.build.ts
@@ -3,7 +3,6 @@ import * as fs from 'fs';
 import chalk from 'chalk';
 import { useSpinner } from '../utils/useSpinner';
 import { Task, TaskRunner } from './task';
-import escapeRegExp from 'lodash/escapeRegExp';
 
 const path = require('path');
 
@@ -120,21 +119,6 @@ const toolkitBuildTaskRunner: TaskRunner<ToolkitBuildOptions> = async () => {
   fs.mkdirSync('./dist/sass');
   await copyFiles();
   await copySassFiles();
-
-  // RYAN HACK HACK HACK
-  // when Dominik is back from vacation, we can find a better way
-  // This moves the index to the root so plugin e2e tests can import them
-  console.warn('hacking an index.js file for toolkit.  Help!');
-  const index = `${distDir}/src/index.js`;
-  fs.readFile(index, 'utf8', (err, data) => {
-    const pattern = 'require("./';
-    const js = data.replace(new RegExp(escapeRegExp(pattern), 'g'), 'require("./src/');
-    fs.writeFile(`${distDir}/index.js`, js, err => {
-      if (err) {
-        throw new Error('Error writing index: ' + err);
-      }
-    });
-  });
 };
 
 export const toolkitBuildTask = new Task<ToolkitBuildOptions>('@grafana/toolkit build', toolkitBuildTaskRunner);
diff --git a/packages/grafana-toolkit/src/index.ts b/packages/grafana-toolkit/src/index.ts
deleted file mode 100644
index 43aec1e18fa..00000000000
--- a/packages/grafana-toolkit/src/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from './e2e';
-
-// Namespace for Plugins
-import * as plugins from './plugins';
-
-export { plugins };
diff --git a/packages/grafana-toolkit/src/plugins/e2e/commonPluginTests.ts b/packages/grafana-toolkit/src/plugins/e2e/commonPluginTests.ts
index e6784908c7f..9cb89c86cec 100644
--- a/packages/grafana-toolkit/src/plugins/e2e/commonPluginTests.ts
+++ b/packages/grafana-toolkit/src/plugins/e2e/commonPluginTests.ts
@@ -1,6 +1,7 @@
 import { Browser, Page } from 'puppeteer-core';
 
-import { e2eScenario, takeScreenShot, plugins, pages } from '@grafana/toolkit';
+import { e2eScenario, takeScreenShot, pages } from '@grafana/toolkit/src/e2e';
+import { getEndToEndSettings } from '@grafana/toolkit/src/plugins';
 
 // ****************************************************************
 // NOTE, This file is copied to plugins at runtime, it is not run locally
@@ -11,7 +12,7 @@ const sleep = (milliseconds: number) => {
 };
 
 e2eScenario('Common Plugin Test', 'should pass', async (browser: Browser, page: Page) => {
-  const settings = plugins.getEndToEndSettings();
+  const settings = getEndToEndSettings();
   const pluginPage = pages.getPluginPage(settings.plugin.id);
   await pluginPage.init(page);
   await pluginPage.navigateTo();
diff --git a/packages/grafana-toolkit/tsconfig.json b/packages/grafana-toolkit/tsconfig.json
index 749b387179a..f888b9d3877 100644
--- a/packages/grafana-toolkit/tsconfig.json
+++ b/packages/grafana-toolkit/tsconfig.json
@@ -7,7 +7,7 @@
     "rootDirs": ["."],
     "outDir": "dist/src",
     "declaration": true,
-    "declarationDir": "dist",
+    "declarationDir": "dist/src",
     "typeRoots": ["./node_modules/@types"],
     "esModuleInterop": true,
     "lib": ["es2015", "es2017.string", "dom"]
diff --git a/public/e2e-test/pages/dashboards/createDashboardPage.ts b/public/e2e-test/pages/dashboards/createDashboardPage.ts
index ba312c038f9..3c9212b98b9 100644
--- a/public/e2e-test/pages/dashboards/createDashboardPage.ts
+++ b/public/e2e-test/pages/dashboards/createDashboardPage.ts
@@ -1,4 +1,4 @@
-import { TestPage, ClickablePageObjectType, ClickablePageObject, Selector } from '@grafana/toolkit';
+import { TestPage, ClickablePageObjectType, ClickablePageObject, Selector } from '@grafana/toolkit/src/e2e';
 
 export interface CreateDashboardPage {
   addQuery: ClickablePageObjectType;
diff --git a/public/e2e-test/pages/dashboards/dashboardsPage.ts b/public/e2e-test/pages/dashboards/dashboardsPage.ts
index 67b525e5932..8c2cb6d7887 100644
--- a/public/e2e-test/pages/dashboards/dashboardsPage.ts
+++ b/public/e2e-test/pages/dashboards/dashboardsPage.ts
@@ -1,4 +1,4 @@
-import { TestPage, ClickablePageObjectType, ClickablePageObject, Selector } from '@grafana/toolkit';
+import { TestPage, ClickablePageObjectType, ClickablePageObject, Selector } from '@grafana/toolkit/src/e2e';
 
 export interface DashboardsPage {
   dashboard: ClickablePageObjectType;
diff --git a/public/e2e-test/pages/dashboards/saveDashboardModal.ts b/public/e2e-test/pages/dashboards/saveDashboardModal.ts
index 6d0ea6163e8..d9225b43f54 100644
--- a/public/e2e-test/pages/dashboards/saveDashboardModal.ts
+++ b/public/e2e-test/pages/dashboards/saveDashboardModal.ts
@@ -6,7 +6,7 @@ import {
   InputPageObjectType,
   InputPageObject,
   PageObject,
-} from '@grafana/toolkit';
+} from '@grafana/toolkit/src/e2e';
 
 export interface SaveDashboardModal {
   name: InputPageObjectType;
diff --git a/public/e2e-test/pages/datasources/addDataSourcePage.ts b/public/e2e-test/pages/datasources/addDataSourcePage.ts
index cf7cbcf6249..48c386e21bf 100644
--- a/public/e2e-test/pages/datasources/addDataSourcePage.ts
+++ b/public/e2e-test/pages/datasources/addDataSourcePage.ts
@@ -1,4 +1,4 @@
-import { TestPage, ClickablePageObject, Selector, ClickablePageObjectType } from '@grafana/toolkit';
+import { TestPage, ClickablePageObject, Selector, ClickablePageObjectType } from '@grafana/toolkit/src/e2e';
 
 export interface AddDataSourcePage {
   testDataDB: ClickablePageObjectType;
diff --git a/public/e2e-test/pages/datasources/dataSources.ts b/public/e2e-test/pages/datasources/dataSources.ts
index b52560b13af..e3325fb54b6 100644
--- a/public/e2e-test/pages/datasources/dataSources.ts
+++ b/public/e2e-test/pages/datasources/dataSources.ts
@@ -1,4 +1,4 @@
-import { TestPage } from '@grafana/toolkit';
+import { TestPage } from '@grafana/toolkit/src/e2e';
 
 export interface DataSourcesPage {}
 
diff --git a/public/e2e-test/pages/datasources/editDataSourcePage.ts b/public/e2e-test/pages/datasources/editDataSourcePage.ts
index d508789ecc1..38303b17de6 100644
--- a/public/e2e-test/pages/datasources/editDataSourcePage.ts
+++ b/public/e2e-test/pages/datasources/editDataSourcePage.ts
@@ -5,7 +5,7 @@ import {
   ClickablePageObject,
   PageObject,
   Selector,
-} from '@grafana/toolkit';
+} from '@grafana/toolkit/src/e2e';
 
 export interface EditDataSourcePage {
   saveAndTest: ClickablePageObjectType;
diff --git a/public/e2e-test/pages/panels/editPanel.ts b/public/e2e-test/pages/panels/editPanel.ts
index 4bc6f8f0470..3a542a4e885 100644
--- a/public/e2e-test/pages/panels/editPanel.ts
+++ b/public/e2e-test/pages/panels/editPanel.ts
@@ -5,7 +5,7 @@ import {
   Selector,
   ClickablePageObjectType,
   ClickablePageObject,
-} from '@grafana/toolkit';
+} from '@grafana/toolkit/src/e2e';
 
 export interface EditPanelPage {
   queriesTab: ClickablePageObjectType;
diff --git a/public/e2e-test/pages/panels/panel.ts b/public/e2e-test/pages/panels/panel.ts
index 78a35b96349..15580d07a49 100644
--- a/public/e2e-test/pages/panels/panel.ts
+++ b/public/e2e-test/pages/panels/panel.ts
@@ -1,4 +1,4 @@
-import { TestPage, ClickablePageObjectType, ClickablePageObject, Selector } from '@grafana/toolkit';
+import { TestPage, ClickablePageObjectType, ClickablePageObject, Selector } from '@grafana/toolkit/src/e2e';
 
 export interface Panel {
   panelTitle: ClickablePageObjectType;
diff --git a/public/e2e-test/pages/panels/sharePanelModal.ts b/public/e2e-test/pages/panels/sharePanelModal.ts
index c8dd1e1fb47..39b08821fcd 100644
--- a/public/e2e-test/pages/panels/sharePanelModal.ts
+++ b/public/e2e-test/pages/panels/sharePanelModal.ts
@@ -1,4 +1,4 @@
-import { TestPage, ClickablePageObjectType, ClickablePageObject, Selector } from '@grafana/toolkit';
+import { TestPage, ClickablePageObjectType, ClickablePageObject, Selector } from '@grafana/toolkit/src/e2e';
 
 export interface SharePanelModal {
   directLinkRenderedImage: ClickablePageObjectType;
diff --git a/public/e2e-test/scenarios/smoke.test.ts b/public/e2e-test/scenarios/smoke.test.ts
index 85740a7a770..fa93014d481 100644
--- a/public/e2e-test/scenarios/smoke.test.ts
+++ b/public/e2e-test/scenarios/smoke.test.ts
@@ -1,6 +1,6 @@
 import { Browser, Page, Target } from 'puppeteer-core';
 
-import { e2eScenario, constants, takeScreenShot, compareScreenShots } from '@grafana/toolkit';
+import { e2eScenario, constants, takeScreenShot, compareScreenShots } from '@grafana/toolkit/src/e2e';
 import { addDataSourcePage } from 'e2e-test/pages/datasources/addDataSourcePage';
 import { editDataSourcePage } from 'e2e-test/pages/datasources/editDataSourcePage';
 import { dataSourcesPage } from 'e2e-test/pages/datasources/dataSources';