Reorganizing the folder structure and deleted extra files