diff --git a/.github/labeler.yml b/.github/labeler.yml
index 2815481..a5c599b 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -63,6 +63,7 @@
     - any-glob-to-any-file:
       - '**/cupertino/*'
       - '**/*cupertino*'
+      - docs/libraries/cupertino/**/*
 
 'f: focus':
   - changed-files:
@@ -81,6 +82,7 @@
     - any-glob-to-any-file:
       - '**/material/*'
       - '**/*material*'
+      - docs/libraries/material/**/*
 
 'f: routes':
   - changed-files:
@@ -110,6 +112,8 @@
       - packages/flutter_test/**/*
       - packages/integration_test/**/*
       - examples/api/**/*
+      - docs/contributing/**/*
+      - docs/libraries/**/*
 
 'f: integration_test':
   - changed-files:
diff --git a/docs/unsorted_wiki/The-Framework-architecture.md b/docs/about/The-Framework-architecture.md
similarity index 100%
rename from docs/unsorted_wiki/The-Framework-architecture.md
rename to docs/about/The-Framework-architecture.md
diff --git a/docs/unsorted_wiki/Setting-up-the-Framework-development-environment.md b/docs/contributing/Setting-up-the-Framework-development-environment.md
similarity index 82%
rename from docs/unsorted_wiki/Setting-up-the-Framework-development-environment.md
rename to docs/contributing/Setting-up-the-Framework-development-environment.md
index 95990e3..34f271e 100644
--- a/docs/unsorted_wiki/Setting-up-the-Framework-development-environment.md
+++ b/docs/contributing/Setting-up-the-Framework-development-environment.md
@@ -57,8 +57,8 @@
 
 Next steps:
 
- * [[Running examples]], to see if your setup works.
- * [[The flutter tool]], to learn about how the `flutter` command line tool works.
- * [[Style guide for Flutter repo]], to learn how to write code for Flutter.
- * [[Tree hygiene]], to learn about how to submit patches.
- * [[Signing commits]], to configure your environment to securely sign your commits.
+ * [Running examples](https://github.com/flutter/flutter/wiki/Running-examples), to see if your setup works.
+ * [The flutter tool](https://github.com/flutter/flutter/wiki/The-flutter-tool), to learn about how the `flutter` command line tool works.
+ * [Style guide for Flutter repo](https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo), to learn how to write code for Flutter.
+ * [Tree hygiene](https://github.com/flutter/flutter/wiki/Tree-hygiene), to learn about how to submit patches.
+ * [Signing commits](https://github.com/flutter/flutter/wiki/Signing-commits), to configure your environment to securely sign your commits.
diff --git a/docs/unsorted_wiki/Using-the-Dart-analyzer.md b/docs/contributing/Using-the-Dart-analyzer.md
similarity index 100%
rename from docs/unsorted_wiki/Using-the-Dart-analyzer.md
rename to docs/contributing/Using-the-Dart-analyzer.md
diff --git a/docs/unsorted_wiki/Test-coverage-for-package-flutter.md b/docs/contributing/testing/Test-coverage-for-package-flutter.md
similarity index 100%
rename from docs/unsorted_wiki/Test-coverage-for-package-flutter.md
rename to docs/contributing/testing/Test-coverage-for-package-flutter.md
diff --git a/docs/unsorted_wiki/Writing-Effective-Tests.md b/docs/contributing/testing/Writing-Effective-Tests.md
similarity index 98%
rename from docs/unsorted_wiki/Writing-Effective-Tests.md
rename to docs/contributing/testing/Writing-Effective-Tests.md
index fdfd26a..252b34c 100644
--- a/docs/unsorted_wiki/Writing-Effective-Tests.md
+++ b/docs/contributing/testing/Writing-Effective-Tests.md
@@ -227,4 +227,4 @@
 
 # See also
 
-- [[Flutter Test Fonts]]
\ No newline at end of file
+- [Flutter Test Fonts](https://github.com/flutter/flutter/wiki/Flutter-Test-Fonts)
diff --git a/docs/unsorted_wiki/Writing-a-golden-file-test-for-package-flutter.md b/docs/contributing/testing/Writing-a-golden-file-test-for-package-flutter.md
similarity index 100%
rename from docs/unsorted_wiki/Writing-a-golden-file-test-for-package-flutter.md
rename to docs/contributing/testing/Writing-a-golden-file-test-for-package-flutter.md
diff --git a/docs/unsorted_wiki/Flutter-Framework-Gardener-Rotation.md b/docs/infra/Flutter-Framework-Gardener-Rotation.md
similarity index 98%
rename from docs/unsorted_wiki/Flutter-Framework-Gardener-Rotation.md
rename to docs/infra/Flutter-Framework-Gardener-Rotation.md
index ee699ad..5064393 100644
--- a/docs/unsorted_wiki/Flutter-Framework-Gardener-Rotation.md
+++ b/docs/infra/Flutter-Framework-Gardener-Rotation.md
@@ -157,10 +157,10 @@
 
 [flutter/flutter]: https://github.com/flutter/flutter
 [Flutter issues]: https://github.com/flutter/flutter/issues
-[TESTOWNERS]: https://github.com/flutter/flutter/blob/master/TESTOWNERS
+[TESTOWNERS]: https://github.com/flutter/flutter/blob/main/TESTOWNERS
 [flutter-hackers]: https://github.com/orgs/flutter/teams/flutter-hackers
-[new issue]: https://github.com/flutter/flutter/issues/new
-[new infra issue]: https://github.com/flutter/flutter/issues/new
+[new issue]: https://github.com/flutter/flutter/issues/new/choose
+[new infra issue]: https://github.com/flutter/flutter/issues/new?template=6_infrastructure.yml
 
 [Framework build dashboard]: https://flutter-dashboard.appspot.com/#/build
 [framework benchmarks]: https://flutter-flutter-perf.skia.org/e/
diff --git a/docs/libraries/material/Updating-Material-Design-Fonts-&-Icons.md b/docs/libraries/material/Updating-Material-Design-Fonts-&-Icons.md
new file mode 100644
index 0000000..1b4a32b
--- /dev/null
+++ b/docs/libraries/material/Updating-Material-Design-Fonts-&-Icons.md
@@ -0,0 +1,5 @@
+The process to update the framework's Material fonts (currently, Roboto) and [icons](https://github.com/flutter/flutter/blob/main/packages/flutter/lib/src/material/icons.dart) has been largely simplified and automated. See [go/effortless-flutter-font-updates](http://go/effortless-flutter-font-updates) (Google-only, sorry). The steps used prior to automation are available in this page's history.
+
+If you notice an issue with fonts or icons (e.g. a missing icon), please file an [issue](https://github.com/flutter/flutter/issues/new/choose). Consider starting the issue title with `[Fonts]` or `[Icons]` to make it stand out.
+
+_(This page is referenced by comments in the Flutter codebase.)_
\ No newline at end of file
diff --git a/docs/unsorted_wiki/Updating-Material-Design-Fonts-&-Icons.md b/docs/unsorted_wiki/Updating-Material-Design-Fonts-&-Icons.md
deleted file mode 100644
index 660ec5b..0000000
--- a/docs/unsorted_wiki/Updating-Material-Design-Fonts-&-Icons.md
+++ /dev/null
@@ -1,5 +0,0 @@
-The process to update the framework's Material fonts (currently, Roboto) and [icons](https://github.com/flutter/flutter/blob/master/packages/flutter/lib/src/material/icons.dart) has been largely simplified and automated. See [go/effortless-flutter-font-updates](http://go/effortless-flutter-font-updates) (Google-only, sorry). The steps used prior to automation are available in this page's history.
-
-If you notice an issue with fonts or icons (e.g. a missing icon), please file an [issue](https://github.com/flutter/flutter/issues/new/choose). Consider starting the issue title with `[Fonts]` or `[Icons]` to make it stand out.
-
-_(This page is referenced by comments in the Flutter codebase.)_
\ No newline at end of file