amended folder structure