Fix to create all the folder structure