Modified file structure