Rework into packaged app.