Some changes to file structure