Fix file destination directories part 2