diff --git a/packages/@azure/applicationinsights-query/README.md b/packages/@azure/applicationinsights-query/README.md
index 613b0672fe3a..6e0fb30f88c3 100644
--- a/packages/@azure/applicationinsights-query/README.md
+++ b/packages/@azure/applicationinsights-query/README.md
@@ -11,7 +11,7 @@ npm install @azure/applicationinsights-query
 ```
 - browser
 ```html
-<script type="text/javascript" src="@azure/applicationinsights-query/dist/applicationinsights-query.js"></script>
+<script type="text/javascript" src="@azure/applicationinsights-query/applicationInsightsDataClientBundle.js"></script>
 ```
 
 ## How to use
@@ -51,13 +51,13 @@ client.metrics.get(appId, metricId, timespan, interval, aggregation, segment, to
 <html lang="en">
   <head>
     <title>@azure/applicationinsights-query sample</title>
-    <script type="text/javascript" src="./node_modules/ms-rest-js/dist/msRest.browser.js"></script>
-    <script type="text/javascript" src="./dist/applicationinsights-query.js"></script>
+    <script type="text/javascript" src="./node_modules/ms-rest-js/msRestBundle.js"></script>
+    <script type="text/javascript" src="./applicationInsightsDataClientBundle.js"></script>
     <script type="text/javascript">
       const subscriptionId = "<Subscription_Id>";
       const token = "<access_token>";
       const creds = new msRest.TokenCredentials(token);
-      const client = new Azure.ApplicationinsightsQuery.ApplicationInsightsDataClient(creds, subscriptionId);
+      const client = new ApplicationInsightsDataClient(creds, subscriptionId);
       const appId = "testappId";
       const metricId = "requests/count";
       const timespan = "testtimespan";
diff --git a/packages/@azure/applicationinsights-query/lib/models/metricsMappers.ts b/packages/@azure/applicationinsights-query/lib/models/metricsMappers.ts
index 63828bb2eb67..5f1701e17bff 100644
--- a/packages/@azure/applicationinsights-query/lib/models/metricsMappers.ts
+++ b/packages/@azure/applicationinsights-query/lib/models/metricsMappers.ts
@@ -14,8 +14,6 @@ export {
   MetricsResultInfo,
   MetricsSegmentInfo,
   ErrorResponse,
-  ErrorInfo,
-  ErrorDetail,
   MetricsPostBodySchema,
   MetricsPostBodySchemaParameters,
   MetricsResultsItem
diff --git a/packages/@azure/applicationinsights-query/lib/models/queryMappers.ts b/packages/@azure/applicationinsights-query/lib/models/queryMappers.ts
index a2bf85da4560..5027c7adaa7f 100644
--- a/packages/@azure/applicationinsights-query/lib/models/queryMappers.ts
+++ b/packages/@azure/applicationinsights-query/lib/models/queryMappers.ts
@@ -14,8 +14,6 @@ export {
   QueryResults,
   Table,
   Column,
-  ErrorResponse,
-  ErrorInfo,
-  ErrorDetail
+  ErrorResponse
 } from "../models/mappers";
 
diff --git a/packages/@azure/applicationinsights-query/package.json b/packages/@azure/applicationinsights-query/package.json
index 9afe8f5a784b..56c0e05371a7 100644
--- a/packages/@azure/applicationinsights-query/package.json
+++ b/packages/@azure/applicationinsights-query/package.json
@@ -4,8 +4,7 @@
   "description": "ApplicationInsightsDataClient Library with typescript type definitions for node.js and browser.",
   "version": "1.0.0-preview",
   "dependencies": {
-    "ms-rest-js": "^1.0.455",
-    "tslib": "^1.9.3"
+    "ms-rest-js": "~0.22.426"
   },
   "keywords": [
     "node",
@@ -15,14 +14,14 @@
     "isomorphic"
   ],
   "license": "MIT",
-  "main": "./dist/applicationinsights-query.js",
+  "main": "./cjs/applicationInsightsDataClient.js",
   "module": "./esm/applicationInsightsDataClient.js",
-  "types": "./esm/applicationInsightsDataClient.d.ts",
+  "types": "./cjs/applicationInsightsDataClient.d.ts",
   "devDependencies": {
-    "typescript": "^3.1.1",
-    "rollup": "^0.66.2",
-    "rollup-plugin-node-resolve": "^3.4.0",
-    "uglify-js": "^3.4.9"
+    "tslib": "^1.9.3",
+    "typescript": "^3.0.3",
+    "webpack": "^4.17.2",
+    "webpack-cli": "^3.1.0"
   },
   "homepage": "https://github.com/azure/azure-sdk-for-js/tree/master/packages/@azure/applicationinsights-query",
   "repository": {
@@ -33,9 +32,7 @@
     "url": "https://github.com/azure/azure-sdk-for-js/issues"
   },
   "scripts": {
-    "build": "tsc && rollup -c rollup.config.js && npm run minify",
-    "minify": "uglifyjs -c -m --comments --source-map \"content='./dist/applicationinsights-query.js.map'\" -o ./dist/applicationinsights-query.min.js ./dist/applicationinsights-query.js",
+    "build": "tsc && tsc -p tsconfig.esm.json && webpack",
     "prepare": "npm run build"
-  },
-  "sideEffects": false
+  }
 }
diff --git a/packages/@azure/applicationinsights-query/tsconfig.esm.json b/packages/@azure/applicationinsights-query/tsconfig.esm.json
new file mode 100644
index 000000000000..0b3aed07505c
--- /dev/null
+++ b/packages/@azure/applicationinsights-query/tsconfig.esm.json
@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig",
+  "compilerOptions": {
+    "outDir": "./esm",
+    "module": "es6",
+    "target": "es5"
+  }
+}
diff --git a/packages/@azure/applicationinsights-query/tsconfig.json b/packages/@azure/applicationinsights-query/tsconfig.json
index f32d1664f320..d5b25971c029 100644
--- a/packages/@azure/applicationinsights-query/tsconfig.json
+++ b/packages/@azure/applicationinsights-query/tsconfig.json
@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
-    "module": "es6",
+    "module": "commonjs",
     "moduleResolution": "node",
     "strict": true,
-    "target": "es5",
+    "target": "es6",
     "sourceMap": true,
     "declarationMap": true,
     "esModuleInterop": true,
@@ -11,8 +11,7 @@
     "forceConsistentCasingInFileNames": true,
     "lib": ["es6"],
     "declaration": true,
-    "outDir": "./esm",
-    "importHelpers": true
+    "outDir": "./cjs"
   },
   "include": ["./lib/**/*"],
   "exclude": ["node_modules"]
diff --git a/packages/@azure/applicationinsights-query/webpack.config.js b/packages/@azure/applicationinsights-query/webpack.config.js
new file mode 100644
index 000000000000..148210d73ad8
--- /dev/null
+++ b/packages/@azure/applicationinsights-query/webpack.config.js
@@ -0,0 +1,30 @@
+// This is a template webpack config file with minimal configuration.
+// Users are free to create their own webpack configuration files in their application.
+const path = require('path');
+
+/**
+ * @type {import('webpack').Configuration}
+ */
+const config = {
+  mode: 'production',
+  entry: './esm/applicationInsightsDataClient.js',
+  devtool: 'source-map',
+  output: {
+    filename: 'applicationInsightsDataClientBundle.js',
+    path: __dirname,
+    libraryTarget: 'var',
+    library: 'applicationInsightsDataClient'
+  },
+  // "ms-rest-js" and "ms-rest-azure-js" are dependencies of this library.
+  // Customer is expected to import/include this library in browser javascript
+  // (probably using the script tag in their html file).
+  externals: {
+    "ms-rest-js": "msRest",
+    "ms-rest-azure-js": "msRestAzure"
+  },
+  resolve: {
+    extensions: [".tsx", ".ts", ".js"]
+  }
+};
+
+module.exports = config;
