Changed files to zsh, cleanup