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..24255ec433
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,9 @@
+**Expected behavior:**
+
+**Actual behavior:**
+
+**Steps to reproduce:**
+
+**Screenshots (if applicable):**
+
+**OS and Browser:**
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..93e6f49456
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,9 @@
+Fixes # .
+
+**Changes proposed in this pull request:**
+
+
+
+-
+
+cc @HospitalRun/core-maintainers
diff --git a/README.md b/README.md
index 0ba8ce4631..f1748cf42d 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ test('visiting /patients', function(assert) {
 ```
 Contributing
 ------------
-Contributions are welcome via pull requests and issues.  Please see our [contributing guide](https://github.com/hospitalrun/hospitalrun-frontend/blob/master/CONTRIBUTING.md) for more details.
+Contributions are welcome via pull requests and issues.  Please see our [contributing guide](https://github.com/hospitalrun/hospitalrun-frontend/blob/master/.github/CONTRIBUTING.md) for more details.
 
 ## Further Reading / Useful Links