Refactor a bit.

impl/prod/raw_datastore_type_converter.go

Index: impl/prod/raw_datastore_type_converter.go
diff --git a/prod/raw_datastore_type_converter.go b/impl/prod/raw_datastore_type_converter.go
similarity index 76%
rename from prod/raw_datastore_type_converter.go
rename to impl/prod/raw_datastore_type_converter.go
index 06aaa0c09597853fae1226f1107c28f465f9e3db..349f5fc1ee5e43f700cfe04cd0dfe141c1260330 100644
--- a/prod/raw_datastore_type_converter.go
+++ b/impl/prod/raw_datastore_type_converter.go
@@ -5,35 +5,36 @@
 package prod
 
 import (
-	"github.com/luci/gae"
+	bs "github.com/luci/gae/service/blobstore"
+	rds "github.com/luci/gae/service/rawdatastore"
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/datastore"
 )
 
 type typeFilter struct {
-	pls gae.DSPropertyLoadSaver
+	pls rds.PropertyLoadSaver
 }
 
 var _ datastore.PropertyLoadSaver = &typeFilter{}
 
 func (tf *typeFilter) Load(props []datastore.Property) error {
-	pmap := make(gae.DSPropertyMap, len(props))
+	pmap := make(rds.PropertyMap, len(props))
 	for _, p := range props {
 		val := p.Value
 		switch x := val.(type) {
 		case datastore.ByteString:
-			val = gae.DSByteString(x)
+			val = rds.ByteString(x)
 		case *datastore.Key:
 			val = dsR2F(x)
 		case appengine.BlobKey:
-			val = gae.BSKey(x)
+			val = bs.Key(x)
 		case appengine.GeoPoint:
-			val = gae.DSGeoPoint(x)
+			val = rds.GeoPoint(x)
 		}
-		prop := gae.DSProperty{}
-		is := gae.ShouldIndex
+		prop := rds.Property{}
+		is := rds.ShouldIndex
 		if p.NoIndex {
-			is = gae.NoIndex
+			is = rds.NoIndex
 		}
 		if err := prop.SetValue(val, is); err != nil {
 			return err
@@ -56,16 +57,16 @@ func (tf *typeFilter) Save() ([]datastore.Property, error) {
 			toAdd := datastore.Property{
 				Name:     name,
 				Multiple: multiple,
-				NoIndex:  prop.IndexSetting() == gae.NoIndex,
+				NoIndex:  prop.IndexSetting() == rds.NoIndex,
 			}
 			switch x := prop.Value().(type) {
-			case gae.DSByteString:
+			case rds.ByteString:
 				toAdd.Value = datastore.ByteString(x)
-			case gae.DSKey:
+			case rds.Key:
 				toAdd.Value = dsF2R(x)
-			case gae.BSKey:
+			case bs.Key:
 				toAdd.Value = appengine.BlobKey(x)
-			case gae.DSGeoPoint:
+			case rds.GeoPoint:
 				toAdd.Value = appengine.GeoPoint(x)
 			default:
 				toAdd.Value = x