diff --git a/Linux-exports.sh b/Linux-exports.sh
index e650252..91d9f42 100644
--- a/Linux-exports.sh
+++ b/Linux-exports.sh
@@ -6,7 +6,6 @@ alias t='todo.sh'
 
 export TODOTXT_DEFAULT_ACTION=pv
 export REALLY_GEM_UPDATE_SYSTEM=true
-export GOROOT="$HOME/dev/go"
 
 export GOROOT="$HOME/dev/go"
 export GOPATH=$HOME/dev/mygo
@@ -17,6 +16,7 @@ export CC=/usr/bin/clang
 export CXX=/usr/bin/clang++
 
 export EDITOR=vim
+export SUDOEDITOR=vim
 
 source $GOROOT/misc/zsh/go
 
diff --git a/aliases.sh b/aliases.sh
index 98b7acf..6440265 100644
--- a/aliases.sh
+++ b/aliases.sh
@@ -4,4 +4,4 @@ alias rm=trash
 alias make430="PATH=`brew --prefix llvm-msp430`/bin:$PATH make"
 alias mspmake="PATH=`brew --prefix llvm-msp430`/bin:$PATH make"
 
-eval "$(hub alias -s)"
+#eval "$(hub alias -s)"
diff --git a/dwmloop b/bin/dwmloop
similarity index 100%
rename from dwmloop
rename to bin/dwmloop
diff --git a/startdwm b/bin/startdwm
similarity index 100%
rename from startdwm
rename to bin/startdwm
diff --git a/Xmodmap b/config/Xmodmap
similarity index 100%
rename from Xmodmap
rename to config/Xmodmap
diff --git a/Xresources b/config/Xresources
similarity index 100%
rename from Xresources
rename to config/Xresources
diff --git a/conkyrc b/config/conkyrc
similarity index 100%
rename from conkyrc
rename to config/conkyrc
diff --git a/editrc b/config/editrc
similarity index 100%
rename from editrc
rename to config/editrc
diff --git a/gemrc b/config/gemrc
similarity index 100%
rename from gemrc
rename to config/gemrc
diff --git a/gitignore b/config/gitignore
similarity index 100%
rename from gitignore
rename to config/gitignore
diff --git a/vim/gvimrc b/config/gvimrc
similarity index 100%
rename from vim/gvimrc
rename to config/gvimrc
diff --git a/inputrc b/config/inputrc
similarity index 100%
rename from inputrc
rename to config/inputrc
diff --git a/tmux.conf b/config/tmux.conf
similarity index 100%
rename from tmux.conf
rename to config/tmux.conf
diff --git a/todo.cfg b/config/todo.cfg
similarity index 100%
rename from todo.cfg
rename to config/todo.cfg
diff --git a/vim/vimrc b/config/vimrc
similarity index 100%
rename from vim/vimrc
rename to config/vimrc
diff --git a/zpreztorc b/config/zpreztorc
similarity index 100%
rename from zpreztorc
rename to config/zpreztorc
diff --git a/zshrc b/config/zshrc
similarity index 97%
rename from zshrc
rename to config/zshrc
index 9affca2..46cbb6c 100644
--- a/zshrc
+++ b/config/zshrc
@@ -43,3 +43,4 @@ source ~/.secrets #secrets!
 source ~/.exports.sh
 if [ "$TMUX" != "" ]; then export TERM="screen-256color"; fi
 [[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
+source ~/.fresh/build/shell.sh
diff --git a/exports.sh b/exports.sh
deleted file mode 100644
index b3ec94d..0000000
--- a/exports.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-#cross-platform shell exports
-export TODOTXT_DEFAULT_ACTION=ls
-export REALLY_GEM_UPDATE_SYSTEM=true
-export GOROOT="$HOME/dev/go"
-export PYTHONPATH="$PYTHONPATH:/usr/local/lib/python2.6/dist-packages"
-
-export CC=/usr/bin/clang
-export CXX=/usr/bin/clang++
-
-export EDITOR=gvim
-export SUDO_EDITOR=vim
-
-source $GOROOT/misc/zsh/go
-
-export vless='/usr/share/vim/vimcurrent/macros/less.sh'
-export PAGER="/bin/sh -c \"unset PAGER;col -b -x | \
-      vim -R -c 'set ft=man nomod nolist' -c 'map q :q<CR>' \
-      -c 'map <SPACE> <C-D>' -c 'map b <C-U>' \
-      -c 'nmap K :Man <C-R>=expand(\\\"<cword>\\\")<CR><CR>' -\""
-alias ai="sudo apt-get install"
-alias adu="sudo apt-get dist-upgrade"
-alias ar="sudo apt-get remove"
-alias ai="sudo apt-get install"
diff --git a/setup.sh b/setup.sh
deleted file mode 100755
index 7136cf6..0000000
--- a/setup.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-# set up dotfiles
-if [ $(uname -s) == "Darwin" ]; then
-  IGNORE="linux"
-elif [ $(uname -s) == "Linux" ]; then
-  IGNORE="mac"
-fi
-for i in *;
-do
-  if [ "${i}" != "setup.sh" ]; then
-    echo $i
-    #ln -sf $(pwd)/$i ../.$i
-  fi
-done