First pass at Popup.js and package.js, minor clean-up of Application.js