add util folder and moved corresponding files