Redid file structure.