restructure 'utils' folder