integration refactoring

Maybe the AccessTokenGenerator should be in ```token``` package