Close GH-4: Updated the structure of the Web App.. Fixes #2