Improvement to file structure.