GoogleCloudPlatform · ace-n · May 21, 2020 · May 21, 2020
diff --git a/.kokoro/spanner-functions.cfg → .kokoro/functions/spanner.cfg b/.kokoro/spanner-functions.cfg → .kokoro/functions/spanner.cfg
@@ -3,11 +3,11 @@
 # Set the folder in which the tests are run
 env_vars: {
     key: "PROJECT"
-    value: "spanner/functions"
+    value: "functions/spanner"
 }
 
 # Tell the trampoline which build file to use.
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
     value: "github/nodejs-docs-samples/.kokoro/build.sh"
-}
+}
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -19,15 +19,16 @@ functions/composer-storage-trigger @leahecole
 functions/scheduleinstance @djmailhot
 functions/speech-to-speech @ricalo
 functions/memorystore @ericschmidtatwork
+functions/spanner @jsimonweb
 functions/tokenservice @nnegrey
 
 # GCF samples outside of functions/
 datastore/functions @benwhitehead
-spanner/functions @skuruppu
 
 # One-offs
 cloud-sql @kurtisvg
 composer @leahecole @sofisl
 healthcare @noerog
 iot @gguuss
 jobs @happyhuman
+
diff --git a/spanner/functions/index.js → functions/spanner/index.js b/spanner/functions/index.js → functions/spanner/index.js
diff --git a/spanner/functions/package.json → functions/spanner/package.json b/spanner/functions/package.json → functions/spanner/package.json
diff --git a/spanner/functions/test/index.test.js → functions/spanner/test/index.test.js b/spanner/functions/test/index.test.js → functions/spanner/test/index.test.js