changed file-structure