Setup separate api keys for modules.  Refactored affected modules and framework code.