diff --git a/files/vimrc.local b/files/usability/vimrc.local
similarity index 100%
rename from files/vimrc.local
rename to files/usability/vimrc.local
diff --git a/tasks/iptables.yml b/tasks/iptables.yml
index 22d63b1..6512f81 100644
--- a/tasks/iptables.yml
+++ b/tasks/iptables.yml
@@ -14,7 +14,7 @@
 
 - name: Install iptables rules for IPv4
   template:
-    src: templates/rules.v4
+    src: templates/iptables/rules.v4
     dest: '{{ common__iptables__conf_ipv4 }}'
     mode: 'u=rw,g=r,o=r'
     owner: root
@@ -23,7 +23,7 @@
 
 - name: Install iptables rules for IPv6
   template:
-    src: templates/rules.v6
+    src: templates/iptables/rules.v6
     dest: '{{ common__iptables__conf_ipv6 }}'
     mode: 'u=rw,g=r,o=r'
     owner: root
diff --git a/tasks/usability.yml b/tasks/usability.yml
index d67e882..734497f 100644
--- a/tasks/usability.yml
+++ b/tasks/usability.yml
@@ -6,7 +6,7 @@
 
 - name: Install Vim config
   copy:
-    src: files/vimrc.local
+    src: files/usability/vimrc.local
     dest: /etc/vim/vimrc.local
     mode: 'u=rw,g=r,o=r'
     owner: root
diff --git a/templates/rules.v4 b/templates/iptables/rules.v4
similarity index 100%
rename from templates/rules.v4
rename to templates/iptables/rules.v4
diff --git a/templates/rules.v6 b/templates/iptables/rules.v6
similarity index 100%
rename from templates/rules.v6
rename to templates/iptables/rules.v6