Restructure of the folder