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 000000000..8c939fa9c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,21 @@
+# Problem
+
+An overview of the background required to understand the problem.
+A problem description.
+
+# Implementation
+
+Known steps towards feature implementation.
+What needs further specifying and investigating.
+
+# Acceptance Criteria
+
+Rules for the future PR to be accepted.
+
+# Notes
+
+Random notes to keep in mind while implementing it. Mostly about related issues and future plans and thoughts.
+
+# Future Steps
+
+Steps which should be taken after this issue has been resolved.