diff --git a/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
similarity index 100%
rename from ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE.md
diff --git a/PR_TEMPLATE.md b/.github/PR_TEMPLATE.md
similarity index 78%
rename from PR_TEMPLATE.md
rename to .github/PR_TEMPLATE.md
index 1d9a44fc1b9c3..5ca9bbe7d1976 100644
--- a/PR_TEMPLATE.md
+++ b/.github/PR_TEMPLATE.md
@@ -5,4 +5,4 @@ Please accept the following PR that
 
 Reminder to contributors:
 * You must add an Apache License header to all new files
-* Please squash your commits when possible and follow the [7 rules of good Git commits](http://chris.beams.io/posts/git-commit/)
+* Please squash your commits when possible and follow the [7 rules of good Git commits](http://chris.beams.io/posts/git-commit/#seven-rules)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1c169826eb170..845ffd9cc93e4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -26,7 +26,7 @@ little bit helps, and credit will always be given.
 
 Report bugs through Github
 
-We now provide a [templated issue form](https://github.com/airbnb/airflow/blob/master/ISSUE_TEMPLATE.md). You must provide information for all required fields else the bug will be closed.
+We now provide a [templated issue form](https://github.com/airbnb/airflow/blob/master/.github/ISSUE_TEMPLATE.md). You must provide information for all required fields else the bug will be closed.
 
 
 ### Fix Bugs