dir reorg; more consistent naming of model properties with json blob format