Misc updates.

Restructured the config files setup.