Moving utils into their own dir again