rearrange utils into lib/,