Refactored the WebApp project