restructure the files