Merge pull request #129 from nhr/master

Consolidated config assets under one parent directory