Re-branding + cleanup + GAE