changed file structure inter alia