completely changed file structure