Small improvement to new dir structure