changed file structure, general progress