diff --git a/network/netscan b/network/netscan
new file mode 100755
index 0000000..da5c14f
--- /dev/null
+++ b/network/netscan
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+scans=`arp-scan -l | grep -E '^(\d{1,3}\.){3}\d{1,3}'| sort -n -t . -k 1,1 -k 2,2 -k 3,3 -k 4,4`
+
+
+while read -r line; do
+  items=($line)
+  ip=${items[0]}
+  mac=${items[1]}
+  vendor=${items[@]:2}
+  cmd="awk '\$1 == \"$mac\" { \$1=\"\"; print \$0 }' < ~/.config/mac-list"
+  name=$(eval $cmd)
+  echo "\\033[32m$ip}\\033[36m$mac}\\033[0m$name}[\\033[33m$vendor\\033[0m]"
+done <<< "$scans" |
+ columnize -t -s '}'
+
diff --git a/network/setup.sh b/network/setup.sh
index edaeba7..23d7ee4 100755
--- a/network/setup.sh
+++ b/network/setup.sh
@@ -7,10 +7,14 @@ function main()
   local scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
 
   ${scriptdir}/ssh/setup.sh
-  ${scriptdir}/git/setup.sh
   ${scriptdir}/NAS_mounts/setup.sh
 
   brewget arp-scan
+  brewget nmap
+
+  makedir ${HOME}/bin
+  linkfile ${scriptdir}/netscan ${HOME}/bin/netscan
+
 }
 
 main "$@"
diff --git a/bin/git-on-tree b/terminal/git/git-on-tree
similarity index 100%
rename from bin/git-on-tree
rename to terminal/git/git-on-tree
diff --git a/network/git/gitconfig b/terminal/git/gitconfig
similarity index 100%
rename from network/git/gitconfig
rename to terminal/git/gitconfig
diff --git a/network/git/gitignore_global b/terminal/git/gitignore_global
similarity index 100%
rename from network/git/gitignore_global
rename to terminal/git/gitignore_global
diff --git a/bin/prettygit b/terminal/git/prettygit
similarity index 100%
rename from bin/prettygit
rename to terminal/git/prettygit
diff --git a/network/git/setup.sh b/terminal/git/setup.sh
similarity index 74%
rename from network/git/setup.sh
rename to terminal/git/setup.sh
index 998251a..807983c 100755
--- a/network/git/setup.sh
+++ b/terminal/git/setup.sh
@@ -19,6 +19,10 @@ function main()
 EOF
   fi
 
+  makedir ${HOME}/bin
+  linkfile ${scriptdir}/prettygit ${HOME}/bin/prettygit
+  linkfile ${scriptdir}/git-on-tree ${HOME}/bin/git-on-tree
+
   print_ok "Git configured"
 }
 
diff --git a/terminal/setup.sh b/terminal/setup.sh
index fdfd938..9dee3a7 100755
--- a/terminal/setup.sh
+++ b/terminal/setup.sh
@@ -8,6 +8,7 @@ function main()
 
   ${scriptdir}/kitty/setup.sh
   ${scriptdir}/fish/setup.sh
+  ${scriptdir}/git/setup.sh
 
   print_info "Installing terminal applications"
   brewget tmux