Refactored content script execution
Adding controller (in progress)