diff --git a/.github/issue_template/01-bug-report.md b/.github/ISSUE_TEMPLATE/01-bug-report.md
similarity index 100%
rename from .github/issue_template/01-bug-report.md
rename to .github/ISSUE_TEMPLATE/01-bug-report.md
diff --git a/.github/issue_template/02-feature-request.md b/.github/ISSUE_TEMPLATE/02-feature-request.md
similarity index 100%
rename from .github/issue_template/02-feature-request.md
rename to .github/ISSUE_TEMPLATE/02-feature-request.md
diff --git a/.github/issue_template/03-improvement-request.md b/.github/ISSUE_TEMPLATE/03-improvement-request.md
similarity index 100%
rename from .github/issue_template/03-improvement-request.md
rename to .github/ISSUE_TEMPLATE/03-improvement-request.md
diff --git a/.github/issue_template/04-audit-submission.md b/.github/ISSUE_TEMPLATE/04-audit-submission.md
similarity index 100%
rename from .github/issue_template/04-audit-submission.md
rename to .github/ISSUE_TEMPLATE/04-audit-submission.md
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 71f5c5b..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Submit a bug or issue report.
-title: 'bug: '
-labels: 'type: bug'
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/issue_template/config.yml b/.github/ISSUE_TEMPLATE/config.yml
similarity index 100%
rename from .github/issue_template/config.yml
rename to .github/ISSUE_TEMPLATE/config.yml
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index c942857..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-name: Feature request
-about: Suggest a new idea for this project
-title: 'feat:'
-labels: 'status: discussing, type: feature request'
-assignees: heyJonBray
-
----
-
-**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.
-
-**Have you seen a similar feature elsewhere?**
-Please provide any references. Ex. So-and-so has a feature that [...]
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/improvement-request.md b/.github/ISSUE_TEMPLATE/improvement-request.md
deleted file mode 100644
index 85bf9e1..0000000
--- a/.github/ISSUE_TEMPLATE/improvement-request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Improvement request
-about: Suggest ways to improve existing features.
-title: 'update:'
-labels: 'status: discussing, type: enhancement'
-assignees: heyJonBray
-
----
-
-**Please describe the specific feature you'd like updated**
-A concise description of the current feature.
-
-**Describe the enhancement you'd like to see**
-A clear and concise description of what you want to happen. Ex. If would be nice if [...]
-
-**Have you seen a similar feature elsewhere?**
-Any references to other features in the wild. Ex. So-and-so's feature does [...]
-
-**Additional context**
-Add any other context or screenshots about the feature request here.