Restructue the folder
Re-ordered the folders and files