Took me about two weeks but Google Drive (now renamed Google One) has been consolidated.

Now need to find the time to burn DVDs as well.

Google now gives you 2TB for $100 a year instead of 1TB. Very nice.