diff --git a/fish/config.fish b/fish/config.fish
deleted file mode 100644
index 1fdeb0e92..000000000
--- a/fish/config.fish
+++ /dev/null
@@ -1,23 +0,0 @@
-function fish_prompt
-    set_color magenta
-    echo -n (vcprompt -f "(%s:%b%a%m)")
-    set_color cyan
-    echo -n '> '
-end
-
-function fish_right_prompt
-   set_color --bold yellow
-   echo -n '['
-   set_color --bold blue
-   echo -n (prompt_pwd)
-   set_color --bold yellow
-   echo -n ']'
-end
-
-set -gx EDITOR "emacsclient -n -create-frame"
-set -gx ALTERNATE_EDITOR emacs
-set -gx VISUAL emacsclient
-
-set fish_greeting ""
-
-set PATH /usr/local/share/python /usr/local/bin ~/Library/Haskell/bin ~/bin/ /Users/vincent/Source/management-scripts/google-apps/ $PATH
diff --git a/fish/functions/edit.fish b/fish/functions/edit.fish
deleted file mode 100644
index 61bf37345..000000000
--- a/fish/functions/edit.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function edit
-    emacsclient -no-wait -create-frame $argv
-end
\ No newline at end of file
diff --git a/fish/functions/runhoogle.fish b/fish/functions/runhoogle.fish
deleted file mode 100644
index 45160062e..000000000
--- a/fish/functions/runhoogle.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-function runhoogle
-    cd ~/.hoogle
-    screen -dm hoogle server -p 4000
-    cd -
-end
diff --git a/fish/functions/runirc.fish b/fish/functions/runirc.fish
deleted file mode 100644
index d16234268..000000000
--- a/fish/functions/runirc.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function runirc
-    screen -S irssi irssi
-end
diff --git a/emacs.d/init-bindings.el b/init-bindings.el
similarity index 100%
rename from emacs.d/init-bindings.el
rename to init-bindings.el
diff --git a/emacs.d/init-custom.el b/init-custom.el
similarity index 100%
rename from emacs.d/init-custom.el
rename to init-custom.el
diff --git a/emacs.d/init-eshell.el b/init-eshell.el
similarity index 100%
rename from emacs.d/init-eshell.el
rename to init-eshell.el
diff --git a/emacs.d/init-functions.el b/init-functions.el
similarity index 100%
rename from emacs.d/init-functions.el
rename to init-functions.el
diff --git a/emacs.d/init-mail.el b/init-mail.el
similarity index 100%
rename from emacs.d/init-mail.el
rename to init-mail.el
diff --git a/emacs.d/init-modes.el b/init-modes.el
similarity index 100%
rename from emacs.d/init-modes.el
rename to init-modes.el
diff --git a/emacs.d/init-settings.el b/init-settings.el
similarity index 100%
rename from emacs.d/init-settings.el
rename to init-settings.el
diff --git a/emacs.d/init.el b/init.el
similarity index 100%
rename from emacs.d/init.el
rename to init.el
diff --git a/plists/com.googlecode.iterm2.plist b/plists/com.googlecode.iterm2.plist
deleted file mode 100644
index 667361b2f..000000000
Binary files a/plists/com.googlecode.iterm2.plist and /dev/null differ
diff --git a/plists/org.pqrs.KeyRemap4MacBook.plist b/plists/org.pqrs.KeyRemap4MacBook.plist
deleted file mode 100644
index c6be29839..000000000
Binary files a/plists/org.pqrs.KeyRemap4MacBook.plist and /dev/null differ
diff --git a/plists/org.pqrs.PCKeyboardHack.plist b/plists/org.pqrs.PCKeyboardHack.plist
deleted file mode 100644
index 4e4b74cb6..000000000
Binary files a/plists/org.pqrs.PCKeyboardHack.plist and /dev/null differ
diff --git a/xnomad b/xnomad
deleted file mode 100644
index 4a2adc025..000000000
--- a/xnomad
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "Ratio": 0.7,
-    "WindowsInMaster": 1,
-    "Hotkeys": {
-        "Swap":          { "key": "s", "modifiers": [ "option", "control" ] },
-        "SelectPrev":    { "key": "j", "modifiers": [ "option", "control" ] },
-        "SelectNext":    { "key": "k", "modifiers": [ "option", "control" ] },
-        "SwapPrev":      { "key": "j", "modifiers": [ "option", "control", "command" ] },
-        "SwapNext":      { "key": "k", "modifiers": [ "option", "control", "command" ] },
-        "FocusDisplay1": { "key": "e", "modifiers": [ "option", "control" ] },
-        "FocusDisplay2": { "key": "w", "modifiers": [ "option", "control" ] },
-        "ToDisplay1":    { "key": "e", "modifiers": [ "option", "control", "command" ] },
-        "ToDisplay2":    { "key": "w", "modifiers": [ "option", "control", "command" ] },
-        "CycleLayouts":  { "key": " ", "modifiers": [ "option", "control", "command" ] },
-        "IncreaseRatio": { "key": "l", "modifiers": [ "option", "control" ] },
-        "DecreaseRatio": { "key": "h", "modifiers": [ "option", "control" ] },
-        "MoreMasters":   { "key": ".", "modifiers": [ "option", "control" ] },
-        "FewerMasters":  { "key": ",", "modifiers": [ "option", "control" ] }
-    }
-}
diff --git a/zshrc b/zshrc
deleted file mode 100644
index 15846cbbe..000000000
--- a/zshrc
+++ /dev/null
@@ -1,63 +0,0 @@
-zmodload -a colors
-zmodload -a autocomplete
-autoload -U age && age
-
-export EDITOR='subl -w'
-
-[ -x /usr/bin/dircolors ] && eval $(dircolors)
-zstyle ':completion:*' menu select=2
-zstyle ':completion:*' verbose true
-zstyle ':completion:*' extra-verbose true
-zstyle ':completion:*' use-cache on
-zstyle ':completion:*' cache-path ~/.zsh/cache
-zstyle ':completion:*:approximate:*' max-errors 1 numeric
-zstyle ':completion:*:functions' ignored-patterns '_*'
-zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
-zstyle ':completion:*' completer _expand _complete _ignored _correct _approximate
-
-autoload -Uz compinit && compinit
-
-setopt autocd autopushd pushdminus pushdsilent pushdtohome
-setopt HIST_REDUCE_BLANKS HIST_IGNORE_SPACE SHARE_HISTORY inc_append_history
-setopt no_hup no_clobber print_exit_value
-setopt extendedglob glob_dots
-setopt correct
-setopt completealiases
-setopt prompt_subst
-
-case $TERM in
-    rxvt|*term)
-        precmd() { print -Pn "\e]0;%m:%~\a" }
-        preexec () { print -Pn "\e]0;$1\a" }
-    ;;
-esac
-
-autoload -U colors && colors
-#vincent: PS1="%{%B$fg[blue]%}%n%{$reset_color%B%}@%{%b$fg[magenta]%}%1~ %{$reset_color%}\$(vcprompt -f '%b:%r ')%# "
-
-#PS1="%n@%1~ \$(vcprompt -f '%b:%r ') %# "
-PS1="%{$fg[green]%}%n%{$fg[cyan]%}@%{$fg[magenta]%}%1~ %{$fg[yellow]%}\$(vcprompt -f '%b:%r ')%{$fg[cyan]%}%# %{$reset_color%}"
-RPS1="%{$fg[cyan]%}%B[%M:%d]%b%{$reset_color%}"
-
-
-alias ls="ls -liFG"
-
-autoload -Uz compinit && compinit
-
-source ~/.zsh/plugins/history-substring-search.zsh
-source ~/.zsh/plugins/git.plugin.zsh
-source ~/.zsh/plugins/git-extras.plugin.zsh
-
-# Customize to your needs...
-export PATH=/Users/vincent/Library/Haskell/bin:/Users/vincent/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/munki
-
-source /opt/boxen/env.sh
-
-
-alias google.py="/Users/vincent/Source/management-scripts/google-apps/google.py"
-
-alias runhoogle="screen -dm hoogle server -p 4000"
-
-alias irssi="screen -S irssi irssi"
-
-HISTFILE="$HOME/.zsh_history"