diff --git a/.github/ISSUE_TEMPLATE/codebase_reorg.yml b/.github/ISSUE_TEMPLATE/codebase_reorg.yml
new file mode 100644
index 00000000..b9673242
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/codebase_reorg.yml
@@ -0,0 +1,24 @@
+name: 🧹Codebase Reorg
+description: Reorg, clean, format the codebase
+title: "[WRT]: "
+labels: ["writing"]
+assignees: [""]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please make sure this codebase reorg request hasn't been already submitted by someone by looking through other open/closed issues
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Give us a brief description of the codebase reorg task you would like
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional-information
+    attributes:
+      label: Additional Information
+      description: Give us some additional reason on why codebase reorg is necessary to do
diff --git a/stubs/.gitkeep b/assets/.gitkeep
similarity index 100%
rename from stubs/.gitkeep
rename to assets/.gitkeep
diff --git a/data/.gitkeep b/data/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/examples/.gitkeep b/examples/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/scripts/.gitkeep b/scripts/.gitkeep
new file mode 100644
index 00000000..e69de29b