revised file structure