Some changes to the file structure