changed file structure: