reorganized dir structure yet again
Merge branch 'master' of https://github.com/ericdrowell/jsond