wg toolstack refactoring