Separate utils into files