Rearranged the folder structure