OAuth2 progress. Moved ContextKeys to package app.