reorganization, adding Google authentication