diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..7fbf05ab
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,52 @@
+<!--
+After reading this section, fill out the fields below.
+
+Please note that this is the issue tracker for TechnicSolder, and NOT the place to
+post problems opening/installing/managing any modpacks/mods/java/anything else.
+
+If you are having issues installing or opening a modpack, ask for assistance in the #help
+channel of the Technic discord server.
+
+If the launcher is crashing, make an issue here: https://github.com/TechnicPack/TechnicLauncher
+
+If you are having issues managing a pack, or having any issues with the
+platform or website, ask for help here: http://www.technicpack.net/help
+
+
+GUIDELINES TO FOLLOW WHEN REPORTING:
+
+Please be aware that Solder is intended for experienced server admins only, and so it is
+expected that you've at least tried to research an issue before reporting it.
+
+Note that Windows is not officially supported. (Though some community members may help)
+
+Please try to be respectful when reporting an issue. We understand that bugs are
+frustrating, but getting mad will only make it harder to fix.
+
+Please fill out all other information to the best of your knowledge.
+-->
+
+  Solder Repo Hash:
+
+  Operating System and version:
+
+  PHP version:
+
+<!-- Can be found by running ```php -v``` -->
+  Composer version:
+
+<!-- Can be found using composer -v -->
+  Server type:
+
+  Type of database:
+
+<!-- Are you using MySQL, or Sqlite? -->
+  Type of hosting:
+
+<!-- Shared? VPS? Deti? Cloud? -->
+  Link to the affected install's public url:
+
+<!-- The URL to your Solder's public folder -->
+---------------------------------------------------------
+
+<!-- Please describe the issue you are having in as much detail as possible here -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..1f9f7c91
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,13 @@
+<!-- Put the issue number here -->
+
+Fixes #
+
+<!--
+You can check these checkboxes with an X or
+by selecting them after you submit this pull-request
+-->
+
+- [ ] Tested Changes using phpunit
+- [ ] Have read and followed the Contribution Guidelines
+
+<!-- Put below what you have changed, and why it should be that way -->