diff --git a/terminal/git/git-on-tree b/dev/git/git-on-tree
similarity index 100%
rename from terminal/git/git-on-tree
rename to dev/git/git-on-tree
diff --git a/terminal/git/gitconfig b/dev/git/gitconfig
similarity index 100%
rename from terminal/git/gitconfig
rename to dev/git/gitconfig
diff --git a/terminal/git/gitignore_global b/dev/git/gitignore_global
similarity index 100%
rename from terminal/git/gitignore_global
rename to dev/git/gitignore_global
diff --git a/terminal/git/prettygit b/dev/git/prettygit
similarity index 100%
rename from terminal/git/prettygit
rename to dev/git/prettygit
diff --git a/terminal/git/setup.sh b/dev/git/setup.sh
similarity index 100%
rename from terminal/git/setup.sh
rename to dev/git/setup.sh
diff --git a/dev/setup.sh b/dev/setup.sh
new file mode 100755
index 0000000..3c7edea
--- /dev/null
+++ b/dev/setup.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+source ${DOTFILES}/helpers.sh
+
+function main()
+{
+  local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
+
+  print_info "Preparing development environment"
+
+  ${scriptdir}/git/setup.sh
+
+  brewget vim --with-override-system-vi
+  caskget docker
+
+  print_ok "Development environment setup"
+
+}
+
+main "$@"
diff --git a/helpers.sh b/helpers.sh
index 64253af..bc46738 100644
--- a/helpers.sh
+++ b/helpers.sh
@@ -18,7 +18,7 @@ function caskget()
   # if not already installed
   local caskname=$(basename $1)
 
-  if ! brew cask list | grep ${caskname} >/dev/null; then
+  if ! brew cask list | grep -w ${caskname} >/dev/null; then
     print_info "Installing ${caskname} from cask"
     brew cask install "$@"
   fi
@@ -29,7 +29,7 @@ function brewget()
   # if not already installed
   local brewname=$(basename $1)
 
-  if ! brew list | grep ${brewname} >/dev/null; then
+  if ! brew list | grep -w ${brewname} >/dev/null; then
     print_info "Brewing ${brewname}"
     brew install "$@"
   fi
diff --git a/install.sh b/install.sh
index 33d08fe..d1ec454 100755
--- a/install.sh
+++ b/install.sh
@@ -6,3 +6,4 @@ ${DOTFILES}/system/setup.sh
 ${DOTFILES}/network/setup.sh
 ${DOTFILES}/terminal/setup.sh
 ${DOTFILES}/wm/setup.sh
+${DOTFILES}/dev/setup.sh
diff --git a/system/setup.sh b/system/setup.sh
index cb1a094..ef3e5dc 100755
--- a/system/setup.sh
+++ b/system/setup.sh
@@ -9,7 +9,6 @@ function main()
   ${scriptdir}/setup_homebrew.sh
 
   caskget google-chrome
-  caskget docker
 
 }
 
diff --git a/terminal/setup.sh b/terminal/setup.sh
index 9dee3a7..7fce661 100755
--- a/terminal/setup.sh
+++ b/terminal/setup.sh
@@ -8,11 +8,9 @@ function main()
 
   ${scriptdir}/kitty/setup.sh
   ${scriptdir}/fish/setup.sh
-  ${scriptdir}/git/setup.sh
 
   print_info "Installing terminal applications"
   brewget tmux
-  brewget neovim
   print_ok "Terminal applications installed"
 
 }