restructure folders and files