Refactor to WebContent