refactor CI and QA tools inclusion