Separate out Application from Distribution