Use proper vapi directories.