change structure, add util module