Fixing 3.3 support, renameing folder Oauth > OAuth, Openid > OpenID, note that OAuth Model has to be changed accordingly