diff --git a/snippets/ansible.sh b/snippets/ansible/commands.sh
similarity index 100%
rename from snippets/ansible.sh
rename to snippets/ansible/commands.sh
diff --git a/snippets/ansible.tasks.yml b/snippets/ansible/tasks.yml
similarity index 100%
rename from snippets/ansible.tasks.yml
rename to snippets/ansible/tasks.yml
diff --git a/snippets/boinc.static-frequency-for-niced-loads.sh b/snippets/boinc.sh
similarity index 100%
rename from snippets/boinc.static-frequency-for-niced-loads.sh
rename to snippets/boinc.sh
diff --git a/snippets/check-port-is-reachable.sh b/snippets/check port is reachable.sh
similarity index 100%
rename from snippets/check-port-is-reachable.sh
rename to snippets/check port is reachable.sh
diff --git a/snippets/convert-between-formats.sh b/snippets/convert between formats.sh
similarity index 100%
rename from snippets/convert-between-formats.sh
rename to snippets/convert between formats.sh
diff --git a/snippets/create-users.sh b/snippets/create users.sh
similarity index 100%
rename from snippets/create-users.sh
rename to snippets/create users.sh
diff --git a/snippets/generate-random-passwords.sh b/snippets/generate random passwords.sh
similarity index 100%
rename from snippets/generate-random-passwords.sh
rename to snippets/generate random passwords.sh
diff --git a/snippets/gitlab.docker.sh b/snippets/gitlab/docker installation.sh
similarity index 100%
rename from snippets/gitlab.docker.sh
rename to snippets/gitlab/docker installation.sh
diff --git a/snippets/gitlab-runner.sh b/snippets/gitlab/gitlab-runner.sh
similarity index 100%
rename from snippets/gitlab-runner.sh
rename to snippets/gitlab/gitlab-runner.sh
diff --git a/snippets/gitlab.package.sh b/snippets/gitlab/package installation.sh
similarity index 100%
rename from snippets/gitlab.package.sh
rename to snippets/gitlab/package installation.sh
diff --git a/snippets/gitlab.pipeline.tasks.yml b/snippets/gitlab/pipeline tasks.yml
similarity index 100%
rename from snippets/gitlab.pipeline.tasks.yml
rename to snippets/gitlab/pipeline tasks.yml
diff --git a/snippets/pulumi.iam-groups-generation.ts b/snippets/pulumi/aws iam groups generation.ts
similarity index 100%
rename from snippets/pulumi.iam-groups-generation.ts
rename to snippets/pulumi/aws iam groups generation.ts
diff --git a/snippets/pulumi.fish b/snippets/pulumi/commands.fish
similarity index 61%
rename from snippets/pulumi.fish
rename to snippets/pulumi/commands.fish
index ed648d6..1415ff9 100644
--- a/snippets/pulumi.fish
+++ b/snippets/pulumi/commands.fish
@@ -1,49 +1,5 @@
 #!/usr/bin/env fish
 
-function pulumi-all-of-type
-	pulumi stack export \
-	| jq -r --arg type "$argv[1]" '.deployment.resources[]|select(.type==$type).urn' -
-end
-
-# Examples:
-# - $ pulumi-all-of-typeRegex 'Endpoint$'
-#   urn:pulumi:dev::ds::aws:sagemaker/endpoint:Endpoint::ml-endpoint
-function pulumi-all-of-typeRegex
-	pulumi stack export \
-	| jq -r --arg regex "$argv[1]" '.deployment.resources[]|select(.type|test($regex)).urn' -
-end
-
-function pulumi-id2urn
-	pulumi stack export \
-	| jq -r --arg id "$argv[1]" '.deployment.resources[]|select(.id==$id).urn' -
-end
-
-function pulumi-ids
-	pulumi stack export \
-	| jq -r '.deployment.resources[].id' - \
-	| sort
-end
-
-function pulumi-urn2id
-	pulumi stack export \
-	| jq -r --arg urn "$argv[1]" '.deployment.resources[]|select(.urn==$urn).id' -
-end
-
-# Examples:
-# - $ pulumi-urnRegex2urn 'monitoring_instance$'
-#   urn:pulumi:dev::start::aws:ec2/instance:Instance::monitoring-instance
-function pulumi-urnRegex2urn
-	pulumi stack export \
-	| jq -r --arg regex "$argv[1]" '.deployment.resources[]|select(.urn|test($regex)).urn' -
-end
-
-function pulumi-urns
-	pulumi stack export \
-	| jq -r '.deployment.resources[].urn' - \
-	| sort
-end
-
-
 pulumi pre
 pulumi pre --cwd 'observability' --diff
 
diff --git a/snippets/pulumi/functions.fish b/snippets/pulumi/functions.fish
new file mode 100644
index 0000000..967f545
--- /dev/null
+++ b/snippets/pulumi/functions.fish
@@ -0,0 +1,44 @@
+#!/usr/bin/env fish
+
+function pulumi-all-of-type
+	pulumi stack export \
+	| jq -r --arg type "$argv[1]" '.deployment.resources[]|select(.type==$type).urn' -
+end
+
+# Examples:
+# - $ pulumi-all-of-typeRegex 'Endpoint$'
+#   urn:pulumi:dev::ds::aws:sagemaker/endpoint:Endpoint::ml-endpoint
+function pulumi-all-of-typeRegex
+	pulumi stack export \
+	| jq -r --arg regex "$argv[1]" '.deployment.resources[]|select(.type|test($regex)).urn' -
+end
+
+function pulumi-id2urn
+	pulumi stack export \
+	| jq -r --arg id "$argv[1]" '.deployment.resources[]|select(.id==$id).urn' -
+end
+
+function pulumi-ids
+	pulumi stack export \
+	| jq -r '.deployment.resources[].id' - \
+	| sort
+end
+
+function pulumi-urn2id
+	pulumi stack export \
+	| jq -r --arg urn "$argv[1]" '.deployment.resources[]|select(.urn==$urn).id' -
+end
+
+# Examples:
+# - $ pulumi-urnRegex2urn 'monitoring_instance$'
+#   urn:pulumi:dev::start::aws:ec2/instance:Instance::monitoring-instance
+function pulumi-urnRegex2urn
+	pulumi stack export \
+	| jq -r --arg regex "$argv[1]" '.deployment.resources[]|select(.urn|test($regex)).urn' -
+end
+
+function pulumi-urns
+	pulumi stack export \
+	| jq -r '.deployment.resources[].urn' - \
+	| sort
+end
diff --git a/snippets/view-files.sh b/snippets/view files.sh
similarity index 100%
rename from snippets/view-files.sh
rename to snippets/view files.sh