Convert to new style packaged app v 3.1