Moving utilities into packages