diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 0000000..9e6dab0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,54 @@
+name: Bug Report
+description: Report a bug
+labels: ["bug"]
+assignees: ["shaise"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill out the sections below to help everyone identify and fix the bug
+        IMPORTANT: If possible, add a freecad file that demonstrates the bug
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe your issue
+      placeholder: |
+        When I use the <X> command <this> happens
+        Here are the steps to reproduce it:
+        1 ..
+        2 ..
+      description: Describe the problem and how it impacts user experience, workflow, maintainability or speed of the code. If the problem appears to be a bug with the current functionality, provide as test case or recipe that reproduces the error. Ideally record a macro and attach it.
+    validations:
+      required: true
+  - type: textarea
+    id: full_version
+    attributes:
+      label: FreeCAD version info + SheetMetal WB version
+      placeholder: |
+        OS: <Windows/Linux/MacOS>
+        Architecture: x86_64
+        Version: <FreeCad version>
+        Build type: Release
+        Branch: main
+        Python 3.11.10, Qt 5.15.15, Coin 4.0.3, Vtk 9.3.0, OCC 7.8.1
+        Locale: English/United States (en_US)
+        Stylesheet/Theme/QtStyle: OpenLight.qss/OpenLight/Fusion
+        Installed mods: 
+          *sheetmetal 0.5.5
+      description: |
+        Please use the About FreeCAD dialog to copy your full version information and paste it here, include the SheetMetal WB version on it.
+        (At the bottom left of the about dialog there is a `Copy to clipboard` button)
+      render: shell
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Put here any screenshots or videos (optional)
+      description: |
+        Add links, references, screenshots or anything that will give us more context about the issue you are encountering!
+        If there is a discussion about the problem on the forum, provide link(s) here.
+
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in. To attach a FCStd file, ZIP it first (GitHub won't recognize the extension otherwise).
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for reporting this issue! We will get back to you as soon as possible.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..e277890
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: General questions about the workbench
+    url: https://forum.freecad.org/viewtopic.php?t=60818
+    about: You can join the discussions on the FreeCAD forum.
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 0000000..082ca71
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,32 @@
+name: New feature
+description: Suggest or request a new feature
+labels: ["enhancement"]
+assignees: ["shaise"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please fill out the sections below to properly describe the new feature you are suggesting.
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the feature
+      placeholder: A new commands to generate this new SheetMetal feature
+    validations:
+      required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      placeholder: |
+        Add any other context or screenshots about the feature request here.
+  - type: dropdown
+    id: assign
+    attributes:
+      label: "Would you like to work on this issue?"
+      options:
+        - "Yes"
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for your suggestion! Let's see together if it can be implemented.
diff --git a/SheetMetalTests/__init__.py b/SheetMetalTests/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/SheetMetalTests/__pycache__/__init__.cpython-38.pyc b/SheetMetalTests/__pycache__/__init__.cpython-38.pyc
deleted file mode 100644
index 08539d5..0000000
Binary files a/SheetMetalTests/__pycache__/__init__.cpython-38.pyc and /dev/null differ