diff --git a/packages/stargate/package.json b/packages/stargate/package.json
index afc3c89b..a74d9f4f 100644
--- a/packages/stargate/package.json
+++ b/packages/stargate/package.json
@@ -7,7 +7,7 @@
   ],
   "license": "Apache-2.0",
   "main": "build/index.js",
-  "types": "types/index.d.ts",
+  "types": "build/index.d.ts",
   "files": [
     "build/",
     "types/",
@@ -29,10 +29,10 @@
     "lint": "eslint --max-warnings 0 \"**/*.{js,ts}\"",
     "lint-fix": "eslint --max-warnings 0 \"**/*.{js,ts}\" --fix",
     "move-types": "shx rm -rf ./types/* && shx mv build/types/* ./types && shx rm -rf ./types/testdata ./types/*.spec.d.ts ./types/*/*.spec.d.ts \"./types/codec/**/*[!.d].ts\"",
-    "format-types": "prettier --write --loglevel warn \"./types/**/*.d.ts\"",
+    "format-types": "prettier --write --loglevel warn \"./build/**/*.d.ts\"",
     "prebuild": "shx rm -rf ./build",
-    "build": "tsc && shx cp -R ./src/codec ./build/ && shx mkdir -p ./build/types/codec && shx cp -R ./src/codec ./build/types/",
-    "postbuild": "yarn move-types && yarn format-types",
+    "build": "tsc",
+    "postbuild": "yarn format-types",
     "build-or-skip": "[ -n \"$SKIP_BUILD\" ] || yarn build",
     "test-node": "node jasmine-testrunner.js",
     "test-firefox": "yarn pack-web && karma start --single-run --browsers Firefox",
diff --git a/packages/stargate/tsconfig.json b/packages/stargate/tsconfig.json
index c605e918..4840979d 100644
--- a/packages/stargate/tsconfig.json
+++ b/packages/stargate/tsconfig.json
@@ -3,7 +3,6 @@
   "compilerOptions": {
     "baseUrl": ".",
     "outDir": "build",
-    "declarationDir": "build/types",
     "experimentalDecorators": true,
     "rootDir": "src"
   },