Reorganized source for inclusion of network config files.
Fixed includes.