Reorganise zshrc aliases, new functions