reorg files, get the data flowing both ways
Merge branch 'master' of github.com:towski/grubby