refactored settings files
Merge branch 'release/initial'