changed file tree organization