diff --git a/.github/.htaccess b/.github/.htaccess
new file mode 100644
index 0000000000000..93169e4eb44ff
--- /dev/null
+++ b/.github/.htaccess
@@ -0,0 +1,2 @@
+Order deny,allow
+Deny from all
diff --git a/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
similarity index 100%
rename from CODE_OF_CONDUCT.md
rename to .github/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
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/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from PULL_REQUEST_TEMPLATE.md
rename to .github/PULL_REQUEST_TEMPLATE.md
diff --git a/.htaccess b/.htaccess
index 90b9c16a5a8c0..3e6eb31938e46 100644
--- a/.htaccess
+++ b/.htaccess
@@ -234,10 +234,6 @@
         order allow,deny
         deny from all
     </Files>
-    <Files CONTRIBUTING.md>
-        order allow,deny
-        deny from all
-    </Files>
     <Files COPYING.txt>
         order allow,deny
         deny from all
diff --git a/.htaccess.sample b/.htaccess.sample
index 3b61bb672ec8a..e70eb9d022412 100644
--- a/.htaccess.sample
+++ b/.htaccess.sample
@@ -210,10 +210,6 @@
         order allow,deny
         deny from all
     </Files>
-    <Files CONTRIBUTING.md>
-        order allow,deny
-        deny from all
-    </Files>
     <Files COPYING.txt>
         order allow,deny
         deny from all