Unify apps

This is a followup to #1.