moved the two scripts into their own modules and util into own