Restructure the folders again