settings v1
Merge branch 'master' into restructure
Merge pull request #70 from ddsc/restructure

Restructure