Move util things to util folder