We probably don't, but removing them should be a separate change from the mechanical directory restructuring HJ is doing now. Of course, doing removals first reduces the number of renamings required.