Minor changes in the folder structure