Make the folder structure more robust