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 0000000000..5054a1e703
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,18 @@
+[//]: # (Before logging this issue, look through common problems at https://github.com/HabitRPG/habitrpg/issue If you find your issue there, read at least the first post to see if there is a workaround for you.)
+
+[//]: # (Note: See https://github.com/HabitRPG/habitrpg/issues/2760 for more info)
+
+[//]: # (Fill out relevant information - UUID is found in Settings -> API)
+General Info
+  * UUID: 
+  * Browser: 
+  * OS: 
+
+### Description
+[//]: # (Describe bug in detail here. Include pictures if helpful.)
+
+
+
+#### Console Errors
+[//]: # (Include any javscript console errors here)
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..43eb764c10
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,13 @@
+[//]: # (Note: See http://habitica.wikia.com/wiki/Using_Habitica_Git#Pull_Request for more info)
+
+[//]: # (Put Issue URL here, if applicable)
+Fixes #______
+
+### Changes
+[//]: # (Describe the changes that were made in detail here. Include pictures if necessary)
+
+
+
+
+[//]: # (Put User ID in here - found in Settings -> API)
+UUID: