Redid file strucutre.