integration refactoring

Only ClientAuthorization ?