Fixing folder structure for token api

Change-Id: Ia4672541dd8f1dc018b24c2e2ef67e292bdd2c1c