bulk changes moving to a better config rather than environment defition

Chris Hinesrequested to merge
config_files into dev

Merge request reports