Moved most packages to the utils package