initial re-structure for openid