Change global utilities to module utilities