diff --git a/contributors.yml b/contributors.yml
index 527ecfea7a..8a67550554 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -41,6 +41,7 @@
 - markivancho
 - mcansh
 - mfijas
+- MichaelDeBoey
 - minami-minami
 - morleytatro
 - noisypigeon
diff --git a/package.json b/package.json
index 7253fccdda..2d4070b476 100644
--- a/package.json
+++ b/package.json
@@ -1,17 +1,34 @@
 {
   "private": true,
+  "workspaces": {
+    "packages": [
+      "packages/react-router",
+      "packages/react-router-dom",
+      "packages/react-router-native",
+      "packages/router"
+    ],
+    "nohoist": [
+      "**/react-native",
+      "**/react-native/**"
+    ]
+  },
   "scripts": {
     "build": "rollup -c && tsc -b",
     "clean": "git clean -fdX .",
-    "lint": "eslint --cache .",
     "format": "prettier --ignore-path .eslintignore --write .",
     "format:check": "prettier --ignore-path .eslintignore --check .",
+    "lint": "eslint --cache .",
     "publish": "node ./scripts/publish.js",
     "size": "filesize",
     "test": "jest",
     "version": "node ./scripts/version.js",
     "watch": "rollup -c -w"
   },
+  "jest": {
+    "projects": [
+      "<rootDir>/packages/*"
+    ]
+  },
   "dependencies": {
     "@ampproject/filesize": "^4.3.0",
     "@ampproject/rollup-plugin-closure-compiler": "^0.26.0",
@@ -64,23 +81,6 @@
     "ts-jest": "^26.5.6",
     "typescript": "^4.3.5"
   },
-  "workspaces": {
-    "packages": [
-      "packages/react-router",
-      "packages/react-router-dom",
-      "packages/react-router-native",
-      "packages/router"
-    ],
-    "nohoist": [
-      "**/react-native",
-      "**/react-native/**"
-    ]
-  },
-  "jest": {
-    "projects": [
-      "<rootDir>/packages/*"
-    ]
-  },
   "filesize": {
     "build/node_modules/@remix-run/router/router.production.min.js": {
       "none": "21 kB"
diff --git a/packages/react-router-dom-v5-compat/package.json b/packages/react-router-dom-v5-compat/package.json
index abefd6ed4a..1decdcea8f 100644
--- a/packages/react-router-dom-v5-compat/package.json
+++ b/packages/react-router-dom-v5-compat/package.json
@@ -1,18 +1,27 @@
 {
   "name": "react-router-dom-v5-compat",
   "version": "6.4.0-pre.2",
-  "author": "Remix Software <hello@remix.run>",
   "description": "Migration path to React Router v6 from v4/5",
+  "keywords": [
+    "react",
+    "router",
+    "route",
+    "routing",
+    "history",
+    "link"
+  ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/remix-run/react-router.git",
+    "url": "https://github.com/remix-run/react-router",
     "directory": "packages/react-router-dom-v5-compat"
   },
   "license": "MIT",
+  "author": "Remix Software <hello@remix.run>",
+  "sideEffects": false,
   "main": "./main.js",
+  "unpkg": "./umd/react-router.production.min.js",
   "module": "./index.js",
   "types": "./index.d.ts",
-  "unpkg": "./umd/react-router.production.min.js",
   "dependencies": {
     "history": "^5.3.0",
     "react-router": "6.4.0-pre.2"
@@ -21,14 +30,5 @@
     "react": ">=16.8",
     "react-dom": ">=16.8",
     "react-router-dom": "4 || 5"
-  },
-  "sideEffects": false,
-  "keywords": [
-    "react",
-    "router",
-    "route",
-    "routing",
-    "history",
-    "link"
-  ]
+  }
 }
diff --git a/packages/react-router-dom/package.json b/packages/react-router-dom/package.json
index 3a497bdc06..acb9971ef6 100644
--- a/packages/react-router-dom/package.json
+++ b/packages/react-router-dom/package.json
@@ -1,32 +1,32 @@
 {
   "name": "react-router-dom",
   "version": "6.4.0-pre.2",
-  "author": "Remix Software <hello@remix.run>",
   "description": "Declarative routing for React web applications",
+  "keywords": [
+    "react",
+    "router",
+    "route",
+    "routing",
+    "history",
+    "link"
+  ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/remix-run/react-router.git",
+    "url": "https://github.com/remix-run/react-router",
     "directory": "packages/react-router-dom"
   },
   "license": "MIT",
+  "author": "Remix Software <hello@remix.run>",
+  "sideEffects": false,
   "main": "./main.js",
+  "unpkg": "./umd/react-router-dom.production.min.js",
   "module": "./index.js",
   "types": "./index.d.ts",
-  "unpkg": "./umd/react-router-dom.production.min.js",
   "dependencies": {
     "react-router": "6.4.0-pre.2"
   },
   "peerDependencies": {
     "react": ">=16.8",
     "react-dom": ">=16.8"
-  },
-  "sideEffects": false,
-  "keywords": [
-    "react",
-    "router",
-    "route",
-    "routing",
-    "history",
-    "link"
-  ]
+  }
 }
diff --git a/packages/react-router-native/package.json b/packages/react-router-native/package.json
index 103aaf6198..4e422886ab 100644
--- a/packages/react-router-native/package.json
+++ b/packages/react-router-native/package.json
@@ -1,34 +1,34 @@
 {
   "name": "react-router-native",
   "version": "6.4.0-pre.2",
-  "author": "Remix Software <hello@remix.run>",
   "description": "Declarative routing for React Native applications",
+  "keywords": [
+    "react",
+    "router",
+    "route",
+    "routing",
+    "history",
+    "link"
+  ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/remix-run/react-router.git",
+    "url": "https://github.com/remix-run/react-router",
     "directory": "packages/react-router-native"
   },
   "license": "MIT",
+  "author": "Remix Software <hello@remix.run>",
+  "sideEffects": false,
   "main": "./index.js",
   "types": "./index.d.ts",
   "dependencies": {
     "@ungap/url-search-params": "^0.1.4",
     "react-router": "6.4.0-pre.2"
   },
-  "peerDependencies": {
-    "react": ">=16.8",
-    "react-native": ">=0.44"
-  },
   "devDependencies": {
     "react-native": "^0.61.4"
   },
-  "sideEffects": false,
-  "keywords": [
-    "react",
-    "router",
-    "route",
-    "routing",
-    "history",
-    "link"
-  ]
+  "peerDependencies": {
+    "react": ">=16.8",
+    "react-native": ">=0.44"
+  }
 }
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index e6670d7d03..2b86fc1ef6 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -1,31 +1,31 @@
 {
   "name": "react-router",
   "version": "6.4.0-pre.2",
-  "author": "Remix Software <hello@remix.run>",
   "description": "Declarative routing for React",
+  "keywords": [
+    "react",
+    "router",
+    "route",
+    "routing",
+    "history",
+    "link"
+  ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/remix-run/react-router.git",
+    "url": "https://github.com/remix-run/react-router",
     "directory": "packages/react-router"
   },
   "license": "MIT",
+  "author": "Remix Software <hello@remix.run>",
+  "sideEffects": false,
   "main": "./main.js",
+  "unpkg": "./umd/react-router.production.min.js",
   "module": "./index.js",
   "types": "./index.d.ts",
-  "unpkg": "./umd/react-router.production.min.js",
-  "peerDependencies": {
-    "react": ">=16.8"
-  },
   "dependencies": {
     "@remix-run/router": "0.1.0"
   },
-  "sideEffects": false,
-  "keywords": [
-    "react",
-    "router",
-    "route",
-    "routing",
-    "history",
-    "link"
-  ]
+  "peerDependencies": {
+    "react": ">=16.8"
+  }
 }
diff --git a/packages/router/package.json b/packages/router/package.json
index fd9e77188c..8b246beb2b 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -1,22 +1,22 @@
 {
   "name": "@remix-run/router",
   "version": "0.1.0",
-  "author": "Remix Software <hello@remix.run>",
   "description": "Nested/Data-driven/Framework-agnostic Routing",
+  "keywords": [
+    "remix",
+    "router",
+    "location"
+  ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/remix-run/react-router.git",
+    "url": "https://github.com/remix-run/react-router",
     "directory": "packages/router"
   },
   "license": "MIT",
+  "author": "Remix Software <hello@remix.run>",
+  "sideEffects": false,
   "main": "./main.js",
-  "module": "./index.js",
-  "types": "./index.d.ts",
   "unpkg": "./umd/router.production.min.js",
-  "sideEffects": false,
-  "keywords": [
-    "remix",
-    "router",
-    "location"
-  ]
+  "module": "./index.js",
+  "types": "./index.d.ts"
 }