Consolidated several software config files into one