Standardize project format, and fix broken Superuser repo

Change-Id: I2c31a626d05c200ff328f6844de6960f78d408ca