changed file structure 2