Some changes in folder structure