Update APK names, add ContentShell. Fixes #5