file name and strucutre changed