Changed folder structure according to the requirements