* mad $ updates to cleanup how api modules are imported.