Use a new file structure