Revised file names and structures