Arrange zsh and emacs directories
Update bootstrap script