Move utils to separate folder

@gpetruc