changed file structure