diff --git a/collections/html/head-basics.yaml b/collections/html/head-basics.yaml
index 937c52b84..bad92d942 100644
--- a/collections/html/head-basics.yaml
+++ b/collections/html/head-basics.yaml
@@ -2,10 +2,10 @@ slug: html/head-basics
 name: HTML Head Basics
 featured: true
 snippetIds:
-  - articles/s/html-recommended-minimum-head
-  - articles/s/html-head-social-tags
-  - articles/s/html-head-icons
-  - articles/s/html-head-links
+  - html/s/recommended-minimum-head
+  - html/s/head-social-tags
+  - html/s/head-icons
+  - html/s/head-links
 splash: basics.png
 description: >-
   Learn how to use the HTML head element to improve your site's SEO, social
diff --git a/collections/js/interviews.yaml b/collections/js/interviews.yaml
index 4cca596ed..05cce8156 100644
--- a/collections/js/interviews.yaml
+++ b/collections/js/interviews.yaml
@@ -31,7 +31,7 @@ snippetIds:
   - js/s/pure-functions
   - js/s/recursion
   - js/s/use-strict
-  - js/s/async-defer
+  - html/s/async-defer
   - js/s/closures
   - js/s/iife
   - js/s/event-loop-explained
diff --git a/snippets/articles/s/8-tips-for-accessible-websites.md b/snippets/html/s/8-tips-for-accessible-websites.md
similarity index 100%
rename from snippets/articles/s/8-tips-for-accessible-websites.md
rename to snippets/html/s/8-tips-for-accessible-websites.md
diff --git a/snippets/js/s/async-defer.md b/snippets/html/s/async-defer.md
similarity index 98%
rename from snippets/js/s/async-defer.md
rename to snippets/html/s/async-defer.md
index eb5caa447..94eb99e84 100644
--- a/snippets/js/s/async-defer.md
+++ b/snippets/html/s/async-defer.md
@@ -2,8 +2,8 @@
 title: What is the difference between async and defer in script loading?
 shortTitle: Async and defer
 type: question
-language: javascript
-tags: [html]
+language: html
+tags: [script,javascript]
 author: chalarangelo
 cover: coworking-space
 excerpt: Understanding how to correctly load your JavaScript files can significantly improve your web application's performance.
diff --git a/snippets/articles/s/custom-file-download-names.md b/snippets/html/s/custom-file-download-names.md
similarity index 100%
rename from snippets/articles/s/custom-file-download-names.md
rename to snippets/html/s/custom-file-download-names.md
diff --git a/snippets/articles/s/html-head-icons.md b/snippets/html/s/head-icons.md
similarity index 100%
rename from snippets/articles/s/html-head-icons.md
rename to snippets/html/s/head-icons.md
diff --git a/snippets/articles/s/html-head-links.md b/snippets/html/s/head-links.md
similarity index 100%
rename from snippets/articles/s/html-head-links.md
rename to snippets/html/s/head-links.md
diff --git a/snippets/articles/s/html-head-social-tags.md b/snippets/html/s/head-social-tags.md
similarity index 100%
rename from snippets/articles/s/html-head-social-tags.md
rename to snippets/html/s/head-social-tags.md
diff --git a/snippets/articles/s/lazy-loading-images.md b/snippets/html/s/lazy-loading-images.md
similarity index 100%
rename from snippets/articles/s/lazy-loading-images.md
rename to snippets/html/s/lazy-loading-images.md
diff --git a/snippets/articles/s/password-autocomplete-suggestion.md b/snippets/html/s/password-autocomplete-suggestion.md
similarity index 100%
rename from snippets/articles/s/password-autocomplete-suggestion.md
rename to snippets/html/s/password-autocomplete-suggestion.md
diff --git a/snippets/articles/s/prefetching-resources.md b/snippets/html/s/prefetching-resources.md
similarity index 100%
rename from snippets/articles/s/prefetching-resources.md
rename to snippets/html/s/prefetching-resources.md
diff --git a/snippets/articles/s/html-recommended-minimum-head.md b/snippets/html/s/recommended-minimum-head.md
similarity index 100%
rename from snippets/articles/s/html-recommended-minimum-head.md
rename to snippets/html/s/recommended-minimum-head.md
diff --git a/snippets/articles/s/resource-preloading-cheatsheet.md b/snippets/html/s/resource-preloading-cheatsheet.md
similarity index 100%
rename from snippets/articles/s/resource-preloading-cheatsheet.md
rename to snippets/html/s/resource-preloading-cheatsheet.md
diff --git a/snippets/articles/s/reversed-list.md b/snippets/html/s/reversed-list.md
similarity index 100%
rename from snippets/articles/s/reversed-list.md
rename to snippets/html/s/reversed-list.md
diff --git a/snippets/js/s/target-blank.md b/snippets/html/s/target-blank.md
similarity index 97%
rename from snippets/js/s/target-blank.md
rename to snippets/html/s/target-blank.md
index 3f47c42c9..85970145c 100644
--- a/snippets/js/s/target-blank.md
+++ b/snippets/html/s/target-blank.md
@@ -2,8 +2,8 @@
 title: 'Tip: Protect your users from malicious websites when using target="_blank"'
 shortTitle: 'Safeguarding target="_blank"'
 type: tip
-language: javascript
-tags: [browser,security]
+language: html
+tags: [link,browser,security]
 author: chalarangelo
 cover: laptop-with-code
 excerpt: Opening a link in a new tab comes with a security vulnerability that you may not be aware of. Protect your users with this simple trick.
diff --git a/snippets/articles/s/zooming-accessibility-tips.md b/snippets/html/s/zooming-accessibility-tips.md
similarity index 100%
rename from snippets/articles/s/zooming-accessibility-tips.md
rename to snippets/html/s/zooming-accessibility-tips.md