refactored package/module structure of webutil