restructure the folder