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/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..389de24
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,6 @@
+> Please search for existing (open and closed) issues first to avoid duplicates.  
+Also have a look at the [Wiki](https://github.com/spacehuhntech/esp8266_deauther/wiki).  
+
+```
+PASTE YOUR ERROR/COMPILE LOGS HERE
+```
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/2--question.md b/.github/ISSUE_TEMPLATE/2--question.md
index 1f64a0c..6b4150b 100644
--- a/.github/ISSUE_TEMPLATE/2--question.md
+++ b/.github/ISSUE_TEMPLATE/2--question.md
@@ -7,4 +7,5 @@ assignees: ''
 
 ---
 
-> Please search for existing (open and closed) issues to avoid duplicates.
+> Please search for existing (open and closed) issues first to avoid duplicates.  
+Also have a look at the [Wiki](https://github.com/spacehuhntech/esp8266_deauther/wiki).  
diff --git a/.github/ISSUE_TEMPLATE/3--feature-request.md b/.github/ISSUE_TEMPLATE/3--feature-request.md
index 3387cf9..baf4eaa 100644
--- a/.github/ISSUE_TEMPLATE/3--feature-request.md
+++ b/.github/ISSUE_TEMPLATE/3--feature-request.md
@@ -7,6 +7,8 @@ assignees: ''
 
 ---
 
+> Please search for existing (open and closed) issues first to avoid duplicates.
+
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index f44d49a..0000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,13 +0,0 @@
-> Please search for existing (open and closed) issues first to avoid duplicates.  
-Also have a look at the [Wiki](https://github.com/spacehuhn/esp8266_deauther/wiki).  
-Please put error messages and code ```inside these 3 quotes/grave accents```
-(Delete this text when you've read it)
-
-
-<details>
-  <summary> Compile log (...)</summary>
-
-  <!-- PASTE YOUR COMPILE LOGS HERE -->
-
-</details>
-<br><br><br>