Change a bit the folder organization