new structure and namespace
Merge branch 'master' of github.com:johnpmayer/state