Code: Improved file structure.