changed file strucutre