Moved datastore related code to 'store' package