Renamed old model files to FooJson to avoid package confusion with Dao objects.  May rename Dao objects later