Merge "Move mdns package to the right directory"