Improving file structure.