Redid file structure
`