restructure files and folders