Once step closer to folders being perfect