Revised file structure