Continue to work on the architecture restructuring. Basic content script in place.