Add Web scope and restructure folders