Move API and impl to separate packages am: e8da20d0f5
am: 9a075eea15

Change-Id: I59465f318f6688ac5f5f7fb4019bc25061363bd4