Updated routes to consolidate tenant + resource name routes into the actual routes

Signed-off-by: Bill Robinson <[email protected]>

Author: dseevr