Merge pull request #69 from ddsc/restructure

Restructure
settings v1
Merge branch 'master' into restructure