Improving arrangement and file names