Restructure the folder