Restructure folder and files