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..358b46232
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,17 @@
+### Which service(blob, file, queue, table) does this issue concern?
+
+
+### Which version of the SDK was used?
+
+
+### Which platform are you using? (ex: .NET Core 2.1)
+
+
+### What problem was encountered?
+
+
+### How can we reproduce the problem in the simplest way?
+
+
+### Have you found a mitigation/solution?
+
diff --git a/README.md b/README.md
index bb065a997..7af07a0de 100644
--- a/README.md
+++ b/README.md
@@ -161,7 +161,7 @@ We gladly accept community contributions.
 
 - Issues: Please report bugs using the Issues section of GitHub
 - Forums: Interact with the development teams on StackOverflow or the Microsoft Azure Forums
-- Source Code Contributions: Please see [CONTRIBUTING.md](CONTRIBUTING.md) for instructions on how to contribute code.
+- Source Code Contributions: Please see [CONTRIBUTING.md](.github/CONTRIBUTING.md) for instructions on how to contribute code.
 
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.