Bash, vim changes plus directory reorg.