moved around config to enable better config management