Further changed file structure.