diff --git a/nvim.configlink/settings/snippets.vim b/nvim.configlink/settings/snippets.vim
index 2632272..b2988ed 100644
--- a/nvim.configlink/settings/snippets.vim
+++ b/nvim.configlink/settings/snippets.vim
@@ -2,17 +2,17 @@
 "---------
 
 " Basic programming files
-nnoremap ,sh :-1read $DOTS/shell/templates/skeleton.sh<CR>Gdd03kC
-nnoremap ,py :-1read $DOTS/shell/templates/skeleton.py<CR>Gdd08kC
+nnoremap ,sh :-1read $DOTS/templates/programs/skeleton.sh<CR>Gdd03kC
+nnoremap ,py :-1read $DOTS/templates/programs/skeleton.py<CR>Gdd08kC
 
 " Kubernetes
-nnoremap ,cm :-1read $DOTS/shell/templates/configmap.yaml<CR>Gdd0gg
-nnoremap ,sec :-1read $DOTS/shell/templates/secret.yaml<CR>Gdd0gg
-nnoremap ,dep :-1read $DOTS/shell/templates/deployment.yaml<CR>Gdd0gg
-nnoremap ,svc :-1read $DOTS/shell/templates/service.yaml<CR>Gdd0gg
-nnoremap ,ing :-1read $DOTS/shell/templates/ingress.yaml<CR>Gdd0gg
-nnoremap ,cro :-1read $DOTS/shell/templates/clusterrole.yaml<CR>Gdd0gg
-nnoremap ,crb :-1read $DOTS/shell/templates/clusterrolebinding.yaml<CR>Gdd0gg
-nnoremap ,ro :-1read $DOTS/shell/templates/role.yaml<CR>Gdd0gg
-nnoremap ,rb :-1read $DOTS/shell/templates/rolebinding.yaml<CR>Gdd0gg
-nnoremap ,sa :-1read $DOTS/shell/templates/serviceaccount.yaml<CR>Gdd0gg
+nnoremap ,cm :-1read $DOTS/templates/kubernetes/configmap.yaml<CR>Gdd0gg
+nnoremap ,sec :-1read $DOTS/templates/kubernetes/secret.yaml<CR>Gdd0gg
+nnoremap ,dep :-1read $DOTS/templates/kubernetes/deployment.yaml<CR>Gdd0gg
+nnoremap ,svc :-1read $DOTS/templates/kubernetes/service.yaml<CR>Gdd0gg
+nnoremap ,ing :-1read $DOTS/templates/kubernetes/ingress.yaml<CR>Gdd0gg
+nnoremap ,cro :-1read $DOTS/templates/kubernetes/clusterrole.yaml<CR>Gdd0gg
+nnoremap ,crb :-1read $DOTS/templates/kubernetes/clusterrolebinding.yaml<CR>Gdd0gg
+nnoremap ,ro :-1read $DOTS/templates/kubernetes/role.yaml<CR>Gdd0gg
+nnoremap ,rb :-1read $DOTS/templates/kubernetes/rolebinding.yaml<CR>Gdd0gg
+nnoremap ,sa :-1read $DOTS/templates/kubernetes/serviceaccount.yaml<CR>Gdd0gg
diff --git a/shell/templates/clusterrole.yaml b/templates/kubernetes/clusterrole.yaml
similarity index 100%
rename from shell/templates/clusterrole.yaml
rename to templates/kubernetes/clusterrole.yaml
diff --git a/shell/templates/clusterrolebinding.yaml b/templates/kubernetes/clusterrolebinding.yaml
similarity index 100%
rename from shell/templates/clusterrolebinding.yaml
rename to templates/kubernetes/clusterrolebinding.yaml
diff --git a/shell/templates/configmap.yaml b/templates/kubernetes/configmap.yaml
similarity index 100%
rename from shell/templates/configmap.yaml
rename to templates/kubernetes/configmap.yaml
diff --git a/shell/templates/deployment.yaml b/templates/kubernetes/deployment.yaml
similarity index 100%
rename from shell/templates/deployment.yaml
rename to templates/kubernetes/deployment.yaml
diff --git a/shell/templates/ingress.yaml b/templates/kubernetes/ingress.yaml
similarity index 100%
rename from shell/templates/ingress.yaml
rename to templates/kubernetes/ingress.yaml
diff --git a/shell/templates/role.yaml b/templates/kubernetes/role.yaml
similarity index 100%
rename from shell/templates/role.yaml
rename to templates/kubernetes/role.yaml
diff --git a/shell/templates/rolebinding.yaml b/templates/kubernetes/rolebinding.yaml
similarity index 100%
rename from shell/templates/rolebinding.yaml
rename to templates/kubernetes/rolebinding.yaml
diff --git a/shell/templates/secret.yaml b/templates/kubernetes/secret.yaml
similarity index 100%
rename from shell/templates/secret.yaml
rename to templates/kubernetes/secret.yaml
diff --git a/shell/templates/service.yaml b/templates/kubernetes/service.yaml
similarity index 100%
rename from shell/templates/service.yaml
rename to templates/kubernetes/service.yaml
diff --git a/shell/templates/serviceaccount.yaml b/templates/kubernetes/serviceaccount.yaml
similarity index 100%
rename from shell/templates/serviceaccount.yaml
rename to templates/kubernetes/serviceaccount.yaml
diff --git a/shell/templates/skeleton.py b/templates/programs/skeleton.py
similarity index 100%
rename from shell/templates/skeleton.py
rename to templates/programs/skeleton.py
diff --git a/shell/templates/skeleton.sh b/templates/programs/skeleton.sh
similarity index 100%
rename from shell/templates/skeleton.sh
rename to templates/programs/skeleton.sh