changed file structure, improvements