change folder structure; fix multiple utility pages