diff --git a/Ansible/ansible.cfg b/Ansible/ansible.cfg
deleted file mode 100644
index 1f7181c..0000000
--- a/Ansible/ansible.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-[defaults]
-bin_ansible_callbacks = True
-callbacks_enabled = ansible.posix.profile_tasks, ansible.posix.timer
-remote_user = eryn
-roles_path = roles
-stdout_callback = community.general.yaml
-
-[connection]
-pipelining = true
-
-[ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=60s
-
-[vault]
-username = ansible-infrastructure-vault
-keyname = default
diff --git a/Ansible/local.yml b/Ansible/local.yml
deleted file mode 100644
index f18a2d6..0000000
--- a/Ansible/local.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- name: Local
-  hosts: localhost
-  tasks:
-    - name: Set up dotfiles
-      ansible.builtin.include_role:
-        name: dotfiles
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/init_site_environment b/Ansible/roles/dotfiles/files/zsh/functions/init_site_environment
deleted file mode 100644
index b4f382b..0000000
--- a/Ansible/roles/dotfiles/files/zsh/functions/init_site_environment
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env zsh
-# Eryn Wells <eryn@erynwells.me>
-
-function init_site_environments
-{
-    export ERYNWELLS_ME_SITE="$HOME/Developer/erynwells.me"
-}
-
-init_site_environments "$@"
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/init_website_environment b/Ansible/roles/dotfiles/files/zsh/functions/init_website_environment
deleted file mode 100644
index e1f791e..0000000
--- a/Ansible/roles/dotfiles/files/zsh/functions/init_website_environment
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env zsh
-# Eryn Wells <eryn@erynwells.me>
-
-function init_website_environments
-{
-    export ERYNWELLS_ME_SITE="$HOME/Developer/erynwells.me"
-}
-
-init_website_environments "$@"
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/weeknotes b/Ansible/roles/dotfiles/files/zsh/functions/weeknotes
deleted file mode 100644
index 9381644..0000000
--- a/Ansible/roles/dotfiles/files/zsh/functions/weeknotes
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env zsh
-
-autoload init_website_environment
-
-function weeknotes
-{
-    init_website_environment
-
-    YEAR=`date '+%Y'`
-    WEEK_NUMBER=`date '+%V'`
-    PAGE_PATH=blog/${YEAR}/weeknotes-${YEAR}w${WEEK_NUMBER}.md
-    UPCOMING_SUNDAY=`${ERYNWELLS_ME_SITE}/scripts/next_sunday.py`
-}
-
-weeknotes "$@"
diff --git a/Ansible/roles/dotfiles/files/zsh/zshenv b/Ansible/roles/dotfiles/files/zsh/zshenv
index 540ecba..ead3559 100644
--- a/Ansible/roles/dotfiles/files/zsh/zshenv
+++ b/Ansible/roles/dotfiles/files/zsh/zshenv
@@ -9,9 +9,7 @@ function init-env-fpath
 {
     local -r fpath_candidates=( \
         "$HOME/.zsh/${SYS}-functions" \
-        "$HOME/.zsh/init-env-functions" \
-        "$HOME/.zsh/init-rc-functions" \
-        "$HOME/.zsh/functions" \
+        "$HOME/.zsh/func" \
     )
 
     # Process the array in reverse order (`Oa` means "descending index order",
diff --git a/Ansible/roles/dotfiles/handlers/main.yml b/Ansible/roles/dotfiles/handlers/main.yml
deleted file mode 100644
index dfc89e5..0000000
--- a/Ansible/roles/dotfiles/handlers/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- name: Rediscover package manager
-  ansible.builtin.setup:
-    gather_subset: pkg_mgr
diff --git a/Ansible/roles/dotfiles/tasks/darwin/bootstrap.yml b/Ansible/roles/dotfiles/tasks/darwin/bootstrap.yml
deleted file mode 100644
index 0474ec1..0000000
--- a/Ansible/roles/dotfiles/tasks/darwin/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: (macOS) Configure homebrew
-  ansible.builtin.include_tasks: homebrew.yml
diff --git a/Ansible/roles/dotfiles/tasks/darwin/homebrew.yml b/Ansible/roles/dotfiles/tasks/darwin/homebrew.yml
deleted file mode 100644
index 2ac20c6..0000000
--- a/Ansible/roles/dotfiles/tasks/darwin/homebrew.yml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-- name: (macOS | homebrew) Does the brew command exist?
-  ansible.builtin.stat:
-    path: /opt/homebrew/bin/brew
-  register: _dotfiles_homebrew_brew
-
-- name: (macOS | homebrew) Install Homebrew
-  when: not _dotfiles_homebrew_brew.stat.exists
-  block:
-    - name: (macOS | homebrew) Create temporary file for install script
-      ansible.builtin.tempfile:
-        state: file
-        prefix: homebrew-install
-      register: _dotfiles_homebrew_install_script
-
-    - name: (macOS | homebrew) Set up homebrew
-      block:
-        - name: (macOS | homebrew) Fetch install script
-          ansible.builtin.get_url:
-            url: https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh
-            dest: "{{ _dotfiles_homebrew_install_script.path }}"
-            mode: "0644"
-
-        - name: (macOS | homebrew) Run install script
-          ansible.builtin.command:
-            cmd: bash {{ _dotfiles_homebrew_install_script.path }}
-          environment:
-            NONINTERACTIVE: 1
-
-        - name: (macOS | homebrew) Gather package manager facts
-          ansible.builtin.setup:
-            gather_subset: pkg_mgr
-      always:
-        - name: (macOS | homebrew) Remove temporary install script
-          ansible.builtin.file:
-            path: "{{ _dotfiles_homebrew_install_script.path }}"
-            state: absent
diff --git a/Ansible/roles/dotfiles/tasks/dotfiles.yml b/Ansible/roles/dotfiles/tasks/dotfiles.yml
deleted file mode 100644
index 389ab23..0000000
--- a/Ansible/roles/dotfiles/tasks/dotfiles.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- name: (dotfiles) ZSH
-  ansible.builtin.include_tasks: zsh.yml
-  tags: [ always, dotfiles_shell, dotfiles_zsh ]
-
-- name: (dotfiles) Vim
-  ansible.builtin.include_tasks: vim.yml
-  tags: [ always, dotfiles_vim ]
-
-- name: (dotfiles) Emacs
-  ansible.builtin.include_tasks: emacs.yml
-  tags: dotfiles_emacs
-
-- name: (dotfiles) Git
-  ansible.builtin.include_tasks: git.yml
-  tags: [ always, dotfiles_git ]
-
-- name: (dotfiles) Mutt
-  ansible.builtin.include_tasks: mutt.yml
-  tags: dotfiles_mutt
-
-- name: (dotfiles) Shell utilities
-  ansible.builtin.include_tasks: shell_utilities.yml
-  tags: dotfiles_shell
-
-- name: (dotfiles) Nethack
-  ansible.builtin.include_tasks: nethack.yml
-  tags: dotfiles_nethack
diff --git a/Ansible/roles/dotfiles/tasks/emacs.yml b/Ansible/roles/dotfiles/tasks/emacs.yml
deleted file mode 100644
index 415cf08..0000000
--- a/Ansible/roles/dotfiles/tasks/emacs.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- name: (emacs) Link emacs config
-  ansible.builtin.file:
-    path: ~/.emacs
-    src: "{{ role_path }}/files/emacs/emacs"
-    state: link
-    force: true
diff --git a/Ansible/roles/dotfiles/tasks/git.yml b/Ansible/roles/dotfiles/tasks/git.yml
deleted file mode 100644
index b326569..0000000
--- a/Ansible/roles/dotfiles/tasks/git.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- name: (git) Link global git configs
-  ansible.builtin.file:
-    path: ~/.{{ item }}
-    src: "{{ role_path }}/files/git/{{ item }}"
-    state: link
-    force: true
-  loop:
-    - gitconfig
-    - gitignore
diff --git a/Ansible/roles/dotfiles/tasks/main.yml b/Ansible/roles/dotfiles/tasks/main.yml
index 91fc42c..3c2ba07 100644
--- a/Ansible/roles/dotfiles/tasks/main.yml
+++ b/Ansible/roles/dotfiles/tasks/main.yml
@@ -1,17 +1,3 @@
 ---
-- name: Bootstrap system
-  ansible.builtin.include_tasks: "{{ ansible_facts.os_family | lower }}/bootstrap.yml"
-
-#- name: Install packages
-#  ansible.builtin.include_tasks: packages.yml
-
-- name: Link dotfiles
-  ansible.builtin.include_tasks: dotfiles.yml
-  tags:
-    - dotfiles_git
-    - dotfiles_mutt
-    - dotfiles_neovim
-    - dotfiles_nethack
-    - dotfiles_shell
-    - dotfiles_vim
-    - dotfiles_zsh
+- name: ZSH
+  ansible.builtin.include_tasks: zsh.yml
diff --git a/Ansible/roles/dotfiles/tasks/mutt.yml b/Ansible/roles/dotfiles/tasks/mutt.yml
deleted file mode 100644
index 6cf777d..0000000
--- a/Ansible/roles/dotfiles/tasks/mutt.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-- name: (mutt) Link muttrc
-  ansible.builtin.file:
-    path: ~/.muttrc
-    src: "{{ role_path }}/files/mutt/muttrc"
-    state: link
-    force: true
-
-- name: (mutt) Make mutt config directory
-  ansible.builtin.file:
-    path: ~/.config/mutt
-    state: directory
-    force: true
-
-- name: (mutt) Link mailcap
-  ansible.builtin.file:
-    path: ~/.config/mutt/mailcap
-    src: "{{ role_path }}/files/mutt/mailcap"
-    state: link
-    force: true
-
-- name: (mutt) Create local state directory
-  ansible.builtin.file:
-    path: ~/.local/state/mutt
-    state: directory
diff --git a/Ansible/roles/dotfiles/tasks/nethack.yml b/Ansible/roles/dotfiles/tasks/nethack.yml
deleted file mode 100644
index d6e8951..0000000
--- a/Ansible/roles/dotfiles/tasks/nethack.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- name: (nethack) Install nethack package
-  ansible.builtin.package:
-    name: nethack
-    state: present
-  when:
-    - dotfiles_install_packages is defined
-    - "'nethack' in dotfiles_install_packages"
-
-- name: (nethack) Link nethackrc
-  ansible.builtin.file:
-    path: ~/.nethackrc
-    src: "{{ role_path }}/files/nethack/nethackrc"
-    state: link
-    force: true
diff --git a/Ansible/roles/dotfiles/tasks/packages.yml b/Ansible/roles/dotfiles/tasks/packages.yml
deleted file mode 100644
index 0642dc4..0000000
--- a/Ansible/roles/dotfiles/tasks/packages.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- name: Install packages
-  become: "{{ _dotfiles_requires_become[ansible_facts.pkg_mgr] | default(true) }}"
-  vars:
-    package_names: _dotfiles_package_names[ansible_facts.pkg_mgr]
-  ansible.builtin.package:
-    name: >
-      {{
-        package_names[package] | default(package)
-            for package
-            in (_dotfiles_core_packages + dotfiles_install_packages)
-      }}
-    state: present
diff --git a/Ansible/roles/dotfiles/tasks/shell_utilities.yml b/Ansible/roles/dotfiles/tasks/shell_utilities.yml
deleted file mode 100644
index 197a1ee..0000000
--- a/Ansible/roles/dotfiles/tasks/shell_utilities.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- name: (tmux) Link tmux.conf
-  ansible.builtin.file:
-    path: ~/.tmux.conf
-    src: "{{ role_path }}/files/tmux/tmux.conf"
-    state: link
-    force: true
-  tags: dotfiles_tmux
-
-- name: (screen) Link screenrc
-  ansible.builtin.file:
-    path: ~/.screenrc
-    src: "{{ role_path }}/files/screen/screenrc"
-    state: link
-    force: true
-  tags: dotfiles_screen
diff --git a/Ansible/roles/dotfiles/tasks/vim.yml b/Ansible/roles/dotfiles/tasks/vim.yml
deleted file mode 100644
index e3ff49b..0000000
--- a/Ansible/roles/dotfiles/tasks/vim.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-- name: (vim) Link plain vim config
-  ansible.builtin.file:
-    path: ~/.vimrc
-    src: "{{ role_path }}/files/vim/vimrc"
-    state: link
-    force: true
-
-- name: (neovim) Create standard config directory
-  tags: dotfiles_neovim
-  ansible.builtin.file:
-    path: ~/.config
-    state: directory
-
-- name: (neovim) Link config
-  tags: dotfiles_neovim
-  ansible.builtin.file:
-    path: ~/.config/nvim
-    src: "{{ role_path }}/files/neovim"
-    state: link
-    force: true
-
-- name: (neovim) Create .local directories
-  tags: dotfiles_neovim
-  ansible.builtin.file:
-    path: "{{ item }}"
-    state: directory
-  loop:
-    - ~/.local/share/nvim
-    - ~/.local/state/nvim
-    - ~/.local/state/nvim/backup
-    - ~/.local/state/nvim/swap
-    - ~/.local/state/nvim/undo
diff --git a/Ansible/roles/dotfiles/tasks/zsh.yml b/Ansible/roles/dotfiles/tasks/zsh.yml
index c0b8570..9301154 100644
--- a/Ansible/roles/dotfiles/tasks/zsh.yml
+++ b/Ansible/roles/dotfiles/tasks/zsh.yml
@@ -1,45 +1,25 @@
 ---
-- name: (zsh) Find zsh binary
-  ansible.builtin.command:
-    cmd: sh -c 'which zsh'
-  register: _dotfiles_which_zsh
+- name: (ZSH) Link startup files
+  ansible.builtin.file:
+    path: ~/.{{ item }}
+    src: "{{ role_path }}/files/zsh/{{ item }}"
+    state: link
+    force: true
+  loop:
+    - zshenv
+    - zshrc
+    - zprofile
 
-- name: (zsh) Configure zsh
-  when: (_dotfiles_which_zsh | length) > 0
-  block:
-    - name: (zsh) Make zsh my shell
-      ansible.builtin.user:
-        name: "{{ ansible_user }}"
-        shell: "{{ _dotfiles_which_zsh.stdout }}"
-        state: present
+- name: (ZSH) Link env functions
+  ansible.builtin.file:
+    path: ~/.zsh/init-env-functions
+    src: "{{ role_path }}/files/zsh/init-env-functions"
+    state: link
+    force: true
 
-    - name: (zsh) Link startup files
-      ansible.builtin.file:
-        path: ~/.{{ item }}
-        src: "{{ role_path }}/files/zsh/{{ item }}"
-        state: link
-        force: true
-      loop:
-        - zshenv
-        - zshrc
-        - zprofile
-
-    - name: (zsh) Create zsh directories
-      ansible.builtin.file:
-        path: "{{ item }}"
-        state: directory
-        force: true
-      loop:
-        - ~/.zsh
-        - ~/.zsh/cache
-
-    - name: (zsh) Link function library directories
-      ansible.builtin.file:
-        path: ~/.zsh/{{ item }}
-        src: "{{ role_path }}/files/zsh/{{ item }}"
-        state: link
-        force: true
-      loop:
-        - init-env-functions
-        - init-rc-functions
-        - functions
+- name: (ZSH) Link rc functions
+  ansible.builtin.file:
+    path: ~/.zsh/init-rc-functions
+    src: "{{ role_path }}/files/zsh/init-rc-functions"
+    state: link
+    force: true
diff --git a/Ansible/roles/dotfiles/vars/main.yml b/Ansible/roles/dotfiles/vars/main.yml
deleted file mode 100644
index de5b952..0000000
--- a/Ansible/roles/dotfiles/vars/main.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-_dotfiles_core_packages:
-  - zsh
-  - git
-  - tmux
-  - neovim
-
-_dotfiles_package_names:
-  homebrew:
-
-_dotfiles_requires_become:
-  homebrew: false
diff --git a/Ansible/roles/dotfiles/files/neovim/UltiSnips/lua.snippets b/config/nvim/UltiSnips/lua.snippets
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/UltiSnips/lua.snippets
rename to config/nvim/UltiSnips/lua.snippets
diff --git a/Ansible/roles/dotfiles/files/neovim/UltiSnips/python.snippets b/config/nvim/UltiSnips/python.snippets
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/UltiSnips/python.snippets
rename to config/nvim/UltiSnips/python.snippets
diff --git a/Ansible/roles/dotfiles/files/neovim/after/ftplugin/css.lua b/config/nvim/after/ftplugin/css.lua
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/after/ftplugin/css.lua
rename to config/nvim/after/ftplugin/css.lua
diff --git a/Ansible/roles/dotfiles/files/neovim/after/ftplugin/gitcommit.vim b/config/nvim/after/ftplugin/gitcommit.vim
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/after/ftplugin/gitcommit.vim
rename to config/nvim/after/ftplugin/gitcommit.vim
diff --git a/Ansible/roles/dotfiles/files/neovim/after/ftplugin/gohtmltmpl.lua b/config/nvim/after/ftplugin/gohtmltmpl.lua
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/after/ftplugin/gohtmltmpl.lua
rename to config/nvim/after/ftplugin/gohtmltmpl.lua
diff --git a/Ansible/roles/dotfiles/files/neovim/after/ftplugin/lua.lua b/config/nvim/after/ftplugin/lua.lua
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/after/ftplugin/lua.lua
rename to config/nvim/after/ftplugin/lua.lua
diff --git a/Ansible/roles/dotfiles/files/neovim/after/ftplugin/python.lua b/config/nvim/after/ftplugin/python.lua
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/after/ftplugin/python.lua
rename to config/nvim/after/ftplugin/python.lua
diff --git a/Ansible/roles/dotfiles/files/neovim/after/ftplugin/rust.lua b/config/nvim/after/ftplugin/rust.lua
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/after/ftplugin/rust.lua
rename to config/nvim/after/ftplugin/rust.lua
diff --git a/Ansible/roles/dotfiles/files/neovim/after/ftplugin/zsh.lua b/config/nvim/after/ftplugin/zsh.lua
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/after/ftplugin/zsh.lua
rename to config/nvim/after/ftplugin/zsh.lua
diff --git a/Ansible/roles/dotfiles/files/neovim/after/plugin/gitgutter.lua b/config/nvim/after/plugin/gitgutter.lua
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/after/plugin/gitgutter.lua
rename to config/nvim/after/plugin/gitgutter.lua
diff --git a/Ansible/roles/dotfiles/files/neovim/after/plugin/treesitter.lua b/config/nvim/after/plugin/treesitter.lua
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/after/plugin/treesitter.lua
rename to config/nvim/after/plugin/treesitter.lua
diff --git a/Ansible/roles/dotfiles/files/neovim/after/syntax/css.vim b/config/nvim/after/syntax/css.vim
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/after/syntax/css.vim
rename to config/nvim/after/syntax/css.vim
diff --git a/Ansible/roles/dotfiles/files/neovim/ftdetect/gohtmltmpl.lua b/config/nvim/ftdetect/gohtmltmpl.lua
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/ftdetect/gohtmltmpl.lua
rename to config/nvim/ftdetect/gohtmltmpl.lua
diff --git a/Ansible/roles/dotfiles/files/neovim/ftdetect/zsh.lua b/config/nvim/ftdetect/zsh.lua
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/ftdetect/zsh.lua
rename to config/nvim/ftdetect/zsh.lua
diff --git a/Ansible/roles/dotfiles/files/neovim/init.lua b/config/nvim/init.lua
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/init.lua
rename to config/nvim/init.lua
diff --git a/Ansible/roles/dotfiles/files/neovim/lua/autocommands.lua b/config/nvim/lua/autocommands.lua
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/lua/autocommands.lua
rename to config/nvim/lua/autocommands.lua
diff --git a/Ansible/roles/dotfiles/files/neovim/lua/colors.lua b/config/nvim/lua/colors.lua
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/lua/colors.lua
rename to config/nvim/lua/colors.lua
diff --git a/Ansible/roles/dotfiles/files/neovim/lua/configuration.lua b/config/nvim/lua/configuration.lua
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/lua/configuration.lua
rename to config/nvim/lua/configuration.lua
diff --git a/Ansible/roles/dotfiles/files/neovim/lua/diagnostics.lua b/config/nvim/lua/diagnostics.lua
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/lua/diagnostics.lua
rename to config/nvim/lua/diagnostics.lua
diff --git a/Ansible/roles/dotfiles/files/neovim/lua/gui.lua b/config/nvim/lua/gui.lua
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/lua/gui.lua
rename to config/nvim/lua/gui.lua
diff --git a/Ansible/roles/dotfiles/files/neovim/lua/keys.lua b/config/nvim/lua/keys.lua
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/lua/keys.lua
rename to config/nvim/lua/keys.lua
diff --git a/Ansible/roles/dotfiles/files/neovim/lua/lsp.lua b/config/nvim/lua/lsp.lua
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/lua/lsp.lua
rename to config/nvim/lua/lsp.lua
diff --git a/Ansible/roles/dotfiles/files/neovim/lua/treesitter.lua b/config/nvim/lua/treesitter.lua
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/lua/treesitter.lua
rename to config/nvim/lua/treesitter.lua
diff --git a/Ansible/roles/dotfiles/files/neovim/syntax/gocsstmpl.vim b/config/nvim/syntax/gocsstmpl.vim
similarity index 100%
rename from Ansible/roles/dotfiles/files/neovim/syntax/gocsstmpl.vim
rename to config/nvim/syntax/gocsstmpl.vim
diff --git a/Ansible/roles/dotfiles/files/emacs/emacs b/emacs
similarity index 100%
rename from Ansible/roles/dotfiles/files/emacs/emacs
rename to emacs
diff --git a/Ansible/roles/dotfiles/files/git/gitconfig b/gitconfig
similarity index 100%
rename from Ansible/roles/dotfiles/files/git/gitconfig
rename to gitconfig
diff --git a/Ansible/roles/dotfiles/files/git/gitignore b/gitignore
similarity index 100%
rename from Ansible/roles/dotfiles/files/git/gitignore
rename to gitignore
diff --git a/Ansible/roles/dotfiles/files/mutt/mailcap b/mutt/mailcap
similarity index 100%
rename from Ansible/roles/dotfiles/files/mutt/mailcap
rename to mutt/mailcap
diff --git a/Ansible/roles/dotfiles/files/mutt/view_attachment.sh b/mutt/view_attachment.sh
similarity index 100%
rename from Ansible/roles/dotfiles/files/mutt/view_attachment.sh
rename to mutt/view_attachment.sh
diff --git a/Ansible/roles/dotfiles/files/mutt/muttrc b/muttrc
similarity index 92%
rename from Ansible/roles/dotfiles/files/mutt/muttrc
rename to muttrc
index 19b0b9b..6ec822c 100644
--- a/Ansible/roles/dotfiles/files/mutt/muttrc
+++ b/muttrc
@@ -19,9 +19,9 @@ set timeout=300
 set imap_keepalive=300
 
 # Caching
-set header_cache="~/.local/state/mutt/cache/headers"
-set message_cachedir="~/.local/state/mutt/cache/bodies"
-set certificate_file="~/.local/state/mutt/certificates"
+set header_cache="~/.mutt/cache/headers"
+set message_cachedir="~/.mutt/cache/bodies"
+set certificate_file="~/.mutt/certificates"
 
 set use_from=yes
 set envelope_from=yes
@@ -50,14 +50,14 @@ hdr_order Date: From: To: Cc: Subject:
 
 # Aliases
 set reverse_alias=yes
-set alias_file="~/.config/mutt/aliases"
+set alias_file="~/.mutt/aliases"
 
 # Composing and Sending
 set edit_headers=yes
 set include=yes
 
 # HTML email :(
-set mailcap_path="~/.config/mutt/mailcap"
+set mailcap_path="~/.mutt/mailcap"
 auto_view text/html
 alternative_order text/html text/plain text/enriched
 
diff --git a/Ansible/roles/dotfiles/files/nethack/nethackrc b/nethackrc
similarity index 100%
rename from Ansible/roles/dotfiles/files/nethack/nethackrc
rename to nethackrc
diff --git a/Ansible/roles/dotfiles/files/screen/screenrc b/screenrc
similarity index 100%
rename from Ansible/roles/dotfiles/files/screen/screenrc
rename to screenrc
diff --git a/Ansible/roles/dotfiles/files/tmux/tmux.conf b/tmux.conf
similarity index 100%
rename from Ansible/roles/dotfiles/files/tmux/tmux.conf
rename to tmux.conf
diff --git a/Ansible/roles/dotfiles/files/vim/vimrc b/vimrc
similarity index 100%
rename from Ansible/roles/dotfiles/files/vim/vimrc
rename to vimrc
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/append_to_path b/zsh/func/append_to_path
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/append_to_path
rename to zsh/func/append_to_path
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/binary_exists b/zsh/func/binary_exists
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/binary_exists
rename to zsh/func/binary_exists
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/connect_ssh_agent b/zsh/func/connect_ssh_agent
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/connect_ssh_agent
rename to zsh/func/connect_ssh_agent
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/darwin-icloud-drive-path b/zsh/func/darwin-icloud-drive-path
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/darwin-icloud-drive-path
rename to zsh/func/darwin-icloud-drive-path
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/darwin/darwin-hardware-model b/zsh/func/darwin/darwin-hardware-model
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/darwin/darwin-hardware-model
rename to zsh/func/darwin/darwin-hardware-model
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/darwin/darwin-os-build b/zsh/func/darwin/darwin-os-build
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/darwin/darwin-os-build
rename to zsh/func/darwin/darwin-os-build
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/darwin/darwin-os-version b/zsh/func/darwin/darwin-os-version
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/darwin/darwin-os-version
rename to zsh/func/darwin/darwin-os-version
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/darwin_configure_screenshots_directory b/zsh/func/darwin_configure_screenshots_directory
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/darwin_configure_screenshots_directory
rename to zsh/func/darwin_configure_screenshots_directory
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/darwin_init_once b/zsh/func/darwin_init_once
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/darwin_init_once
rename to zsh/func/darwin_init_once
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/do_init_functions b/zsh/func/do_init_functions
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/do_init_functions
rename to zsh/func/do_init_functions
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/finder b/zsh/func/finder
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/finder
rename to zsh/func/finder
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/g b/zsh/func/g
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/g
rename to zsh/func/g
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/homebrew-prefix b/zsh/func/homebrew-prefix
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/homebrew-prefix
rename to zsh/func/homebrew-prefix
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/import_cacert b/zsh/func/import_cacert
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/import_cacert
rename to zsh/func/import_cacert
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/init_app_environments b/zsh/func/init_app_environments
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/init_app_environments
rename to zsh/func/init_app_environments
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/init_configure_ls b/zsh/func/init_configure_ls
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/init_configure_ls
rename to zsh/func/init_configure_ls
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/init_profile_darwin b/zsh/func/init_profile_darwin
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/init_profile_darwin
rename to zsh/func/init_profile_darwin
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/init_profile_darwin_say_hello b/zsh/func/init_profile_darwin_say_hello
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/init_profile_darwin_say_hello
rename to zsh/func/init_profile_darwin_say_hello
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/init_rc_aliases b/zsh/func/init_rc_aliases
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/init_rc_aliases
rename to zsh/func/init_rc_aliases
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/init_rc_configure_completion b/zsh/func/init_rc_configure_completion
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/init_rc_configure_completion
rename to zsh/func/init_rc_configure_completion
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/init_rc_configure_prompt b/zsh/func/init_rc_configure_prompt
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/init_rc_configure_prompt
rename to zsh/func/init_rc_configure_prompt
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/init_rc_configure_zle b/zsh/func/init_rc_configure_zle
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/init_rc_configure_zle
rename to zsh/func/init_rc_configure_zle
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/init_rc_fpath_darwin b/zsh/func/init_rc_fpath_darwin
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/init_rc_fpath_darwin
rename to zsh/func/init_rc_fpath_darwin
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/init_rc_linux b/zsh/func/init_rc_linux
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/init_rc_linux
rename to zsh/func/init_rc_linux
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/init_rc_tilde_paths b/zsh/func/init_rc_tilde_paths
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/init_rc_tilde_paths
rename to zsh/func/init_rc_tilde_paths
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/init_xcode b/zsh/func/init_xcode
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/init_xcode
rename to zsh/func/init_xcode
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/init_zsh_functions b/zsh/func/init_zsh_functions
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/init_zsh_functions
rename to zsh/func/init_zsh_functions
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/init_zsh_history b/zsh/func/init_zsh_history
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/init_zsh_history
rename to zsh/func/init_zsh_history
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/init_zsh_options b/zsh/func/init_zsh_options
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/init_zsh_options
rename to zsh/func/init_zsh_options
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/list_tmux_sessions b/zsh/func/list_tmux_sessions
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/list_tmux_sessions
rename to zsh/func/list_tmux_sessions
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/load_module b/zsh/func/load_module
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/load_module
rename to zsh/func/load_module
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/neovim_init_once b/zsh/func/neovim_init_once
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/neovim_init_once
rename to zsh/func/neovim_init_once
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/nethack b/zsh/func/nethack
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/nethack
rename to zsh/func/nethack
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/open-xcode b/zsh/func/open-xcode
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/open-xcode
rename to zsh/func/open-xcode
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/prepend_to_path b/zsh/func/prepend_to_path
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/prepend_to_path
rename to zsh/func/prepend_to_path
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/prompt_colorize b/zsh/func/prompt_colorize
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/prompt_colorize
rename to zsh/func/prompt_colorize
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/prompt_loquacious_setup b/zsh/func/prompt_loquacious_setup
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/prompt_loquacious_setup
rename to zsh/func/prompt_loquacious_setup
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/refresh_system_tags b/zsh/func/refresh_system_tags
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/refresh_system_tags
rename to zsh/func/refresh_system_tags
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/setup-cpython b/zsh/func/setup-cpython
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/setup-cpython
rename to zsh/func/setup-cpython
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/setup_android b/zsh/func/setup_android
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/setup_android
rename to zsh/func/setup_android
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/solarized b/zsh/func/solarized
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/solarized
rename to zsh/func/solarized
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/up b/zsh/func/up
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/up
rename to zsh/func/up
diff --git a/Ansible/roles/dotfiles/files/zsh/functions/update-path b/zsh/func/update-path
similarity index 100%
rename from Ansible/roles/dotfiles/files/zsh/functions/update-path
rename to zsh/func/update-path