integration refactoring

why not only Authorization