Better layout for files and updates in code.