move dnsmasq to our repo; reorganize