Amended folder structure