Git cleanups
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 5ec44ba..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: 'type-bug'
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Add a minimal working example or, if not possible or available, any code which might help to reproduce the problem
-```
-void main(List<String> arguments) {
-}
-```
-
-**System info**
-<The output of `dart pub deps --style compact` in your project>
diff --git a/.github/ISSUE_TEMPLATE/bug_report_intl_translation.md b/.github/ISSUE_TEMPLATE/bug_report_intl_translation.md
deleted file mode 100644
index 32e6fb3..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report_intl_translation.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: Bug report for pkg:intl_translation
-about: Report a bug in intl_translation
-title: ''
-labels: 'type-bug'
-assignees: ''
-
----
-
-**Describe the bug**
-
-**Which script did you execute?**
-[ ] `extract_to_arb`
-[ ] `generate_from_arb`
-[ ] other
-
-**Input/output**
-Any `.arb` file contents or Dart code which could help in reproducing the bug?
-
-**System info**
-<The output of `dart pub deps --style compact` in your project>
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index ecaed3a..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: 'type-enhancement'
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/wrong-locale-data.md b/.github/ISSUE_TEMPLATE/intl.md
similarity index 68%
rename from .github/ISSUE_TEMPLATE/wrong-locale-data.md
rename to .github/ISSUE_TEMPLATE/intl.md
index 4da69b1..2649afb 100644
--- a/.github/ISSUE_TEMPLATE/wrong-locale-data.md
+++ b/.github/ISSUE_TEMPLATE/intl.md
@@ -1,12 +1,18 @@
 ---
-name: Wrong Locale Data
-about: I think the locale data is wrong
-title: ''
-labels: ''
-assignees: ''
-
+name: "package:intl"
+about: "Create a bug or file a feature request against package:intl."
+labels: "package:intl"
 ---
 
+*Delete the sections which are irrelevant*
+
+**Which locale is missing?**
+<e.g. `en_US`>
+
+**Which locale have you considered of using instead, but was not sufficient?**
+<e.g. `en_NZ`>
+
+**I think the locale data is wrong**
 Is it really wrong?
 
 For locale data, there are only a few hard and fast facts, such as the names of days and months. Even these are subject to regional variants, and to changes over time. For example, the “Czech Republic” is known since 2016 as “Czechia”.
diff --git a/.github/ISSUE_TEMPLATE/intl_translation.md b/.github/ISSUE_TEMPLATE/intl_translation.md
new file mode 100644
index 0000000..6482ac0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/intl_translation.md
@@ -0,0 +1,18 @@
+---
+name: "package:intl_translation"
+about: "Create a bug or file a feature request against package:intl_translation."
+labels: "package:intl_translation"
+---
+
+**Describe the bug/feature request**
+
+**Which script did you execute?**
+[ ] `extract_to_arb`
+[ ] `generate_from_arb`
+[ ] other
+
+**Input/output**
+Any `.arb` file contents or Dart code which could help in reproducing the bug?
+
+**System info**
+<The output of `dart pub deps --style compact` in your project>
diff --git a/.github/ISSUE_TEMPLATE/messages.md b/.github/ISSUE_TEMPLATE/messages.md
new file mode 100644
index 0000000..87a56ab
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/messages.md
@@ -0,0 +1,5 @@
+---
+name: "package:messages"
+about: "Create a bug or file a feature request against package:messages."
+labels: "package:messages"
+---
diff --git a/.github/ISSUE_TEMPLATE/missing-locale.md b/.github/ISSUE_TEMPLATE/missing-locale.md
deleted file mode 100644
index 288c13e..0000000
--- a/.github/ISSUE_TEMPLATE/missing-locale.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Missing Locale
-about: My favorite locale is missing
-title: ''
-labels: ['type-enhancement', 'missing-locale-data']
-assignees: ''
-
----
-
-**Which locale is missing?**
-<e.g. `en_US`>
-
-**Which locale have you considered of using instead, but was not sufficient?**
-<e.g. `en_NZ`>
diff --git a/README.md b/README.md
index e4c96f5..99a1189 100644
--- a/README.md
+++ b/README.md
@@ -10,17 +10,14 @@
 | [intl4x](pkgs/intl4x/) | A lightweight modular library for internationalization (i18n) functionality. | [![issues](https://img.shields.io/badge/issues-4774bc)][intl4x_issues] | [![pub package](https://img.shields.io/pub/v/intl4x.svg)](https://pub.dev/packages/intl4x) |
 | [intl_translation](pkgs/intl_translation/) | Contains code to deal with internationalized/localized messages, date and number formatting and parsing, bi-directional text, and other internationalization issues. | [![issues](https://img.shields.io/badge/issues-4774bc)][intl_translation_issues] | [![pub package](https://img.shields.io/pub/v/intl_translation.svg)](https://pub.dev/packages/intl_translation) |
 | [messages](pkgs/messages/) | A lightweight modular library for localization (l10n) functionality. | [![issues](https://img.shields.io/badge/issues-4774bc)][messages_issues] |  |
-| [messages_builder](pkgs/messages_builder/) | Build the messages for consumption by package:messages | [![issues](https://img.shields.io/badge/issues-4774bc)][messages_builder_issues] |  |
-| [messages_serializer](pkgs/messages_serializer/) | Serialization of messages for package:messages. | [![issues](https://img.shields.io/badge/issues-4774bc)][messages_serializer_issues] |  |
-| [messages_shrinker](pkgs/messages_shrinker/) | Removing unneeded messages from message data files for package:messages. | [![issues](https://img.shields.io/badge/issues-4774bc)][messages_shrinker_issues] | [![pub package](https://img.shields.io/pub/v/messages_shrinker.svg)](https://pub.dev/packages/messages_shrinker) |
+| [messages_builder](pkgs/messages_builder/) | Build the messages for consumption by package:messages | [![issues](https://img.shields.io/badge/issues-4774bc)][messages_issues] |  |
+| [messages_serializer](pkgs/messages_serializer/) | Serialization of messages for package:messages. | [![issues](https://img.shields.io/badge/issues-4774bc)][messages_issues] |  |
+| [messages_shrinker](pkgs/messages_shrinker/) | Removing unneeded messages from message data files for package:messages. | [![issues](https://img.shields.io/badge/issues-4774bc)][messages_issues] | [![pub package](https://img.shields.io/pub/v/messages_shrinker.svg)](https://pub.dev/packages/messages_shrinker) |
 
 [intl_issues]: https://github.com/dart-lang/i18n/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Aintl
 [intl4x_issues]: https://github.com/dart-lang/i18n/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Aintl4x
 [intl_translation_issues]: https://github.com/dart-lang/i18n/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Aintl_translation
 [messages_issues]: https://github.com/dart-lang/i18n/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Amessages
-[messages_builder_issues]: https://github.com/dart-lang/i18n/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Amessages_builder
-[messages_serializer_issues]: https://github.com/dart-lang/i18n/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Amessages_serializer
-[messages_shrinker_issues]: https://github.com/dart-lang/i18n/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Amessages_shrinker
 
 ## Contribute