Modules

Merging in the new set up. The code has been split up for Broker/Browser and Broker/Invoca interactions.