Rename packages and add tests for token services