Directory restructuring
Merge branch 'master' of github.com:eceforge/vitasign