diff --git a/tasks/git.yaml b/tasks/git.yaml
index d3c5e56..ad34058 100644
--- a/tasks/git.yaml
+++ b/tasks/git.yaml
@@ -2,5 +2,5 @@
 
 - name: git config
   template:
-    src: gitconfig.j2
+    src: git/gitconfig.j2
     dest: ~/.gitconfig
diff --git a/tasks/i3.yaml b/tasks/i3.yaml
index fec74f1..2ed6f18 100644
--- a/tasks/i3.yaml
+++ b/tasks/i3.yaml
@@ -7,7 +7,7 @@
 
 - name: i3 config
   template:
-    src: i3.config.j2
+    src: i3/i3.config.j2
     dest: ~/.config/i3/config
 
 - name: check i3 config
@@ -21,5 +21,5 @@
 
 - name: i3blocks config
   template:
-    src: i3blocks.config.j2
+    src: i3/i3blocks.config.j2
     dest: ~/.config/i3blocks/config
diff --git a/tasks/rofi.yaml b/tasks/rofi.yaml
index d5fbe46..dce927f 100644
--- a/tasks/rofi.yaml
+++ b/tasks/rofi.yaml
@@ -7,6 +7,6 @@
 
 - name: rofi theme
   template:
-    src: rofi.theme.j2
+    src: rofi/rofi.theme.j2
     dest: ~/.config/rofi/theme
     mode: 0755
diff --git a/tasks/ssh.yaml b/tasks/ssh.yaml
index cf08d26..9c218bb 100644
--- a/tasks/ssh.yaml
+++ b/tasks/ssh.yaml
@@ -8,7 +8,7 @@
 
 - name: ssh auto config
   template:
-    src: ssh.config.j2
+    src: ssh/ssh.config.j2
     dest: ~/.ssh/config.auto
 
 - name: include ssh auto config
diff --git a/tasks/tmux.yaml b/tasks/tmux.yaml
index 537e367..eb787ca 100644
--- a/tasks/tmux.yaml
+++ b/tasks/tmux.yaml
@@ -2,7 +2,7 @@
 
 - name: tmux config
   template:
-    src: tmux.conf.j2
+    src: tmux/tmux.conf.j2
     dest: ~/.tmux.conf
     mode: 0755
 
@@ -19,6 +19,6 @@
 
 - name: tmux systemd user service unit
   template:
-    src: tmux@.service.j2
+    src: tmux/tmux@.service.j2
     dest: ~/.config/systemd/user/tmux@.service
   notify: systemd daemon-reload
diff --git a/tasks/vdesk.yaml b/tasks/vdesk.yaml
index 385b8bf..0ffb6d4 100644
--- a/tasks/vdesk.yaml
+++ b/tasks/vdesk.yaml
@@ -2,6 +2,6 @@
 
 - name: vdesk user service
   template:
-    src: vdesk.service.j2
+    src: vdesk/vdesk.service.j2
     dest: ~/.config/systemd/user/vdesk@.service
   notify: systemd daemon-reload
diff --git a/tasks/vnc.yaml b/tasks/vnc.yaml
index 403c254..487c171 100644
--- a/tasks/vnc.yaml
+++ b/tasks/vnc.yaml
@@ -27,6 +27,6 @@
 
 - name: default vnc client options
   template:
-    src: tigervnc.default.j2
+    src: vnc/default.tigervnc.j2
     dest: ~/.vnc/default.tigervnc
     mode: 0755
diff --git a/tasks/workspaces.yaml b/tasks/workspaces.yaml
index f7711c1..b271fae 100644
--- a/tasks/workspaces.yaml
+++ b/tasks/workspaces.yaml
@@ -7,7 +7,7 @@
 
 - name: workspace focus scripts
   template:
-    src: workspace.focus.fish.j2
+    src: workspaces/workspace.focus.fish.j2
     dest: ~/.workspaces/{{workspace}}.focus
     mode: 0755
   with_items: "{{workspaces|dict2items|json_query(\"[?value.type=='vdesk'].key\") }}"
@@ -16,7 +16,7 @@
 
 - name: workspace space shortcut scripts
   template:
-    src: workspace.space.fish.j2
+    src: workspaces/workspace.space.fish.j2
     dest: ~/.workspaces/{{workspace}}.space
     mode: 0755
   with_items: "{{workspaces|dict2items|json_query(\"[?value.type=='vdesk'||value.type=='tmux'].key\") }}"
diff --git a/tasks/x11.yaml b/tasks/x11.yaml
index f5d7caa..9f3100d 100644
--- a/tasks/x11.yaml
+++ b/tasks/x11.yaml
@@ -2,27 +2,27 @@
 
 - name: Xresources
   template:
-    src: Xresources.j2
+    src: x11/Xresources.j2
     dest: ~/.Xresources
 
 - name: Xmodmap
   template:
-    src: Xmodmap.j2
+    src: x11/Xmodmap.j2
     dest: ~/.Xmodmap
 
 - name: xsession script
   template:
-    src: xsession.fish.j2
+    src: x11/xsession.fish.j2
     dest: ~/.xsession.fish
     mode: 0755
 
 - name: xsession reload script
   template:
-    src: xsession.reload.fish.j2
+    src: x11/xsession.reload.fish.j2
     dest: ~/.xsession.reload.fish
     mode: 0755
 
 - name: xsessionrc
-  copy:
-    content: exec fish ~/.xsession.fish
+  template:
+    src: x11/xsessionrc.j2
     dest: ~/.xsessionrc
diff --git a/templates/default.tigervnc.j2 b/templates/default.tigervnc.j2
deleted file mode 100644
index ff93b33..0000000
--- a/templates/default.tigervnc.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-TigerVNC Configuration file Version 1.0
-MenuKey=Pause
-{% if vnc_client_low_bandwidth %}
-AutoSelect=0
-QualityLevel=0
-FullColor=0
-LowColorLevel=2
-PreferredEncoding=Tight
-CompressLevel=0
-{% endif %}
diff --git a/templates/gitconfig.j2 b/templates/git/gitconfig.j2
similarity index 100%
rename from templates/gitconfig.j2
rename to templates/git/gitconfig.j2
diff --git a/templates/i3.config.j2 b/templates/i3/i3.config.j2
similarity index 100%
rename from templates/i3.config.j2
rename to templates/i3/i3.config.j2
diff --git a/templates/i3blocks.config.j2 b/templates/i3/i3blocks.config.j2
similarity index 100%
rename from templates/i3blocks.config.j2
rename to templates/i3/i3blocks.config.j2
diff --git a/templates/rofi.theme.j2 b/templates/rofi/rofi.theme.j2
similarity index 100%
rename from templates/rofi.theme.j2
rename to templates/rofi/rofi.theme.j2
diff --git a/templates/ssh.config.j2 b/templates/ssh/ssh.config.j2
similarity index 100%
rename from templates/ssh.config.j2
rename to templates/ssh/ssh.config.j2
diff --git a/templates/tmux.conf.j2 b/templates/tmux/tmux.conf.j2
similarity index 100%
rename from templates/tmux.conf.j2
rename to templates/tmux/tmux.conf.j2
diff --git a/templates/tmux@.service.j2 b/templates/tmux/tmux@.service.j2
similarity index 100%
rename from templates/tmux@.service.j2
rename to templates/tmux/tmux@.service.j2
diff --git a/templates/vdesk.service.j2 b/templates/vdesk/vdesk.service.j2
similarity index 100%
rename from templates/vdesk.service.j2
rename to templates/vdesk/vdesk.service.j2
diff --git a/templates/tigervnc.default.j2 b/templates/vnc/default.tigervnc.j2
similarity index 100%
rename from templates/tigervnc.default.j2
rename to templates/vnc/default.tigervnc.j2
diff --git a/templates/workspace.focus.fish.j2 b/templates/workspaces/workspace.focus.fish.j2
similarity index 100%
rename from templates/workspace.focus.fish.j2
rename to templates/workspaces/workspace.focus.fish.j2
diff --git a/templates/workspace.space.fish.j2 b/templates/workspaces/workspace.space.fish.j2
similarity index 100%
rename from templates/workspace.space.fish.j2
rename to templates/workspaces/workspace.space.fish.j2
diff --git a/templates/Xmodmap.j2 b/templates/x11/Xmodmap.j2
similarity index 100%
rename from templates/Xmodmap.j2
rename to templates/x11/Xmodmap.j2
diff --git a/templates/Xresources.j2 b/templates/x11/Xresources.j2
similarity index 100%
rename from templates/Xresources.j2
rename to templates/x11/Xresources.j2
diff --git a/templates/xsession.fish.j2 b/templates/x11/xsession.fish.j2
similarity index 100%
rename from templates/xsession.fish.j2
rename to templates/x11/xsession.fish.j2
diff --git a/templates/xsession.reload.fish.j2 b/templates/x11/xsession.reload.fish.j2
similarity index 93%
rename from templates/xsession.reload.fish.j2
rename to templates/x11/xsession.reload.fish.j2
index 1ea52c2..748a791 100644
--- a/templates/xsession.reload.fish.j2
+++ b/templates/x11/xsession.reload.fish.j2
@@ -1,5 +1,7 @@
 #!/usr/bin/fish
 
+{{ansible_managed|comment}}
+
 # keymap
 setxkbmap de
 xmodmap ~/.Xmodmap
diff --git a/templates/x11/xsessionrc.j2 b/templates/x11/xsessionrc.j2
new file mode 100644
index 0000000..87ba637
--- /dev/null
+++ b/templates/x11/xsessionrc.j2
@@ -0,0 +1,3 @@
+{{ansible_managed|comment}}
+
+exec fish ~/.xsession.fish