Consolidate configs into single config file; internal consolidation to follow