Refined folder structure