Optimize file structure