diff --git a/sdk/storage/storage-blob/api-extractor.json b/sdk/storage/storage-blob/api-extractor.json
index 9d52d2a63383..ede224adc3de 100644
--- a/sdk/storage/storage-blob/api-extractor.json
+++ b/sdk/storage/storage-blob/api-extractor.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "mainEntryPointFilePath": "typings/latest/src/index.d.ts",
+  "mainEntryPointFilePath": "typings/latest/storage-blob/src/index.d.ts",
   "docModel": {
     "enabled": false
   },
@@ -28,4 +28,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/sdk/storage/storage-blob/package.json b/sdk/storage/storage-blob/package.json
index 4ff1955e951c..17bfddd4584d 100644
--- a/sdk/storage/storage-blob/package.json
+++ b/sdk/storage/storage-blob/package.json
@@ -4,14 +4,14 @@
   "version": "12.2.0",
   "description": "Microsoft Azure Storage SDK for JavaScript - Blob",
   "main": "./dist/index.js",
-  "module": "./dist-esm/src/index.js",
+  "module": "./dist-esm/storage-blob/src/index.js",
   "browser": {
-    "./dist-esm/src/index.js": "./dist-esm/src/index.browser.js",
-    "./dist-esm/src/credentials/StorageSharedKeyCredential.js": "./dist-esm/src/credentials/StorageSharedKeyCredential.browser.js",
-    "./dist-esm/src/utils/utils.node.js": "./dist-esm/src/utils/utils.browser.js",
-    "./dist-esm/test/utils/index.js": "./dist-esm/test/utils/index.browser.js",
-    "./dist-esm/src/BatchUtils.js": "./dist-esm/src/BatchUtils.browser.js",
-    "./dist-esm/src/BlobDownloadResponse.js": "./dist-esm/src/BlobDownloadResponse.browser.js",
+    "./dist-esm/storage-blob/src/index.js": "./dist-esm/storage-blob/src/index.browser.js",
+    "./dist-esm/storage-blob/src/credentials/StorageSharedKeyCredential.js": "./dist-esm/storage-blob/src/credentials/StorageSharedKeyCredential.browser.js",
+    "./dist-esm/storage-blob/src/utils/utils.node.js": "./dist-esm/storage-blob/src/utils/utils.browser.js",
+    "./dist-esm/storage-blob/test/utils/index.js": "./dist-esm/storage-blob/test/utils/index.browser.js",
+    "./dist-esm/storage-blob/src/BatchUtils.js": "./dist-esm/storage-blob/src/BatchUtils.browser.js",
+    "./dist-esm/storage-blob/src/BlobDownloadResponse.js": "./dist-esm/storage-blob/src/BlobDownloadResponse.browser.js",
     "fs": false,
     "os": false,
     "process": false
@@ -46,7 +46,7 @@
     "execute:samples": "npm run build:samples && npm run execute:js-samples && npm run execute:ts-samples",
     "format": "prettier --write --config ../../.prettierrc.json \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
     "integration-test:browser": "karma start --single-run",
-    "integration-test:node": "nyc mocha -r esm --require source-map-support/register --reporter ../../../common/tools/mocha-multi-reporter.js --full-trace -t 300000  dist-esm/test/*.spec.js dist-esm/test/node/*.spec.js",
+    "integration-test:node": "nyc mocha -r esm --require source-map-support/register --reporter ../../../common/tools/mocha-multi-reporter.js --full-trace -t 300000  dist-esm/storage-blob/test/*.spec.js dist-esm/storage-blob/test/node/*.spec.js",
     "integration-test": "npm run integration-test:node && npm run integration-test:browser",
     "lint:fix": "eslint -c ../../.eslintrc.old.json src test samples --ext .ts --fix",
     "lint": "eslint -c ../../.eslintrc.old.json src test samples --ext .ts -f html -o storage-blob-lintReport.html || exit 0",
@@ -63,7 +63,7 @@
   "files": [
     "BreakingChanges.md",
     "dist/",
-    "dist-esm/src/",
+    "dist-esm/storage-blob/src/",
     "typings/latest/storage-blob.d.ts",
     "typings/3.1/storage-blob.d.ts",
     "README.md",
@@ -161,4 +161,4 @@
     "typescript": "~3.8.3",
     "util": "^0.12.1"
   }
-}
+}
\ No newline at end of file
diff --git a/sdk/storage/storage-blob/rollup.base.config.js b/sdk/storage/storage-blob/rollup.base.config.js
index f0a687a6f317..d3ff2d0f3dfc 100644
--- a/sdk/storage/storage-blob/rollup.base.config.js
+++ b/sdk/storage/storage-blob/rollup.base.config.js
@@ -33,7 +33,7 @@ export function nodeConfig(test = false) {
     "util"
   ];
   const baseConfig = {
-    input: "dist-esm/src/index.js",
+    input: "dist-esm/storage-blob/src/index.js",
     external: depNames.concat(externalNodeBuiltins),
     output: {
       file: "dist/index.js",
@@ -65,9 +65,9 @@ export function nodeConfig(test = false) {
   if (test) {
     // entry point is every test file
     baseConfig.input = [
-      "dist-esm/test/*.spec.js",
-      "dist-esm/test/node/*.spec.js",
-      "dist-esm/src/index.js"
+      "dist-esm/storage-blob/test/*.spec.js",
+      "dist-esm/storage-blob/test/node/*.spec.js",
+      "dist-esm/storage-blob/src/index.js"
     ];
     baseConfig.plugins.unshift(multiEntry());
 
@@ -92,7 +92,7 @@ export function nodeConfig(test = false) {
 
 export function browserConfig(test = false) {
   const baseConfig = {
-    input: "dist-esm/src/index.browser.js",
+    input: "dist-esm/storage-blob/src/index.browser.js",
     output: {
       file: "dist-browser/azure-storage-blob.js",
       banner: banner,
@@ -159,7 +159,7 @@ export function browserConfig(test = false) {
   };
 
   if (test) {
-    baseConfig.input = ["dist-esm/test/*.spec.js", "dist-esm/test/browser/*.spec.js"];
+    baseConfig.input = ["dist-esm/storage-blob/test/*.spec.js", "dist-esm/storage-blob/test/browser/*.spec.js"];
     baseConfig.plugins.unshift(multiEntry({ exports: false }));
     baseConfig.output.file = "dist-test/index.browser.js";
     // mark fs-extra as external
diff --git a/sdk/storage/storage-blob/src/index.ts b/sdk/storage/storage-blob/src/index.ts
index 6cb9eee5aa44..50e0c51576ce 100644
--- a/sdk/storage/storage-blob/src/index.ts
+++ b/sdk/storage/storage-blob/src/index.ts
@@ -48,3 +48,6 @@ export {
   BlobBeginCopyFromUrlPollState,
   CopyPollerBlobClient
 } from "./pollers/BlobStartCopyFromUrlPoller";
+
+import { IReadable } from '../../storage-internal-avro/src'
+export { IReadable }
diff --git a/sdk/storage/storage-blob/tsconfig.json b/sdk/storage/storage-blob/tsconfig.json
index 7d0f438f54f6..f89af540f58e 100644
--- a/sdk/storage/storage-blob/tsconfig.json
+++ b/sdk/storage/storage-blob/tsconfig.json
@@ -21,6 +21,6 @@
     "esModuleInterop": true
   },
   "compileOnSave": true,
-  "exclude": ["node_modules", "./samples/**"],
-  "include": ["./src/**/*.ts", "./test/**/*.ts"]
+  "exclude": ["node_modules", "../storage-internal-avro/node_modules", "./samples/**"],
+  "include": ["./src/**/*.ts", "./test/**/*.ts", "../storage-internal-avro/**/*.ts"]
 }