Restructure the files