more folder structure changes