a few modifications regarding the folder structure