Updated webapp and restructured folders