Reorganised Google scopes and added some