Unify apps

This fixes migrations and will prevent future issues.