Updated api and router for module changes

Updated the API and Router functions so they will reflect the module changes.
@brnsmns13 
@seancavanaugh 
@jcurtiss