Added Oh My ZSH, plus some reorganisation while I was at it