Final folder organisation