setup structure
Merge branch 'master' of https://github.com/ecjs/Concierge
minor changes