Re-working the API locations per f2f discussion. Refs #92. Refs #121.