use variant.dirName everywhere; closes #7