Reorganized functions/files. Added popup.js