diff --git a/Pipfile b/Pipfile
index ce9e39c..c175cc7 100644
--- a/Pipfile
+++ b/Pipfile
@@ -13,5 +13,5 @@ yamllint = "*"
 python_version = "3.7"
 
 [scripts]
-deploy = "ansible-playbook -i hosts dotfiles.yml -C"
+deploy = "sudo ansible-playbook -i hosts dotfiles.yml -C"
 test = "yamllint -sc yamllint.yml yamllint.yml dotfiles.yml tasks/ vars.yml"
diff --git a/dotfiles.yml b/dotfiles.yml
index 491e35b..81fb292 100644
--- a/dotfiles.yml
+++ b/dotfiles.yml
@@ -5,3 +5,4 @@
     - include_vars:
         file: vars.yml
     - import_tasks: tasks/common.yml
+    - import_tasks: tasks/config.yml
diff --git a/modules/config/files/alacritty.yml b/files/alacritty.yml
similarity index 100%
rename from modules/config/files/alacritty.yml
rename to files/alacritty.yml
diff --git a/modules/config/files/assh.yml b/files/assh.yml
similarity index 100%
rename from modules/config/files/assh.yml
rename to files/assh.yml
diff --git a/modules/config/files/caret-preferences.md b/files/caret-preferences.md
similarity index 100%
rename from modules/config/files/caret-preferences.md
rename to files/caret-preferences.md
diff --git a/modules/config/templates/gitconfig.conf.erb b/files/gitconfig.conf
similarity index 86%
rename from modules/config/templates/gitconfig.conf.erb
rename to files/gitconfig.conf
index 2d2a1a1..a8080bd 100644
--- a/modules/config/templates/gitconfig.conf.erb
+++ b/files/gitconfig.conf
@@ -13,11 +13,11 @@
 
 [include]
     path = ~/.dotfiles/git/private.conf
-<% if @trusted['hostname'] == 'too-work' -%>
+{% if ansible_fqdn == "TOO-Work" %}
     path = ~/.dotfiles/git/work.conf
-<%  else -%>
+{% else %}
     path = ~/.dotfiles/git/personal.conf
-<% end -%>
+{% endif %}
 
 [includeIf "gitdir:~/sourcebots/"]
     path = ~/.dotfiles/git/sourcebots.conf
diff --git a/modules/config/files/gitignore_global b/files/gitignore_global
similarity index 100%
rename from modules/config/files/gitignore_global
rename to files/gitignore_global
diff --git a/modules/config/files/libinput-gestures.conf b/files/libinput-gestures.conf
similarity index 100%
rename from modules/config/files/libinput-gestures.conf
rename to files/libinput-gestures.conf
diff --git a/modules/config/files/rofi.conf b/files/rofi.conf
similarity index 100%
rename from modules/config/files/rofi.conf
rename to files/rofi.conf
diff --git a/modules/config/files/terminator.conf b/files/terminator.conf
similarity index 100%
rename from modules/config/files/terminator.conf
rename to files/terminator.conf
diff --git a/modules/config/files/touchpad.conf b/files/touchpad.conf
similarity index 100%
rename from modules/config/files/touchpad.conf
rename to files/touchpad.conf
diff --git a/modules/config/files/uniemoji.json b/files/uniemoji.json
similarity index 100%
rename from modules/config/files/uniemoji.json
rename to files/uniemoji.json
diff --git a/tasks/config.yml b/tasks/config.yml
new file mode 100644
index 0000000..57eb04e
--- /dev/null
+++ b/tasks/config.yml
@@ -0,0 +1,60 @@
+- copy:
+    src: ./files/libinput-gestures.conf
+    dest: /etc/libinput-gestures.conf
+    mode: 0644
+    owner: jake
+
+- copy:
+    src: ./files/terminator.conf
+    dest: /home/jake/.config/terminator/config
+    mode: 0644
+    owner: jake
+
+- copy:
+    src: ./files/uniemoji.json
+    dest: /home/jake/.config/uniemoji/custom.json
+    mode: 0644
+    owner: jake
+
+- copy:
+    src: ./files/assh.yml
+    dest: /home/jake/.ssh/assh.yml
+    mode: 0644
+    owner: jake
+
+- copy:
+    src: ./files/gitignore_global
+    dest: /home/jake/.config/.gitignore
+    mode: 0644
+    owner: jake
+
+- template:
+    src: ./files/gitconfig.conf
+    dest: /home/jake/.gitconfig
+    mode: 0644
+    owner: jake
+    group: users
+
+- copy:
+    src: ./files/rofi.conf
+    dest: /home/jake/.config/rofi/config
+    mode: 0644
+    owner: jake
+
+- copy:
+    src: ./files/touchpad.conf
+    dest: /usr/share/X11/xorg.conf.d/30-touchpad.conf
+    mode: 0644
+    owner: jake
+
+- copy:
+    src: ./files/caret-preferences.md
+    dest: /home/jake/.config/Caret/Preferences.md
+    mode: 0644
+    owner: jake
+
+- copy:
+    src: ./files/alacritty.yml
+    dest: /home/jake/.config/alacritty/alacritty.yml
+    mode: 0644
+    owner: jake