putting everything in popup.js, removing unneeded files, fixing add/remove location