The new file structure