Improving folder structure