diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 84%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index 96136d4cf4..3e5a7172e4 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -21,7 +21,7 @@ How to get your GitHub Hash:
   * Result: <!-- Describe the issue that you experienced in detail. -->
   * Expected Result: <!-- Describe what you would expect to happen in detail. -->
   * How to Reproduce: <!-- If you have not stated in the description of the result already, please give us a short guide how we can reproduce your issue. -->
-  * Official Information:<!-- If possible, provide information from official servers (kRO or other sources) which prove that the result is wrong. Please take into account that iRO (especially iRO Wiki) is not always the same as kRO. -->
+  * Official Information: <!-- If possible, provide information from official servers (kRO or other sources) which prove that the result is wrong. Please take into account that iRO (especially iRO Wiki) is not always the same as kRO. -->
   <!-- * _NOTE: Make sure you quote ``` `@atcommands` ``` just like this so that you do not tag uninvolved GitHub users!_ -->
 
 * **Modifications that may affect results**: 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..e65590af1c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,26 @@
+<!-- NOTE: Anything within these brackets will be hidden on the preview of the Feature Request. -->
+
+**Is your request related to a missing feature?**
+
+<!--
+  Provide a clear and concise description of what the feature pertains to.
+-->
+
+**Describe the solution you'd like**
+
+<!--
+  Provide a clear and concise description of what you want to happen.
+-->
+
+**Describe alternatives you've considered**
+
+<!--
+  Let us know about other solutions you've tried or researched.
+-->
+
+**Additional context**
+
+<!--
+  Is there anything else you can add about the proposal?
+  You might want to link to related issues here if you haven't already.
+-->
diff --git a/README.md b/README.md
index a2e89c9461..cd91f78d0a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<img src="branding/logo.png" align="right" height="90" />
+<img src="doc/logo.png" align="right" height="90" />
 
 # rAthena
 [![Build Status](https://travis-ci.org/rathena/rathena.png?branch=master)](https://travis-ci.org/rathena/rathena) [![Build status](https://ci.appveyor.com/api/projects/status/8574b8nlwd57loda/branch/master?svg=true)](https://ci.appveyor.com/project/rAthenaAPI/rathena/branch/master) [![Total alerts](https://img.shields.io/lgtm/alerts/g/rathena/rathena.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/rathena/rathena/alerts/) [![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/rathena/rathena.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/rathena/rathena/context:cpp) ![GitHub](https://img.shields.io/github/license/rathena/rathena.svg) ![GitHub repo size](https://img.shields.io/github/repo-size/rathena/rathena.svg)
diff --git a/branding/logo.png b/doc/logo.png
similarity index 100%
rename from branding/logo.png
rename to doc/logo.png