diff --git a/package.json b/package.json
index 692ddd42a..a19dcbab8 100644
--- a/package.json
+++ b/package.json
@@ -3,12 +3,10 @@
   "private": true,
   "description": "Polymer tooling monorepo!",
   "homepage": "https://github.com/Polymer/tools",
+  "repository": "https://github.com/Polymer/tools",
   "bugs": "https://github.com/Polymer/tools/issues",
   "license": "BSD-3-Clause",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Polymer/tools.git"
-  },
+  "author": "The Polymer Project Authors",
   "scripts": {
     "bootstrap": "lerna bootstrap --ci",
     "build": "lerna run build --stream",
diff --git a/packages/analyzer/package.json b/packages/analyzer/package.json
index ae4e30f22..d2c978569 100644
--- a/packages/analyzer/package.json
+++ b/packages/analyzer/package.json
@@ -2,13 +2,11 @@
   "name": "polymer-analyzer",
   "version": "3.0.0-pre.24",
   "description": "Static analysis for Web Components",
-  "homepage": "https://github.com/Polymer/polymer-analyzer",
-  "bugs": "https://github.com/Polymer/polymer-analyzer/issues",
+  "homepage": "https://github.com/Polymer/tools/tree/master/packages/analyzer",
+  "repository": "github:Polymer/tools",
+  "bugs": "https://github.com/Polymer/tools/issues",
   "license": "BSD-3-Clause",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Polymer/polymer-analyzer.git"
-  },
+  "author": "The Polymer Project Authors",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
diff --git a/packages/browser-capabilities/package.json b/packages/browser-capabilities/package.json
index 0b7b9339c..b8ebf35c1 100644
--- a/packages/browser-capabilities/package.json
+++ b/packages/browser-capabilities/package.json
@@ -2,14 +2,16 @@
   "name": "browser-capabilities",
   "version": "1.0.0",
   "description": "Detect browser capabilities from a user agent string.",
-  "repository": "git+https://github.com/Polymer/browser-capabilities.git",
+  "homepage": "https://github.com/Polymer/tools/tree/master/packages/browser-capabilities",
+  "repository": "github:Polymer/tools",
+  "bugs": "https://github.com/Polymer/tools/issues",
+  "license": "BSD-3-Clause",
+  "author": "The Polymer Project Authors",
   "main": "lib/browser-capabilities.js",
   "types": "lib/browser-capabilities.d.ts",
   "engines": {
     "node": ">=8.0"
   },
-  "author": "The Polymer Project Authors",
-  "license": "BSD-3-Clause",
   "scripts": {
     "build": "rm -Rf lib/ && tsc",
     "build:watch": "tsc --watch",
diff --git a/packages/build/package.json b/packages/build/package.json
index 7d2eee20b..665ac6cd8 100644
--- a/packages/build/package.json
+++ b/packages/build/package.json
@@ -2,6 +2,11 @@
   "name": "polymer-build",
   "version": "3.0.0-pre.16",
   "description": "A library of Gulp build tasks",
+  "homepage": "https://github.com/Polymer/tools/tree/master/packages/build",
+  "repository": "github:Polymer/tools",
+  "bugs": "https://github.com/Polymer/tools/issues",
+  "license": "BSD-3-Clause",
+  "author": "The Polymer Project Authors",
   "main": "lib/polymer-build.js",
   "typings": "lib/polymer-build.d.ts",
   "scripts": {
@@ -13,16 +18,6 @@
     "prepublishOnly": "npm test",
     "format": "find src/ -iname \"*.ts\" -o -iname \"*.js\" | xargs clang-format --style=file -i"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Polymer/polymer-build.git"
-  },
-  "author": "The Polymer Project Authors",
-  "license": "BSD-3-Clause",
-  "bugs": {
-    "url": "https://github.com/Polymer/polymer-build/issues"
-  },
-  "homepage": "https://github.com/Polymer/polymer-build#readme",
   "dependencies": {
     "@babel/core": "^7.0.0-beta.46",
     "@babel/plugin-external-helpers": "^7.0.0-beta.46",
diff --git a/packages/bundler/package.json b/packages/bundler/package.json
index 90140890c..3565433fd 100644
--- a/packages/bundler/package.json
+++ b/packages/bundler/package.json
@@ -2,6 +2,11 @@
   "name": "polymer-bundler",
   "version": "4.0.0-pre.6",
   "description": "Process Web Components into one output file",
+  "homepage": "https://github.com/Polymer/tools/tree/master/packages/bundler",
+  "repository": "github:Polymer/tools",
+  "bugs": "https://github.com/Polymer/tools/issues",
+  "license": "BSD-3-Clause",
+  "author": "The Polymer Project Authors",
   "main": "lib/bundler.js",
   "typings": "lib/bundler.d.ts",
   "files": [
@@ -60,7 +65,6 @@
     "test:unit": "mocha \"lib/test/**/*_test.js\"",
     "test:watch": "tsc-then -- mocha \"lib/test/**/*_test.js\""
   },
-  "author": "The Polymer Project Authors",
   "license": "BSD-3-Clause",
   "directories": {
     "test": "test"
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 332a448ba..e7b7e7ad9 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -2,6 +2,11 @@
   "name": "polymer-cli",
   "version": "1.7.0-pre.16",
   "description": "A commandline tool for Polymer projects",
+  "homepage": "https://github.com/Polymer/tools/tree/master/packages/cli",
+  "repository": "github:Polymer/tools",
+  "bugs": "https://github.com/Polymer/tools/issues",
+  "license": "BSD-3-Clause",
+  "author": "The Polymer Project Authors",
   "main": "lib/polymer-cli.js",
   "engines": {
     "node": ">=8.0"
@@ -21,12 +26,6 @@
     "format": "find src gulpfile.js \\( -iname \"*.ts\" -o -iname \"*.js\" \\) -not -path \"*fixtures*\" | xargs clang-format --style=file -i",
     "test:watch": "tsc-then -- mocha \"lib/test/**/*_test.js\""
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Polymer/polymer-cli.git"
-  },
-  "author": "The Polymer Project Authors",
-  "license": "BSD-3-Clause",
   "dependencies": {
     "@types/chalk": "^0.4.31",
     "@types/del": "^3.0.0",
diff --git a/packages/common/package.json b/packages/common/package.json
index b504c2f7b..41512de21 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,10 @@
 {
   "name": "@polymer/tools-common",
-  "repository": "https://github.com/Polymer/tools-common",
+  "homepage": "https://github.com/Polymer/tools/tree/master/packages/common",
+  "repository": "github:Polymer/tools",
+  "bugs": "https://github.com/Polymer/tools/issues",
+  "license": "BSD-3-Clause",
+  "author": "The Polymer Project Authors",
   "version": "2.0.0",
   "engines": {
     "node": ">=8.0"
@@ -14,8 +18,6 @@
     "prepublishOnly": "gulp build-all",
     "format": "find src/ test/ -iname '*.ts' -o -iname '*.js' | xargs clang-format --style=file -i"
   },
-  "author": "The Polymer Project Authors",
-  "license": "BSD-3-Clause",
   "dependencies": {
     "@types/node": "^9.6.4",
     "depcheck": "^0.6.0",
diff --git a/packages/editor-service/package.json b/packages/editor-service/package.json
index c1e0d5f16..e2079e6a3 100644
--- a/packages/editor-service/package.json
+++ b/packages/editor-service/package.json
@@ -2,16 +2,14 @@
   "name": "polymer-editor-service",
   "version": "2.2.0",
   "description": "Static analysis for the web in your text editor!",
-  "homepage": "https://github.com/Polymer/polymer-editor-service",
-  "bugs": "https://github.com/Polymer/polymer-editor-service/issues",
+  "homepage": "https://github.com/Polymer/tools/tree/master/packages/editor-service",
+  "repository": "github:Polymer/tools",
+  "bugs": "https://github.com/Polymer/tools/issues",
   "license": "BSD-3-Clause",
+  "author": "The Polymer Project Authors",
   "bin": {
     "polymer-editor-service": "bin/polymer-editor-service.js"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Polymer/polymer-editor-service.git"
-  },
   "scripts": {
     "clean": "touch lib && rm -rf lib",
     "build": "tsc",
diff --git a/packages/esm-amd-loader/package.json b/packages/esm-amd-loader/package.json
index 328df2a6b..698522ed0 100644
--- a/packages/esm-amd-loader/package.json
+++ b/packages/esm-amd-loader/package.json
@@ -2,11 +2,13 @@
   "name": "@polymer/esm-amd-loader",
   "version": "0.1.0",
   "description": "Minimal AMD-style loader for replicating ES module behavior.",
-  "repository": "git+https://github.com/Polymer/tools.git",
+  "homepage": "https://github.com/Polymer/tools/tree/master/packages/esm-amd-loader",
+  "repository": "github:Polymer/tools",
+  "bugs": "https://github.com/Polymer/tools/issues",
+  "license": "BSD-3-Clause",
+  "author": "The Polymer Project Authors",
   "main": "lib/esm-amd-loader.min.js",
   "types": "lib/esm-amd-loader.d.ts",
-  "author": "The Polymer Project Authors",
-  "license": "BSD-3-Clause",
   "scripts": {
     "format": "find src/ -iname '*.ts' -o -iname '*.js' | xargs clang-format --style=file -i",
     "clean": "rm -rf lib/",
diff --git a/packages/linter/package.json b/packages/linter/package.json
index 1d76bf081..310bda336 100644
--- a/packages/linter/package.json
+++ b/packages/linter/package.json
@@ -2,6 +2,11 @@
   "name": "polymer-linter",
   "version": "3.0.0-pre.7",
   "description": "Lint Polymer!",
+  "homepage": "https://github.com/Polymer/tools/tree/master/packages/linter",
+  "repository": "github:Polymer/tools",
+  "bugs": "https://github.com/Polymer/tools/issues",
+  "license": "BSD-3-Clause",
+  "author": "The Polymer Project Authors",
   "main": "lib/linter.js",
   "typings": "lib/linter.d.ts",
   "dependencies": {
@@ -50,21 +55,11 @@
     "test:watch": "tsc-then -- mocha \"lib/test/**/*_test.js\"",
     "run-on-polymer": "npm run build && (cd test/integration && bower install --silent) && INTEGRATION_TEST=true mocha lib/test/integration_test.js"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Polymer/polymer-linter.git"
-  },
   "keywords": [
     "polymer",
     "lint",
     "linter"
   ],
-  "author": "The Polymer Project authors",
-  "license": "BSD-3-Clause",
-  "bugs": {
-    "url": "https://github.com/Polymer/polymer-linter/issues"
-  },
-  "homepage": "https://github.com/Polymer/polymer-linter#readme",
   "engines": {
     "node": ">=8"
   }
diff --git a/packages/polyserve/package.json b/packages/polyserve/package.json
index 7ea277f16..42b041b86 100644
--- a/packages/polyserve/package.json
+++ b/packages/polyserve/package.json
@@ -2,8 +2,11 @@
   "name": "polyserve",
   "version": "0.27.9",
   "description": "A simple dev server for bower components",
+  "homepage": "https://github.com/Polymer/tools/tree/master/packages/polyserve",
+  "repository": "github:Polymer/tools",
+  "bugs": "https://github.com/Polymer/tools/issues",
   "license": "BSD-3-Clause",
-  "repository": "PolymerLabs/polyserve",
+  "author": "The Polymer Project Authors",
   "main": "./lib/polyserve.js",
   "bin": {
     "polyserve": "bin/polyserve"
diff --git a/packages/project-config/package.json b/packages/project-config/package.json
index 795266296..16d779b56 100644
--- a/packages/project-config/package.json
+++ b/packages/project-config/package.json
@@ -2,17 +2,13 @@
   "name": "polymer-project-config",
   "version": "3.13.0",
   "description": "reads, validates, and shapes your polymer.json project configuration",
+  "homepage": "https://github.com/Polymer/tools/tree/master/packages/project-config",
+  "repository": "github:Polymer/tools",
+  "bugs": "https://github.com/Polymer/tools/issues",
+  "license": "BSD-3-Clause",
+  "author": "The Polymer Project Authors",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
-  "author": "The Polymer Project Authors",
-  "license": "BSD-3-Clause",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Polymer/polymer-project-config.git"
-  },
-  "bugs": {
-    "url": "https://github.com/Polymer/polymer-project-config/issues"
-  },
   "homepage": "https://github.com/Polymer/polymer-project-config#readme",
   "scripts": {
     "build": "tsc && typescript-json-schema src/index.ts ProjectOptions --ignoreErrors -o lib/schema.json",
diff --git a/packages/web-component-tester/package.json b/packages/web-component-tester/package.json
index 14fd05f0f..5057dea83 100644
--- a/packages/web-component-tester/package.json
+++ b/packages/web-component-tester/package.json
@@ -6,6 +6,11 @@
     "wct-browser-legacy-version-range": "0.0.1-pre.1 || ^1.0.0"
   },
   "description": "web-component-tester makes testing your web components a breeze!",
+  "homepage": "https://github.com/Polymer/tools/tree/master/packages/web-component-tester",
+  "repository": "github:Polymer/tools",
+  "bugs": "https://github.com/Polymer/tools/issues",
+  "license": "BSD-3-Clause",
+  "author": "The Polymer Project Authors",
   "keywords": [
     "browser",
     "grunt",
@@ -17,13 +22,6 @@
     "web component",
     "web"
   ],
-  "homepage": "https://github.com/Polymer/web-component-tester",
-  "bugs": "https://github.com/Polymer/web-component-tester/issues",
-  "license": "BSD-3-Clause",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Polymer/web-component-tester.git"
-  },
   "main": "runner.js",
   "bin": {
     "wct": "./bin/wct",