Change the folder organisation