restructure all files