Moved files around, added zsh (again)