restructure the folders