restructuring datastore for JDO