Google Drive reworks

Modified some of the Google Drive code to make more sense.  Still
doesn't upload files properly.