rearranged the folder structure