Code cleanup #2, adopted the content.js structure from the chrome extension…