Improved file structure.