keep initial folder structure from herrera