Restructured config file for readability/usage