Corrected file structure