change file structure
Merge https://github.com/Benoh/WebApplicationFinalProject
sync