restructed redirects, and committed cams googlelogin
merged files