These classes all need to inherit from each other or the include
methods we use don't work properly.  Recreate the inheritance
structure and use overrides to change the resolv.conf parameters.

Also fix a few coding style issues.