config file restructuring.
Revised following last commit.