Applied further review comments for config folder change

Just a quick pull request to run Travis validation.  Once Travis succeeds will checkin right away.  But feel free to comment if you see anything that requires following up.