MOTECH-628: Removed api sufix from Commcare

As part of the migration, the api directory was removed. The api
sufix was also dropped.

Change-Id: I615a84194855d73878af234a57bcc533dad53a30
Merge "MOTECH-628: Removed api sufix from Commcare"