use new structure
Merge branch 'master' of github.com:bearyinnovative/bearychat-tutorial