New effective folder organisation