Small changes in folder structure