diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index ab55d4a..01bc0d2 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -1,8 +1,8 @@
 # vim:ft=gitconfig set ts=2 sw=2 tw=0 et
 
 [user]
-	name = Mark Tareshawty
-	email = tarebyte@github.com
+  name = Mark Tareshawty
+  email = tarebyte@github.com
   username = tarebyte
   signingkey = 3BF9D1AE
 
@@ -72,7 +72,6 @@
   excludesfile = /Users/tarebyte/.gitignore_global
   whitespace = trailing-space,space-before-tab,indent-with-non-tab
   pager = diff-so-fancy | less --tabs=4 -RFX
-  # autocrlf = input
 
 [credential]
   whitespace = trailing-space,space-before-tab,indent-with-non-tab
@@ -107,5 +106,6 @@
 
 [push]
   default = current
+
 [gui]
 	recentrepo = /Users/tarebyte/src/github/github
diff --git a/brew/Brewfile b/homebrew/Brewfile
similarity index 64%
rename from brew/Brewfile
rename to homebrew/Brewfile
index 51ba52f..26c4c7c 100644
--- a/brew/Brewfile
+++ b/homebrew/Brewfile
@@ -2,33 +2,32 @@ tap 'caskroom/fonts'
 tap 'homebrew/dupes'
 tap 'homebrew/binary'
 
-cask 'aerial'
 cask 'alfred'
-cask 'bartender'
-cask 'firefox'
-cask 'font-hack'
-cask 'font-octicons'
-cask 'iterm2-beta'
+cask 'cleanmymac'
+cask 'dash'
+cask 'deluge'
+cask 'docker'
+cask 'fantastical'
+cask 'graphiql'
+cask 'iterm2'
 cask 'java'
-cask 'kindle'
-cask 'kap'
-cask 'marked'
-cask 'openemu'
+caks 'licecap'
+cask 'ngrok'
 cask 'paw'
 cask 'postico'
-cask 'screenhero'
-cask 'selfcontrol'
-cask 'sizeup'
 cask 'slack'
 cask 'spotify'
+cask 'viscosity'
+cask 'zoomus'
 
-brew 'ack'
+brew 'aspell'
 brew 'autojump'
 brew 'battery'
+brew 'ctags'
 brew 'coreutils'
 brew 'diff-so-fancy'
-brew 'elasticsearch17'
 brew 'elixir'
+brew 'fish'
 brew 'findutils'
 brew 'fzf'
 brew 'git'
@@ -41,7 +40,9 @@ brew 'jq'
 brew 'homebrew/binary/ngrok2'
 brew 'mas'
 brew 'moreutils'
+brew 'neovim'
 brew 'node'
+brew 'node-build'
 brew 'nodenv'
 brew 'openssl'
 brew 'python3'
@@ -50,12 +51,7 @@ brew 'rbenv-default-gems'
 brew 'reattach-to-user-namespace'
 brew 'ruby-build'
 brew 'spark'
-brew 'the_silver_searcher'
-brew 'tig'
 brew 'tmux'
 brew 'unrar'
 brew 'wifi-password'
 brew 'yarn'
-brew 'zsh'
-brew 'zsh-completions'
-brew 'zsh-syntax-highlighting'
diff --git a/osx/osx.sh b/macos/osx.sh
similarity index 100%
rename from osx/osx.sh
rename to macos/osx.sh