diff --git a/.github/templates/ISSUE_TEMPLATE.md b/.github/templates/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..064e35a
--- /dev/null
+++ b/.github/templates/ISSUE_TEMPLATE.md
@@ -0,0 +1,11 @@
+## Issue
+### 📖 Description
+- Issue description
+### 📓 Summary
+- Brief summary of the issue
+### 📦 Deliverable
+- File or files to deliverable in this issue
+### 📚 References
+- Some references to the repository
+### ⚠️ Notes
+- Important notes for the issue
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/templates/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE.md
rename to .github/templates/PULL_REQUEST_TEMPLATE.md
diff --git a/README.md b/README.md
index 7d13178..f253315 100755
--- a/README.md
+++ b/README.md
@@ -141,8 +141,7 @@ make setup
 ```
 
 ## Contribution 🤝
-
-We welcome contributions from developers of all levels! If you're interested in contributing to this project, please follow our [CONTRIBUTION GUIDELINES](./CONTRIBUTION.md) to get started.
+We welcome contributions from developers of all levels! If you're interested in contributing to this project, please follow our  [CONTRIBUTION GUIDELINES](./docs/contribution/CONTRIBUTION.md) to get started.
 
 Whether it's fixing bugs, improving documentation, or adding new features, your help is greatly appreciated. Don't hesitate to ask questions or reach out for support—we're here to help!
 
diff --git a/CONTRIBUTION.md b/docs/contribution/CONTRIBUTION.md
similarity index 100%
rename from CONTRIBUTION.md
rename to docs/contribution/CONTRIBUTION.md