diff --git a/LICENSE b/LICENSE.md
similarity index 100%
rename from LICENSE
rename to LICENSE.md
diff --git a/basic-detections/basic-xss-prober.yaml b/generic-detections/basic-xss-prober.yaml
similarity index 100%
rename from basic-detections/basic-xss-prober.yaml
rename to generic-detections/basic-xss-prober.yaml
diff --git a/basic-detections/general-tokens.yaml b/generic-detections/general-tokens.yaml
similarity index 100%
rename from basic-detections/general-tokens.yaml
rename to generic-detections/general-tokens.yaml
diff --git a/generic-detections/top-15-xss.yaml b/generic-detections/top-15-xss.yaml
new file mode 100644
index 0000000000..e5d1a667e8
--- /dev/null
+++ b/generic-detections/top-15-xss.yaml
@@ -0,0 +1,23 @@
+# id contains the unique identifier for the template.
+id: top-15-xss
+
+info:
+  # Name is the name of the template
+  name: Top 15 XSS Check
+  # Author is the name of the author for the template
+  # Prams:- q, s, search, id, action, keyword, query, page, keywords, url, view, cat, p
+  author: foulenzer
+  # Severity is the severity for the template.
+  severity: medium
+  #  Description optionally describes the template.
+  description: Searches for reflected XSS in the server response via GET-requests.
+
+requests:
+  - method: GET
+    path:
+      - "{{BaseURL}}/?q%3D%27%3E%22%3Csvg%2Fonload%3Dconfirm%28%27testing-xss%27%29%3E%2526s%3D%27%3E%22%3Csvg%2Fonload%3Dconfirm%28%27testing-xss%27%29%3E%2526search%3D%27%3E%22%3Csvg%2Fonload%3Dconfirm%28%27testing-xss%27%29%3E%2526id%3D%27%3E%22%3Csvg%2Fonload%3Dconfirm%28%27testing-xss%27%29%3E%2526action%3D%27%3E%22%3Csvg%2Fonload%3Dconfirm%28%27testing-xss%27%29%3E%2526keyword%3D%27%3E%22%3Csvg%2Fonload%3Dconfirm%28%27testing-xss%27%29%3E%2526query%3D%27%3E%22%3Csvg%2Fonload%3Dconfirm%28%27testing-xss%27%29%3E%2526page%3D%27%3E%22%3Csvg%2Fonload%3Dconfirm%28%27testing-xss%27%29%3E%2526keywords%3D%27%3E%22%3Csvg%2Fonload%3Dconfirm%28%27testing-xss%27%29%3E%2526url%3D%27%3E%22%3Csvg%2Fonload%3Dconfirm%28%27testing-xss%27%29%3E%2526view%3D%27%3E%22%3Csvg%2Fonload%3Dconfirm%28%27testing-xss%27%29%3E%2526cat%3D%27%3E%22%3Csvg%2Fonload%3Dconfirm%28%27testing-xss%27%29%3E%2526name%3D%27%3E%22%3Csvg%2Fonload%3Dconfirm%28%27testing-xss%27%29%3E%2526key%3D%27%3E%22%3Csvg%2Fonload%3Dconfirm%28%27testing-xss%27%29%3E%2526p%3D%27%3E%22%3Csvg%2Fonload%3Dconfirm%28%27testing-xss%27%29%3E"
+    matchers:
+      - type: word
+        words:
+          - "<svg/onload=confirm('testing-xss')>"
+        part: body
\ No newline at end of file
diff --git a/vulnerabilities/top-15-xss-params.yaml b/vulnerabilities/top-15-xss-params.yaml
deleted file mode 100644
index 66101475ef..0000000000
--- a/vulnerabilities/top-15-xss-params.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# id contains the unique identifier for the template.
-id: top-15-xss-parameter
-
-info:
-  # Name is the name of the template
-  name: Top 15 XSS Parameter Template
-  # Author is the name of the author for the template
-  author: foulenzer
-  # Severity is the severity for the template.
-  severity: medium
-  #  Description optionally describes the template.
-  description: Searches for reflected XSS in the server response via GET-requests.
-
-requests:
-  - method: GET
-    path:
-      - "{{BaseURL}}/?q=%27%3E%22%20%3Ci%20onFoCuS%3DCoNfIrM%281%29%20autofocus%3E1abc"
-      - "{{BaseURL}}/?s=%27%3E%22%20%3Ci%20onFoCuS%3DCoNfIrM%281%29%20autofocus%3E1abc"
-      - "{{BaseURL}}/?search=%27%3E%22%20%3Ci%20onFoCuS%3DCoNfIrM%281%29%20autofocus%3E1abc"
-      - "{{BaseURL}}/?id=%27%3E%22%20%3Ci%20onFoCuS%3DCoNfIrM%281%29%20autofocus%3E1abc"
-      - "{{BaseURL}}/?action=%27%3E%22%20%3Ci%20onFoCuS%3DCoNfIrM%281%29%20autofocus%3E1abc"
-      - "{{BaseURL}}/?keyword=%27%3E%22%20%3Ci%20onFoCuS%3DCoNfIrM%281%29%20autofocus%3E1abc"
-      - "{{BaseURL}}/?query=%27%3E%22%20%3Ci%20onFoCuS%3DCoNfIrM%281%29%20autofocus%3E1abc"
-      - "{{BaseURL}}/?page=%27%3E%22%20%3Ci%20onFoCuS%3DCoNfIrM%281%29%20autofocus%3E1abc"
-      - "{{BaseURL}}/?keywords=%27%3E%22%20%3Ci%20onFoCuS%3DCoNfIrM%281%29%20autofocus%3E1abc"
-      - "{{BaseURL}}/?url=%27%3E%22%20%3Ci%20onFoCuS%3DCoNfIrM%281%29%20autofocus%3E1abc"
-      - "{{BaseURL}}/?view=%27%3E%22%20%3Ci%20onFoCuS%3DCoNfIrM%281%29%20autofocus%3E1abc"
-      - "{{BaseURL}}/?cat=%27%3E%22%20%3Ci%20onFoCuS%3DCoNfIrM%281%29%20autofocus%3E1abc"
-      - "{{BaseURL}}/?name=%27%3E%22%20%3Ci%20onFoCuS%3DCoNfIrM%281%29%20autofocus%3E1abc"
-      - "{{BaseURL}}/?key=%27%3E%22%20%3Ci%20onFoCuS%3DCoNfIrM%281%29%20autofocus%3E1abc"
-      - "{{BaseURL}}/?p=%27%3E%22%20%3Ci%20onFoCuS%3DCoNfIrM%281%29%20autofocus%3E1abc"
-    matchers:
-      - type: word
-        words:
-          - "'>\" <i onFoCuS=CoNfIrM(1) autofocus>1abc"
-        part: body