Fix .dir-locals with new directory structure