Changes in dir structure, part 2